diff --git a/docs/User-Guide_Armbian-Config/System.md b/docs/User-Guide_Armbian-Config/System.md
index 1799f6bd..4f752f26 100644
--- a/docs/User-Guide_Armbian-Config/System.md
+++ b/docs/User-Guide_Armbian-Config/System.md
@@ -3,12 +3,19 @@
 
 ***
 
-## Enable Armbian firmware upgrades
-This will enable Armbian kernel upgrades that are currently put on hold.
+## Alternative kernels, headers, rolling updates, overlays
+
+
+***
+
+### Install alternative kernels
+Switching between kernels might change functionality of your device. 
+
+It might fail to boot!
 
 **Command:** 
 ~~~
-armbian-config --cmd SY001
+armbian-config --cmd SY201
 ~~~
 
 **Author:** @igorpecovnik
@@ -19,12 +26,10 @@ armbian-config --cmd SY001
 
 ***
 
-## Disable Armbian kernel upgrades
-Disable Armbian kernel/firmware upgrades
-
+### Install Linux headers
 **Command:** 
 ~~~
-armbian-config --cmd SY002
+armbian-config --cmd SY204
 ~~~
 
 **Author:** @igorpecovnik
@@ -35,15 +40,10 @@ armbian-config --cmd SY002
 
 ***
 
-## Edit the boot environment
-This will open /boot/armbianEnv.txt file to edit
-CTRL+S to save
-CTLR+X to exit
-would you like to continue?
-
+### Remove Linux headers
 **Command:** 
 ~~~
-armbian-config --cmd SY003
+armbian-config --cmd SY205
 ~~~
 
 **Author:** @igorpecovnik
@@ -54,13 +54,13 @@ armbian-config --cmd SY003
 
 ***
 
-## Install Linux headers
+### Manage device tree overlays
 **Command:** 
 ~~~
-armbian-config --cmd SY004
+armbian-config --cmd SY210
 ~~~
 
-**Author:** @igorpecovnik
+**Author:** @viraniac @igorpecovnik
 
 **Status:** Stable
 
@@ -68,10 +68,29 @@ armbian-config --cmd SY004
 
 ***
 
-## Remove Linux headers
+### Select Odroid board configuration
 **Command:** 
 ~~~
-armbian-config --cmd SY005
+armbian-config --cmd SY300
+~~~
+
+**Author:** 
+
+**Status:** Preview
+
+
+
+***
+
+### Edit the boot environment
+This will open /boot/armbianEnv.txt file to edit
+CTRL+S to save
+CTLR+X to exit
+would you like to continue?
+
+**Command:** 
+~~~
+armbian-config --cmd SY010
 ~~~
 
 **Author:** @igorpecovnik
@@ -82,10 +101,15 @@ armbian-config --cmd SY005
 
 ***
 
-## Install to internal storage
+## Install to internal media, ZFS, NFS, read-only rootfs
+
+
+***
+
+### Install to internal storage
 **Command:** 
 ~~~
-armbian-config --cmd SY006
+armbian-config --cmd SY001
 ~~~
 
 **Author:** @igorpecovnik
@@ -96,18 +120,27 @@ armbian-config --cmd SY006
 
 ***
 
-## Manage SSH login options
+### ZFS filesystem - enable support
+**Command:** 
+~~~
+armbian-config --cmd SY220
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
 
 
 ***
 
-### Disable root login
+### ZFS filesystem - remove support
 **Command:** 
 ~~~
-armbian-config --cmd SY101
+armbian-config --cmd SY221
 ~~~
 
-**Author:** @igorpecovnik
+**Author:** @armbian
 
 **Status:** Stable
 
@@ -115,10 +148,13 @@ armbian-config --cmd SY101
 
 ***
 
-### Enable root login
+### Enable read only filesystem
+This will enable Armbian read-only filesystem. Reboot is mandatory?
+
+
 **Command:** 
 ~~~
-armbian-config --cmd SY102
+armbian-config --cmd SY007
 ~~~
 
 **Author:** @igorpecovnik
@@ -129,10 +165,13 @@ armbian-config --cmd SY102
 
 ***
 
-### Disable password login
+### Disable read only filesystem
+This will disable Armbian read-only filesystem. Reboot is mandatory?
+
+
 **Command:** 
 ~~~
-armbian-config --cmd SY103
+armbian-config --cmd SY008
 ~~~
 
 **Author:** @igorpecovnik
@@ -143,10 +182,10 @@ armbian-config --cmd SY103
 
 ***
 
-### Enable password login
+### Install network filesystem (NFS) daemon
 **Command:** 
 ~~~
-armbian-config --cmd SY104
+armbian-config --cmd NFS01
 ~~~
 
 **Author:** @igorpecovnik
@@ -157,10 +196,10 @@ armbian-config --cmd SY104
 
 ***
 
-### Disable Public key authentication login
+### Configure network filesystem (NFS) daemon
 **Command:** 
 ~~~
-armbian-config --cmd SY105
+armbian-config --cmd NFS02
 ~~~
 
 **Author:** @igorpecovnik
@@ -171,10 +210,10 @@ armbian-config --cmd SY105
 
 ***
 
-### Enable Public key authentication login
+### Remove network filesystem (NFS) daemon
 **Command:** 
 ~~~
-armbian-config --cmd SY106
+armbian-config --cmd NFS03
 ~~~
 
 **Author:** @igorpecovnik
@@ -185,10 +224,15 @@ armbian-config --cmd SY106
 
 ***
 
-### Disable OTP authentication
+## Manage SSH daemon options, enable 2FA
+
+
+***
+
+### Disable root login
 **Command:** 
 ~~~
-armbian-config --cmd SY107
+armbian-config --cmd SY101
 ~~~
 
 **Author:** @igorpecovnik
@@ -199,10 +243,10 @@ armbian-config --cmd SY107
 
 ***
 
-### Enable OTP authentication
+### Enable root login
 **Command:** 
 ~~~
-armbian-config --cmd SY108
+armbian-config --cmd SY102
 ~~~
 
 **Author:** @igorpecovnik
@@ -213,10 +257,10 @@ armbian-config --cmd SY108
 
 ***
 
-### Generate new OTP authentication QR code
+### Disable password login
 **Command:** 
 ~~~
-armbian-config --cmd SY109
+armbian-config --cmd SY103
 ~~~
 
 **Author:** @igorpecovnik
@@ -227,10 +271,10 @@ armbian-config --cmd SY109
 
 ***
 
-### Show OTP authentication QR code
+### Enable password login
 **Command:** 
 ~~~
-armbian-config --cmd SY110
+armbian-config --cmd SY104
 ~~~
 
 **Author:** @igorpecovnik
@@ -241,10 +285,10 @@ armbian-config --cmd SY110
 
 ***
 
-### Disable last login banner
+### Disable Public key authentication login
 **Command:** 
 ~~~
-armbian-config --cmd SY111
+armbian-config --cmd SY105
 ~~~
 
 **Author:** @igorpecovnik
@@ -255,10 +299,10 @@ armbian-config --cmd SY111
 
 ***
 
-### Enable last login banner
+### Enable Public key authentication login
 **Command:** 
 ~~~
-armbian-config --cmd SY112
+armbian-config --cmd SY106
 ~~~
 
 **Author:** @igorpecovnik
@@ -269,12 +313,10 @@ armbian-config --cmd SY112
 
 ***
 
-## Change shell system wide to BASH
-This will switch system wide shell to BASH
-
+### Disable OTP authentication
 **Command:** 
 ~~~
-armbian-config --cmd SY008
+armbian-config --cmd SY107
 ~~~
 
 **Author:** @igorpecovnik
@@ -285,12 +327,10 @@ armbian-config --cmd SY008
 
 ***
 
-## Change shell system wide to ZSH
-This will switch system wide shell to ZSH
-
+### Enable OTP authentication
 **Command:** 
 ~~~
-armbian-config --cmd SY009
+armbian-config --cmd SY108
 ~~~
 
 **Author:** @igorpecovnik
@@ -301,12 +341,10 @@ armbian-config --cmd SY009
 
 ***
 
-## Switch to rolling release
-This will switch OS to rolling releases.
-
+### Generate new OTP authentication QR code
 **Command:** 
 ~~~
-armbian-config --cmd SY010
+armbian-config --cmd SY109
 ~~~
 
 **Author:** @igorpecovnik
@@ -317,12 +355,10 @@ armbian-config --cmd SY010
 
 ***
 
-## Switch to stable release
-This will switch OS to stable releases
-
+### Show OTP authentication QR code
 **Command:** 
 ~~~
-armbian-config --cmd SY011
+armbian-config --cmd SY110
 ~~~
 
 **Author:** @igorpecovnik
@@ -333,13 +369,24 @@ armbian-config --cmd SY011
 
 ***
 
-## Enable read only filesystem
-This will enable Armbian read-only filesystem. Reboot is mandatory?
+### Disable last login banner
+**Command:** 
+~~~
+armbian-config --cmd SY111
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Stable
 
 
+
+***
+
+### Enable last login banner
 **Command:** 
 ~~~
-armbian-config --cmd SY012
+armbian-config --cmd SY112
 ~~~
 
 **Author:** @igorpecovnik
@@ -350,13 +397,17 @@ armbian-config --cmd SY012
 
 ***
 
-## Disable read only filesystem
-This will disable Armbian read-only filesystem. Reboot is mandatory?
+## Change shell, adjust MOTD
 
 
+***
+
+### Change shell system wide to BASH
+This will switch system wide shell to BASH
+
 **Command:** 
 ~~~
-armbian-config --cmd SY013
+armbian-config --cmd SY005
 ~~~
 
 **Author:** @igorpecovnik
@@ -367,10 +418,12 @@ armbian-config --cmd SY013
 
 ***
 
-## Adjust welcome screen (motd)
+### Change shell system wide to ZSH
+This will switch system wide shell to ZSH
+
 **Command:** 
 ~~~
-armbian-config --cmd SY014
+armbian-config --cmd SY006
 ~~~
 
 **Author:** @igorpecovnik
@@ -381,14 +434,10 @@ armbian-config --cmd SY014
 
 ***
 
-## Install alternative kernels
-Switching between kernels might change functionality of your device. 
-
-It might fail to boot!
-
+### Adjust welcome screen (motd)
 **Command:** 
 ~~~
-armbian-config --cmd SY015
+armbian-config --cmd SY009
 ~~~
 
 **Author:** @igorpecovnik
@@ -399,13 +448,22 @@ armbian-config --cmd SY015
 
 ***
 
-## Manage device tree overlays
+## OS updates and distribution upgrades
+**Status:** Active
+
+
+
+***
+
+### Enable Armbian firmware upgrades
+This will enable Armbian kernel upgrades that are currently put on hold.
+
 **Command:** 
 ~~~
-armbian-config --cmd SY017
+armbian-config --cmd SY202
 ~~~
 
-**Author:** @viraniac @igorpecovnik
+**Author:** @igorpecovnik
 
 **Status:** Stable
 
@@ -413,18 +471,15 @@ armbian-config --cmd SY017
 
 ***
 
-## ZFS filesystem - enable support
-
-<!--- section image START from tools/include/images/SY018.png --->
-[![ZFS filesystem - enable support](/images/SY018.png)](#)
-<!--- section image STOP from tools/include/images/SY018.png --->
+### Disable Armbian kernel upgrades
+Disable Armbian kernel/firmware upgrades
 
 **Command:** 
 ~~~
-armbian-config --cmd SY018
+armbian-config --cmd SY203
 ~~~
 
-**Author:** @armbian
+**Author:** @igorpecovnik
 
 **Status:** Stable
 
@@ -432,13 +487,15 @@ armbian-config --cmd SY018
 
 ***
 
-## ZFS filesystem - remove support
+### Switch system to rolling packages repository
+This will switch OS to rolling releases.
+
 **Command:** 
 ~~~
-armbian-config --cmd SY019
+armbian-config --cmd SY206
 ~~~
 
-**Author:** @armbian
+**Author:** @igorpecovnik
 
 **Status:** Stable
 
@@ -446,15 +503,17 @@ armbian-config --cmd SY019
 
 ***
 
-## Select Odroid board configuration
+### Switch system to stable packages repository
+This will switch OS to stable releases
+
 **Command:** 
 ~~~
-armbian-config --cmd SY020
+armbian-config --cmd SY207
 ~~~
 
-**Author:** 
+**Author:** @igorpecovnik
 
-**Status:** Preview
+**Status:** Stable