diff --git a/docs/src/selectors.md b/docs/src/selectors.md
index 68f5a79251..96d9b97c1d 100644
--- a/docs/src/selectors.md
+++ b/docs/src/selectors.md
@@ -3,142 +3,292 @@ id: selectors
title: "Element selectors"
---
-Selectors query elements on the web page for interactions, like [`method: Page.click`], and to obtain `ElementHandle` through [`method: Page.$`]. Built-in selectors auto-pierce [shadow DOM](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Using_shadow_DOM).
+Selectors are strings that point to the elements in the page. They are used to perform actions on those
+elements by means of methods such as [`method: Page.click`], [`method: Page.fill`] and alike. All those
+methods accept [`param: selector`] as their first argument.
-## Working with selectors
+## Basic text selectors
-Selector describes an element in the page. It can be used to obtain `ElementHandle` (see [`method: Page.$`] for example) or shortcut element operations to avoid intermediate handle (see [`method: Page.click`] for example).
-
-Selector has the following format: `engine=body [>> engine=body]*`. Here `engine` is one of the supported [selector engines](./selectors.md) (e.g. `css` or `xpath`), and `body` is a selector body in the format of the particular engine. When multiple `engine=body` clauses are present (separated by `>>`), next one is queried relative to the previous one's result.
-
-Playwright supports various selector engines:
- * [Text] selectors, for example `text="Log in"`
- * [CSS] selectors, including the following extensions:
- - [Shadow piercing](#shadow-piercing) by default and [`:light`](#css-extension-light) pseudo-class
- - [`:visible`](#css-extension-visible) pseudo-class
- - [`:text`](#css-extension-text) pseudo-class
- - [`:has`](#css-extension-has) and [`:is`](#css-extension-is) pseudo-classes
- - [Position selectors](#css-extension-position), for example `button:right-of(article)`
- * [XPath] selectors, for example `xpath=//html/body/div`
- * [id selectors][id], for example `id=sign-in`
- * [Custom selector engines](./extensibility.md)
-
-For convenience, selectors in the wrong format are heuristically converted to the right format:
-- selector starting with `//` or `..` is assumed to be `xpath=selector`;
-- selector starting and ending with a quote (either `"` or `'`) is assumed to be `text=selector`;
-- otherwise selector is assumed to be `css=selector`.
+Text selectors locate elements that contain text nodes with the passed text.
```js
-// queries 'div' css selector
-const handle = await page.$('css=div');
-
-// queries '//html/body/div' xpath selector
-const handle = await page.$('xpath=//html/body/div');
-
-// queries '"foo"' text selector
-const handle = await page.$('text="foo"');
-
-// queries 'span' css selector inside the result of '//html/body/div' xpath selector
-const handle = await page.$('xpath=//html/body/div >> css=span');
-
-// converted to 'css=div'
-const handle = await page.$('div');
-
-// converted to 'xpath=//html/body/div'
-const handle = await page.$('//html/body/div');
-
-// converted to 'text="foo"'
-const handle = await page.$('"foo"');
-
-// queries '../span' xpath selector starting with the result of 'div' css selector
-const handle = await page.$('div >> ../span');
-
-// queries 'span' css selector inside the div handle
-const handle = await divHandle.$('css=span');
+await page.click('text=Log in');
```
```python async
-# queries 'div' css selector
-handle = await page.query_selector('css=div')
-
-# queries '//html/body/div' xpath selector
-handle = await page.query_selector('xpath=//html/body/div')
-
-# queries '"foo"' text selector
-handle = await page.query_selector('text="foo"')
-
-# queries 'span' css selector inside the result of '//html/body/div' xpath selector
-handle = await page.query_selector('xpath=//html/body/div >> css=span')
-
-# converted to 'css=div'
-handle = await page.query_selector('div')
-
-# converted to 'xpath=//html/body/div'
-handle = await page.query_selector('//html/body/div')
-
-# converted to 'text="foo"'
-handle = await page.query_selector('"foo"')
-
-# queries '../span' xpath selector starting with the result of 'div' css selector
-handle = await page.query_selector('div >> ../span')
-
-# queries 'span' css selector inside the div handle
-handle = await div_handle.query_selector('css=span')
+await page.click("text=Log in")
```
```python sync
-# queries 'div' css selector
-handle = page.query_selector('css=div')
-
-# queries '//html/body/div' xpath selector
-handle = page.query_selector('xpath=//html/body/div')
-
-# queries '"foo"' text selector
-handle = page.query_selector('text="foo"')
-
-# queries 'span' css selector inside the result of '//html/body/div' xpath selector
-handle = page.query_selector('xpath=//html/body/div >> css=span')
-
-# converted to 'css=div'
-handle = page.query_selector('div')
-
-# converted to 'xpath=//html/body/div'
-handle = page.query_selector('//html/body/div')
-
-# converted to 'text="foo"'
-handle = page.query_selector('"foo"')
-
-# queries '../span' xpath selector starting with the result of 'div' css selector
-handle = page.query_selector('div >> ../span')
-
-# queries 'span' css selector inside the div handle
-handle = div_handle.query_selector('css=span')
+page.click("text=Log in")
```
-## Syntax
-Selectors are defined by selector engine name and selector body, `engine=body`.
+By default, the match is case-insensitive, it ignores leading/trailing whitespace and searches for
+a substring. This means `text= Login` matches ``.
-* `engine` refers to one of the supported engines
- * Built-in selector engines: [css], [text], [xpath] and [id selectors][id]
- * Learn more about [custom selector engines](./extensibility.md)
-* `body` refers to the query string for the respective engine
- * For `text`, body is the text content
- * For `css`, body is a [css selector](https://developer.mozilla.org/en/docs/Web/CSS/CSS_Selectors)
+Text body can be escaped with single or double quotes for precise matching, insisting on exact match,
+including specified whitespace and case. This means `text="Login "` will only match
+`` with exactly one space after "Login". Quoted text follows the usual escaping
+rules, e.g. use `\"` to escape double quote in a double-quoted string: `text="foo\"bar"`.
-Body format is assumed to ignore leading and trailing white spaces, so that extra whitespace can be added for readability.
+Text body can also be a JavaScript-like regex wrapped in `/` symbols. This means `text=/^\\s*Login$/i`
+will match `` with any number of spaces before "Login" and no spaces after.
-### Short-forms
-For convenience, common selectors have short-forms:
-- Selector starting with `//` or `..` is assumed to be `xpath=selector`
- - Example: `'//html'` is converted to `'xpath=//html'`.
-- Selector starting and ending with a quote (either `"` or `'`) is assumed to be `text=selector`
- - Example: `'"foo"'` is converted to `'text="foo"'`.
-- Otherwise, selector is assumed to be `css=selector`
- - Example: `'div'` is converted to `'css=div'`.
+Input elements of the type `button` and `submit` are rendered with their value as text, and text
+engine finds them. For example, `text=Login` matches ``.
+
+Selector string starting and ending with a quote (either `"` or `'`) is assumed to be a text selector.
+For example, Playwright converts `'"Login"'` to `'text="Login"'` internally.
+
+## Basic CSS selectors
+
+Playwright augments standard CSS selectors in two ways:
+* `css` engine pierces open shadow DOM by default.
+* Playwright adds a few custom pseudo-classes like `:visible`.
+
+```js
+await page.click('button');
+```
+
+```python async
+await page.click("button")
+```
+
+```python sync
+page.click("button")
+```
+
+## Selecting visible elements
+
+The `:visible` pseudo-class in CSS selectors matches the elements that are
+[visible](./actionability.md#visible). For example, `input` matches all the inputs on the page, while
+`input:visible` matches only visible inputs. This is useful to distinguish elements that are very
+similar but differ in visibility.
+
+:::note
+It's usually better to follow the [best practices](#best-practices) and find a more reliable way to
+uniquely identify the element.
+:::
+
+Consider a page with two buttons, first invisible and second visible.
+
+```html
+
+
+```
+
+* This will find the first button, because it is the first one in DOM order. Then it will wait for the button to become visible before clicking, or timeout while waiting:
+
+ ```js
+ await page.click('button');
+ ```
+
+ ```python async
+ await page.click("button")
+ ```
+
+ ```python sync
+ page.click("button")
+ ```
+
+* This will find a second button, because it is visible, and then click it.
+
+ ```js
+ await page.click('button:visible');
+ ```
+ ```python async
+ await page.click("button:visible")
+ ```
+ ```python sync
+ page.click("button:visible")
+ ```
+
+Use `:visible` with caution, because it has two major drawbacks:
+* When elements change their visibility dynamically, `:visible` will give unpredictable results based on the timing.
+* `:visible` forces a layout and may lead to querying being slow, especially when used with `page.waitForSelector(selector[, options])` method.
+
+## Selecting elements that contain other elements
+
+The `:has()` pseudo-class is an [experimental CSS pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:has). It returns an element if any of the selectors passed as parameters
+relative to the :scope of the given element match at least one element.
+
+Following snippet returns text content of an `` element that has a `
` inside.
+
+```js
+await page.textContent('article:has(div.promo)');
+```
+
+```python async
+await page.textContent("article:has(div.promo)")
+```
+
+```python sync
+page.textContent("article:has(div.promo)")
+```
+
+## Selecting elements matching one of the conditions
+
+The `:is()` pseudo-class is an [experimental CSS pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:is).
+It is a function that takes a selector list as its argument, and selects any element that
+can be selected by one of the selectors in that list. This is useful for writing large
+selectors in a more compact form.
+
+```js
+// Clicks a