diff --git a/docs/features/folders/create-a-new-folder.md b/docs/features/folders/create-a-new-folder.md
new file mode 100644
index 00000000..e114d90d
--- /dev/null
+++ b/docs/features/folders/create-a-new-folder.md
@@ -0,0 +1,82 @@
+# How to Create a New Folder
+
+1. Log into [HexOS deck](deck.hexos.com)
+2. Move to the Folders section in the side menu
+3. Select the **New Folder** button
+
+
+
+This will bring up the **Create Folder** dialogue
+
+
+
+## General
+
+### Folder Name
+- Select a folder name.
+> **Note:** Folder name cannot be modified after folder creation.
+
+### Location
+- Select the pool where you would like your folder to be in.
+ - If you only have one pool then it will automatically be selected for you.
+> **Note:** Folder location cannot be modified after folder creation.
+
+
+
+## Access (optional)
+In the **Access** section you can select which users have access to this folder and which permissions they are granted. This is covered in more detail in the [Folder Permissions section](/folders/##folder-permissions).
+
+
+
+In this example a user has been selected and given permission only to view the files.
+
+
+
+## Options
+
+### Folder storage limit (optional)
+In this section you can set a maximum amount of disk space the folder may use. This helps manage disk usage when multiple people or applications share your server.
+
+### Backup (optional)
+You can Enable Time Machine by selecting the checkbox. Enabling this feature sets up the folder with the proper configuration for Apple's Time Machine backup system.
+
+
+
+## Encryption (optional)
+You can optionally enable encryption on folders you create. [Read about encrypted folders here.](/features/folders/index.md#encrypted-folders)
+- The passphrase must be at least 8 characters long.
+- Encryption is required for backing up a folder to another server.
+- Data from encrypted folders cannot be recovered if the passphrase is lost.
+
+
+
+>**Important:** Encryption can only be enabled during folder creation and cannot be disabled once the folder is created, nor can the passphrase be changed.
+
+## Finalizing New Folder Creation
+
+
+
+After configuring all fo the folder settings you will see the overview of your choices.
+
+If you wish to adjust any settings, select the back button and edit the settings. When you are ready select **Create** and the folder will be created. When a folder is created you will see it on the **Folders** screen.
+
+## Editing folder settings
+
+To edit the settings of a folder go to the Folders screen and select the folder you wish to edit.
+
+
+
+Then select **Edit**
+
+
+
+Folders cannot be renamed and encryption settings can’t be modified after folder creation.
The edit dialogue shows you what may be edited.
+
+
+
+In this example, a new user has been added and the folder permissions are set to allow the new user to view the Recipes folder.
+
+
+
+
+
diff --git a/docs/features/folders/create-a-new-user.md b/docs/features/folders/create-a-new-user.md
new file mode 100644
index 00000000..f0700364
--- /dev/null
+++ b/docs/features/folders/create-a-new-user.md
@@ -0,0 +1,61 @@
+# How to create a new user
+
+If you want to share selected folders or files with someone who has access to your network, you can do this is by adding a new user in HexOS.
+
+- You can select the folders each user can access.
+- You can select if users are allowed to view files or edit them as well.
+- User cannot access any other part of your server they aren't given access to.
+ - Users created here are unable to view HexOS Deck or access applications
+
+## Adding a new user
+
+1. Open [HexOS deck](https://deck.hexos.com)
+2. Select the **Folders** screen
+3. Select **Add new** under the **Users** section.
+> **Note:** The admin account doesn't show up in this list of users
+
+
+
+
+
+1. Select a **Username** and **Password**
+2. Select **Add account**
+
+
+
+The user will then appear in the deck under the **Users** section of the **Folders** screen. This might take a few moments.
+
+
+
+
+## Changing the password of a user
+
+You can change the username or set a new password for an existing user.
+1. Open [HexOS deck](https://deck.hexos.com)
+2. Select the **Folders** screen
+3. Select the user you wish to edit
+
+
+
+Select the **Edit** button
+
+
+
+
+1. Change the username and set a new password if desired
+2. Select **Update account** when you are finished.
+
+
+
+## How can a user access folders
+
+When you [create](/features/folders/create-a-new-folder) or [edit](/features/folders/create-a-new-folder/#editing-folder-settings) a folder you can choose which users may access the contents and what permissions they have.
+
+You can read about the **Access** settings on the [create a new folder page here.](/features/folders/create-a-new-folder/#access)
+
+The user will need to setup access to the folders on their computer or phone as described in the [how to access folders guide](/folders/how-to-access-folder-contents).
+
+Their device will prompt them for the username and password when they try to access a private folder. They will be able to see other folders and the folder names but the user will only be able to access the folders they have been granted permission to access.
+
+
+
diff --git a/docs/features/folders/how-to-access-folder-contents.md b/docs/features/folders/how-to-access-folder-contents.md
new file mode 100644
index 00000000..2b56aa1c
--- /dev/null
+++ b/docs/features/folders/how-to-access-folder-contents.md
@@ -0,0 +1,126 @@
+# How to Access Files and Folders Over the Network
+
+In HexOS, you can [create folders](/features/folders/create-a-new-folder) through the deck, but you can’t add contents to the folders via the deck.
+The folder contents are added, viewed and edited from another device *over the network*. This means folders are accessed using a computer, laptop or phone connected to the same network.
+
+This guide will explain how to access a folder on your HexOS server from a variety of other devices.
+>Note: Some apps may require different methods to add or view data. In Immich, for example, you upload photos and videos via a web browser.
+
+## Copying the Address of a Folder
+
+1. In the folders screen of your HexOS [deck](https://deck.hexos.com), select on the folder you want to access
+2. Select the **Browse** button
+
+
+
+You will be given the folder IP address needed to connect to it from other devices on the same network. You can select the Copy button to copy a link and paste it following the instructions below.
+
+
+
+You can select Windows or Mac using the dropdown.
+
+
+
+Changing the Windows/Mac setting doesn't modify the folder, it just provides instructions for the selected operating system.
+
+## Accessing the folder from your device
+
+Here are some examples of how to access the file from various devices. The specific method may vary a little depending on your operating system.
+
+### On Mac
+
+1. Open Finder
+2. Select "Go" in the menu bar
+3. Select "Connect to Server"
+4. Paste the SMB link into the "Server Address" field
+5. Select the "Connect" button
+
+### On Windows
+1. Open File Explorer
+2. On the left side there is a list of folders and locations, select **This PC**
+
+
+
+1. Right click for the menu
+2. Select **Add a network location**
+
+
+
+Follow the wizard though by selecting the **Next** button.
+
+
+
+Select the **Next** button on the **Choose a custom network location** step.
+
+
+
+Paste the folder address in and select the **Next** button.
+
+
+
+You can optionally choose a display name. Select the **Next** button.
+
+
+
+Then select the **Finish** button.
+
+
+
+Your folder will now be accessible from your file browser.
+
+If the folder is private you will be asked for a username and password before it will open.
+
+
+
+### On ChromeOS
+
+Open the My Files app.
+
+
+
+1. On the top right, select the menu button (three vertical dots)
+2. Select Services
+3. Select SMB File Share
+
+
+
+1. Then select a suggested share from the list or manually enter the URL using the given in the windows section "\\\ipaddress\Folder-name"
+2. Fill out the password field if required
+3. Select **Add**
+
+
+
+The file will now show in the left hand navigation on My Files
+
+
+
+### On Linux
+
+This varies depending on your linux distro. The url required will likely be similar to the Mac one, with forward slashes (rather than windows and chrome with \\ back slashes). The following example is from Fedora.
+
+1. Open your files app
+2. Select **Network**
+3. Paste in the folder address
+
+
+
+1. Fill in the username and password if needed
+2. Select **Connect**
+
+
+
+You will now see the folder in your Networks section of your file manager and also as a shortcut at the bottom of the left hand navigation of files
+
+
+
+Sometimes the folder may show under **Other locations**
+
+
+
+## Android
+
+Guide coming soon
+
+## iOS
+
+Guide coming soon
diff --git a/docs/features/folders/index.md b/docs/features/folders/index.md
index c99dd1d5..ea37da3e 100644
--- a/docs/features/folders/index.md
+++ b/docs/features/folders/index.md
@@ -1,60 +1,76 @@
# Folders
-As with most computer systems, folders are used to store data. Some are automatically created when applications are installed, but users can create folders themselves for sharing files over a network or backing up other devices (Apple Time Machine, Windows Backup, etc).
+Folders can be used to organize data, share files over the network and for back up with tools like Apple time machine. You are able to create folders and they can be automatically created when applications are installed.
-## Creating Folders
+Folders can optionally be password protected and encrypted. You can also create users and decide what they can view and edit.
-When creating a folder, you have several options to configure:
+## The Folders Screen
-### Location
-Choose which storage pool the folder will be created on. This is especially useful if you have multiple pools with different performance characteristics or purposes.
+You can access the Folders screen in the [Deck](https://deck.hexos.com) through the sidebar menu. On this screen you can view existing folders, create new folders and network credentials for accessing folders.
-### Access
-Choose who has access to this folder and what permissions they have. We'll cover this in more detail in the Users and Permissions section below.
+
-### Quota
-Set storage limits for individual folders to control how much space they can use. This helps manage disk usage when multiple people or applications share your server.
+You can’t browse the files from here. The Folders screen only shows the folders and not their contents.
[Read about how to access the folder contents here](/features/folders/how-to-access-folder-contents)
-### Time Machine
-Enable Time Machine support to let your Macs back up directly to this folder. This sets up the folder with the proper configuration for Apple's backup system.
+## Folder Permissions
-### Encryption
-You can optionally enable encryption on folders you create. Encrypted folders can be "locked" or "unlocked" using a custom passphrase created by the administrator specifically for making the folder accessible.
+### Permission Types
-> **Note:** Encryption can only be enabled during folder creation and cannot be disabled once the folder is created.
+You can give users specific types of access to folders:
-## How to Access Files and Folders Over the Network
+#### Read access
-Each folder has a "Browse" button that shows you exactly how to connect from your device. If you created a private folder you will need to connect to that folder using the associated Users credentials.
+Users with read access can view or download folder contents but can't edit or delete the contents.
-### On Mac
-Open Finder, click "Go" in the menu bar, select "Connect to Server". Paste the SMB link into the "Server Address" field and click "Connect".
+#### Write access
-### On Windows
-Open File Explorer, right-click on "This PC", then "Map network drive". Paste the SMB link into the "Folder" field and click "Finish" to connect.
+Users with write access can add, modify or delete the contents of the folder.
-## Users and Permissions
+## Folder Types
-Your account is automatically an administrator, which means you always have full access to all your folders. Creating additional users is optional and comes in handy when you want other people to access specific folders without sharing your admin credentials.
+### Public folders
-### Folder Types
-**Public folders:** Anyone can access these folders.
+Anyone can access these folders. This will include all users you have created. This means that anyone with access to your network can view, edit or delete the contents of these folders.
-**Private folders:** Only you and specifically selected users can access these folders.
+### Private folders
-### Permission Types
-You can also give users specific types of access to folders:
+Only those with network credentials created in HexOS can access these folders.
This means by default only the administrator has access. The administrator grant access to anyone given network credentials. Folder permissions for this type of folder can be modified.
+
+- Anyone with access to your network are able to see private folder names.
+- Anyone with access to the hard drives in your server may be able to read the data.
+
+### Encrypted folders
+
+File encryption is when a file's data is scrambled in a way it can only be recovered with a specific encryption key or passphrase.
When we create an encrypted folder, all of the contents placed i that folder will also be encrypted. The server administer can lock (encrypt) or unlock (decrypt) folders from the folder section of HexOS deck.
When a folder is locked, the folder and its contents are not visible nor accessible to anyone on the network. When a folder is unlocked it will work the same as a regular folder.
+- Encrypted folders can be selected to be public or private
+- Encryption is required for backing up a folder to another server.
+- The data on your server’s storage drives cannot be read even if someone gains physical access to them.
+- Selected passphrase must be a minimum of 8 characters long.
+- The selected passphrase is needed to unlock encrypted folder every time.
+- Passphrase cannot be changed after folder creation.
+- If the passphrase is lost, data cannot be recovered by HexOS.
+> **Note:** Encryption can only be enabled during folder creation and cannot be disabled once the folder is created.
-**Read access:** Users can view and download files but can't change anything.
+## Users
-**Write access:** Users can add, modify, and delete files in the folder.
+Creating additional users is optional.
-> **Security Note:** User accounts you create here are just for folder access through network file browsers like Finder or Windows Explorer. They don't give people any control over your server or applications.
+Your user account is automatically an administrator: this means you always have full access to all your folders.
+
+You can to create more users in order to grant others access to private folders.
+You can grant access to selected users during folder creation. Access to folders can be modified at in the folder screen.
+
+User accounts created here only grant folder access through network file browsers like MacOS Finder or Windows Explorer. These accounts don't allow any control over your server or applications.
## System Folders
-When you install apps they automatically create "System Folders" for their data. These appear separately from your personal folders and are managed by the apps themselves.
+When apps are installed, they automatically create "System Folders" for their data. These appear separately from your personal folders and are managed by the apps themselves.
+
+### Reserved names
+
+Certain folder names like "Downloads" are reserved for system use. If you create a folder with a reserved name, it will automatically appear in System Folders instead of your personal folders.
+
+### Default locations
+
+These folders have default locations, but you can change where they're created in [locations](/features/settings/#locations).
-### What you should know:
-- **Reserved names:** Certain folder names like "Downloads" are reserved for system use. If you create a folder with a reserved name, it will automatically appear in System Folders instead of your personal folders
-- **Default locations:** These folders have default locations, but you can change where they're created in [locations](/features/settings/#locations)