diff --git a/_articles/features/folders.md b/_articles/features/folders.md
index a4e0b66f..2bcc0a9c 100644
--- a/_articles/features/folders.md
+++ b/_articles/features/folders.md
@@ -8,7 +8,7 @@ tags: [categories, folders, sub-folders]
order: 06
---
-Folders are structures used to organize your Personal Vault by gathering together Logins, Cards, Identities, and Secure Notes. Using Folders is a great way to make all Vault items easy to find.
+Folders are structures used to organize your Personal Vault by gathering together Logins, Cards, Identities, and Secure Notes. Using Folders is a great way to make all Vault items easy to find. Any Vault item can be added to a Folder, including [shared items]({{site.baseurl}}/article/share-to-a-collection/).
{% callout success %}
Items added to a Folder will still appear in your Vault when {% icon fa-th %} **All Items** is selected from the Filter menu, and deleting a Folder **will not** delete the items in that Folder.
@@ -16,34 +16,102 @@ Items added to a Folder will still appear in your Vault when {% icon fa-th %} **
## Create a Folder
-Folders can be created from the [Web Vault](https://vault.bitwarden.com){:target="\_blank"} or any Bitwarden client application.
-- From the [Web Vault](https://vault.bitwarden.com){:target="\_blank"} or Desktop Application, select the {% icon fa-plus %} **Add** icon in your **Folders** list.
+Folders can be created, renamed, and deleted from any Bitwarden client application:
- Once created, you can rename a folder at any time using the hover-over {% icon fa-pencil %} **Pencil** icon.
-- From a Mobile App or Browser Extension, open the {% icon fa-cogs %} **Settings** menu, tap/select the **Folders** option, and tap/select the {% icon fa-plus %} **Add** icon.
+
+
+{% capture web_vault %}
+### Web Vault
- Once created, you can rename a folder at any time from the same menu by tapping/selecting an existing folder.
-- From the CLI, use the command `bw create folder `.
+To create a Folder, select the {% icon fa-plus %} **Add** icon in the Folders list:
-{% image /manage-items/folder-add-all.png Add a folder%}
+{% image /manage-items/folder-add-web.png Add a folder %}
+
+Once created, you can **rename or delete** a folder at any time using the hover-over {% icon fa-pencil %} **Pencil** icon.
+
+{% endcapture %}
+{{ web_vault | markdownify}}
+
+
+{% capture browser_extension %}
+### Browser Extension
+
+To create a Folder, select the {% icon fa-cogs %} **Settings** menu, select the **Folders** option, and tap/select the {% icon fa-plus %} **Add** icon:
+
+{% image /manage-items/folder-add-extension.gif Add a folder %}
+
+Once created, you can **rename or delete** a folder at any time from the same menu by selecting an existing folder.
+
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
+{% capture desktop_info %}
+### Desktop App
+
+To create a Folder, select the {% icon fa-plus %} **Add** icon in the Folders list:
+
+{% image /manage-items/folder-add-desk.png Add a folder %}
+
+Once created, you can **rename or delete** a folder at any time using the hover-over {% icon fa-pencil %} **Pencil** icon.
+
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture mobile_info %}
+### Mobile App
+
+To create a Folder, tap the {% icon fa-cogs %} **Settings** menu, tap the **Folders** option, and tap/select the {% icon fa-plus %} **Add** icon:
+
+{% image /manage-items/folder-add-mob.jpeg Add a folder %}
+
+Once created, you can **rename or delete** a folder at any time from the same menu by tapping an existing folder.
+
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
+{% capture cli_info %}
+### CLI
+
+To create a Folder, use the command:
+
+```
+bw create folder
+```
+
+You can edit an existing folder using `bw edit ` and delete one using `bw delete folder `. For more information, refer to our [CLI documentation]({{site.baseurl}}/article/cli).
+
+{% endcapture %}
+{{ cli_info | markdownify}}
+
+
{% callout info %}
If you're a member of an Organization, **Collections** will be shown below your Folders in the Filters menu.
-There are similarities between Folders and Collections. **Folders are only for your Personal Vault and unique to you**, where Collections are shared between members of Organizations.
+There are similarities between Folders and Collections. **Folders organize your Personal Vault** (but can include [shared items]({{site.baseurl}}/article/share-to-a-collection/)) and are unique to you, where Collections are shared between members of Organizations.
{% endcallout %}
-## Delete a folder
-
-You can delete folders from the [Web Vault](https://vault.bitwarden.com){:target="\_blank"} or any Bitwarden client application:
-
-- From the Web Vault or Desktop Application, hover over the folder to delete and select the displayed pencil icon. From the popup, select the {% icon fa-trash %} **Delete**.
-
-- From a Browser Extension or Mobile App, open the {% icon fa-cogs %} **Settings** tab and tap/select the **Folders** option. From the list, tap/select the folder to delete.
-
- On Browser Extensions, simply select the {% icon fa-trash %} **Delete Folder** button. On Mobile, and tap the menu ( {% icon fa-ellipsis-v %} / {% icon fa-ellipsis-h %} ) and tap **Delete**.
-
-## Create Nested Folders
+### Nested Folders
Folders can be "nested" in order to logically organize them within your Vault. There's no limit to the depth with which you can nest Folders, but creating too many levels may interfere with your Vault's interface.
@@ -57,13 +125,102 @@ To create a nested Folder, give a new Folder a **Name** that includes the "paren
If there is no Folder with the corresponding "parent" name, the Folder won't nest and its title will be displayed in-full.
-## Add Items to a Folder
+## Move Items to a Folder
-Once you've created a Folder in your Vault, there are a few ways to add items to it:
+Once you've created a Folder in your Vault, there are a few ways to move items to it:
-- From the **Add Item** or **Edit Item** screen on any Bitwarden application, select your new folder from the **Folder** dropdown and **Save** your item:
+
+
+{% capture web_vault %}
+### Web Vault
- {% image manage-items/add-to-folder.png Add item to a Folder%}
-- From the **My Vault** view, select the Vault items you want to move and use the top-level {% icon fa-cog %} gear dropdown to select the {% icon fa-share %} **Move Selected** button. On the Move Selected dialog box, choose the Folder you want to move the item(s) to:
+From the Web Vault, you can either:
+
+- Navigate to the **Add Item** or **Edit Item** screen, select your new folder from the **Folder** dropdown and **Save** your item:
+
+ {% image manage-items/add-to-folder.png Move item to a Folder%}
+- Navigate to the **My Vault** view, select the Vault items you want to move and use the top-level {% icon fa-cog %} gear dropdown to select the {% icon fa-share %} **Move Selected** button. On the Move Selected dialog box, choose the Folder you want to move the item(s) to:
{% image manage-items/add-to-folder-move.png Move item to a Folder %}
+
+{% endcapture %}
+{{ web_vault | markdownify}}
+
+
+{% capture browser_extension %}
+### Browser Extension
+
+Open the Vault item you want to move, select the **Folders** dropdown, and choose the folder to move the item to:
+
+{% image /manage-items/folder-move-be.png Move item to a folder %}
+
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
+{% capture desktop_info %}
+### Desktop App
+
+Open the Vault item you want to move, select the **Folders** dropdown, and choose the folder to move the item to:
+
+{% image /manage-items/folder-move-desk.png Move item to a folder %}
+
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture mobile_info %}
+### Mobile App
+
+Open the Vault item you want to move, tap the **Folders** dropdown, and choose the folder to move the item to:
+
+{% image /manage-items/folder-move-mob.jpeg Move item to a folder %}
+
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
+{% capture cli_info %}
+### CLI
+
+Use the `bw edit` command to manipulate the `folderId` attribute of the Vault item JSON object, as in the following example:
+
+```
+bw get item 7ac9cae8-5067-4faf-b6ab-acfd00e2c328 | jq '.folderId="3d9cecac-71a2-4637-9341-acf000eedf04"' | bw encode | bw edit item 7ac9cae8-5067-4faf-b6ab-acfd00e2c328
+```
+
+{% callout success %}
+Using `edit` will require you to:
+- Use the `get` command with the exact `id` of the item you want to edit.
+- Know the exact `folderId` of the folder you want to move it to.
+- Manipulate the JSON object (specifically, the `folderId` attribute) with a [command-line JSON processor like jq](https://stedolan.github.io/jq/){:target="\_blank"}.
+- Use the `encode` command to encode changes to the JSON object.
+
+If you're unfamiliar with using any of these parts, refer to our [CLI documentation]({{site.baseurl}}/article/cli).
+{% endcallout %}
+
+{% endcapture %}
+{{ cli_info | markdownify}}
+
+
+
+{% callout success %}
+Items [shared from an Organization]({{site.baseurl}}/article/share-to-a-collection/) can be added to your personal Folders, and doing so will only impact how the item appears in your Personal Vault (i.e. adding an item to a Folder won't give anyone access to that Folder, or change whether it's in a Folder in their Vaults).
+{% endcallout %}
diff --git a/images/manage-items/folder-add-be.png b/images/manage-items/folder-add-be.png
new file mode 100644
index 00000000..5c60b13b
Binary files /dev/null and b/images/manage-items/folder-add-be.png differ
diff --git a/images/manage-items/folder-add-desk.png b/images/manage-items/folder-add-desk.png
new file mode 100644
index 00000000..499e406c
Binary files /dev/null and b/images/manage-items/folder-add-desk.png differ
diff --git a/images/manage-items/folder-add-extension.gif b/images/manage-items/folder-add-extension.gif
new file mode 100644
index 00000000..205491ce
Binary files /dev/null and b/images/manage-items/folder-add-extension.gif differ
diff --git a/images/manage-items/folder-add-mob.jpeg b/images/manage-items/folder-add-mob.jpeg
new file mode 100644
index 00000000..db4d18e3
Binary files /dev/null and b/images/manage-items/folder-add-mob.jpeg differ
diff --git a/images/manage-items/folder-add-web.png b/images/manage-items/folder-add-web.png
new file mode 100644
index 00000000..8cd29b13
Binary files /dev/null and b/images/manage-items/folder-add-web.png differ
diff --git a/images/manage-items/folder-move-be.png b/images/manage-items/folder-move-be.png
new file mode 100644
index 00000000..82d7fd37
Binary files /dev/null and b/images/manage-items/folder-move-be.png differ
diff --git a/images/manage-items/folder-move-desk.png b/images/manage-items/folder-move-desk.png
new file mode 100644
index 00000000..a82d009b
Binary files /dev/null and b/images/manage-items/folder-move-desk.png differ
diff --git a/images/manage-items/folder-move-mob.jpeg b/images/manage-items/folder-move-mob.jpeg
new file mode 100644
index 00000000..117a410a
Binary files /dev/null and b/images/manage-items/folder-move-mob.jpeg differ