16 files changed, 503 insertions, 403 deletions

diff --git a/_ont/ont-cig-g-97cp.md b/_ont/ont-cig-g-97cp.md
index 8cbdaf0..cc280b6 100644
--- a/_ont/ont-cig-g-97cp.md
+++ b/_ont/ont-cig-g-97cp.md
@@ -11,8 +11,6 @@ parent: CIG
 | ---------------- | ------------------------------------------------------------------------ |
 | Vendor/Brand     | CIG                                                                      |
 | Model            | G-97CP                                                                   |
-| ODM              | CIG                                                                      |
-| ODM Product Code | G-97CP                                                                   |
 | ODM              | ✅                                                                       |
 | Chipset          | Realtek RTL9601D                                                         |
 | Flash            |                                                                          |
diff --git a/_ont/ont-d-link-dpn-100-rev-a2.md b/_ont/ont-d-link-dpn-100-rev-a2.md
index f9da5d9..b80cdc9 100644
--- a/_ont/ont-d-link-dpn-100-rev-a2.md
+++ b/_ont/ont-d-link-dpn-100-rev-a2.md
@@ -39,11 +39,11 @@ Once you access the stick via ssh you will be presented with a second tier login
 - [Ziza OP151s](/ont-ziza-op151s)
 - [T&W TW2362H-CDEL](/ont-t-w-tw2362h-cdel)
 
-# General Settings and Useful Commands
+# GPON/OMCI settings
 
 {% include alert.html content="all commands start from the twmanu shell." alert="Note"  icon="svg-info" color="blue" %}
 
-## Changing the ONT's S/N
+## Setting ONU GPON Serial Number
 {% include alert.html content="the S/N is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
 
 ```sh
@@ -54,7 +54,7 @@ hal
 set sn ALCLf0f0f0f0
 ```
 
-## Changing the ONT's PLOAM password
+## Setting ONU GPON PLOAM password
 
 {% include alert.html content="the PLOAM is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
 
@@ -70,7 +70,7 @@ manufactory
 set password hex 31323334353637383939
 ```
 
-## Show ONT info
+## Show ONU GPON info
 ```sh
 show info
 ```
diff --git a/_ont/ont-fs-com-gpon-onu-stick-with-mac.md b/_ont/ont-fs-com-gpon-onu-stick-with-mac.md
index 931f27a..73e43e7 100644
--- a/_ont/ont-fs-com-gpon-onu-stick-with-mac.md
+++ b/_ont/ont-fs-com-gpon-onu-stick-with-mac.md
@@ -118,7 +118,7 @@ For more info [XPONos partition layout](https://github.com/XPONos/linux_lantiq-f
 - [6BA1896SPLQA42 MTD0/U-Boot](https://mega.nz/file/FkswHbgL#s7-vaH65EPQ2O5vKeD3bU1_RPwzaKPOJdrCWvPQqDvc){: .btn } md5hash: 992b31a67c644aa68cf7f9caf956b1f9
 - [6BA1896SPLQA42 MTD2/Image0](https://mega.nz/file/AgshDICC#md1vLN14JBF3iaNoZBqQH_zwALHmEaOk3_rDm1FfOic){: .btn } md5hash: 04533554bb0c8b997697fbc048159002
 
-# General Settings and Useful Commands
+# Unlock the device
 
 {% include alert.html content=" The following commands concern version 6BA1896SPLQA42, to get the commands for version 6BA1896SPLQA41 please look at page [Carlito Firmware](/ont-huawei-ma5671a-carlito)." alert="Note" icon="svg-info" color="blu" %}
 
@@ -154,8 +154,40 @@ When you are ready with everything plugged in you need to press the button below
 {% include alert.html content="Your browser does not support JavaScript!" alert="Note"  icon="svg-warning" color="red" %}
 </noscript>
 
+# GPON ONU status
+
+## Get the operational status of the ONU
+
+```shell
+onu ploamsg
+```
+
+## Querying a particular OMCI ME
+```sh
+omci_pipe.sh meg MIB_IDX ME_IN
+```
+Where `MIB_IDX` is the MIB ID and the `ME_IN` is the ME instance number
+
+## Getting/Setting Speed LAN Mode
+
+To get the LAN Mode:
 
-## Setting S/N
+```sh
+onu lanpsg 0
+```
+The `link_status` variable tells the current speed
+
+| Value (for `sgmii_mode` and `link_status`) | Speed                              |
+| ------------------------------------------ | ---------------------------------- |
+| 3                                          | 1 Gbps / SGMII with auto-neg on    |
+| 4                                          | 1 Gbps / SGMII with auto-neg off   |
+| 5                                          | 2.5 Gbps / HSGMII with auto-neg on |
+
+To change the default lan mode value you can use `fw_setenv sgmii_mode`. The firmware already has the value 5 by default and it is generally not necessary to change it.
+
+# GPON/OMCI settings
+
+## Setting ONU GPON Serial Number
 ```sh
 set_serial_number ABCD12345678
 ```
@@ -164,7 +196,7 @@ Or:
 sfp_i2c -i8 -s "ABCD12345678"
 ```
 
-## Checking whether the S/N has been correctly set
+## Checking ONU GPON Serial Number
 ```sh
 fw_printenv | grep nSerial
 ```
@@ -173,28 +205,28 @@ Or:
 sfp_i2c -g
 ```
 
-## Setting PLOAM Password
+## Setting ONU GPON PLOAM password
 ```sh
 sfp_i2c -i11 -s "1234567890"
 ```
 
-## Setting LOID and Checkcode Password
+## Setting ONU GPON LOID and LOID password
 ```sh
 sfp_i2c -i9 -s "1234567890"
 sfp_i2c -i10 -s "password01"
 ```
 
-## Setting Eqipment ID (ME 257)
+## Setting OMCI equipment ID (ME 257)
 ```sh
 sfp_i2c -i6 -s "YOUR_EQUIPMENT_ID"
 ```
 
-## Setting Vendor ID (ME 256)
+## Setting OMCI Vendor ID (ME 256)
 ```sh
 sfp_i2c -i7 -s "YOUR_VENDOR_ID"
 ```
 
-## Changing ONU hardware version (ME 256)
+## Setting OMCI hardware version (ME 256)
 ```sh
 sed 's/256 0 HWTC 0000000000000/256 0 HWTC YOUR_ONU_VERSION/' /rom/etc/mibs/data_1g_8q.ini > /etc/mibs/data_1g_8q.ini
 ```
@@ -204,24 +236,7 @@ sed 's/256 0 HWTC 0000000000000/256 0 HWTC YOUR_ONU_VERSION/' /rom/etc/mibs/data
 cat /rom/etc/mibs/data_1g_8q.ini > /etc/mibs/data_1g_8q.ini
 ```
 
-## Enabling `data_1g_8q_us1280_ds512.ini` OMCI MIB file for 2500 Mbps profiles
-{% include alert.html content="The patch below is only compatible with the firmware version `6BA1896SPLQA42`" alert="Info" icon="svg-info" color="blue" %}
-{% include alert.html content="If you need to set the ONU version remember that you will have to do it using the MIB file `/etc/mibs/data_1g_8q_us1280_ds512.ini` instead of `/etc/mibs/data_1g_8q.ini`" alert="Info" icon="svg-info" color="blue" %}
-
-The MIB file `data_1g_8q_us1280_ds512.ini` is very useful to avoid performance problems in situations where 2500 Mbps speed profiles are used, to enable it you need to run this command:
-```sh
-fw_setenv mib_file data_1g_8q_us1280_ds512.ini
-```
-
-## Using custom OMCI MIB file
-{% include alert.html content="If you need to set the ONU version remember that you will have to do it using your custom MIB file instead of `/etc/mibs/data_1g_8q.ini`" alert="Info" icon="svg-info" color="blue" %}
-
-You have to copy the MIB file to /etc/mibs and then run this command:
-```sh
-fw_setenv mib_file YOUR_MIB_FILENAME
-```
-
-## Changing image software version (ME 7)
+## Setting OMCI software version (ME 7)
 {% include alert.html content="The patch below is only compatible with the firmware version `6BA1896SPLQA42`" alert="Info" icon="svg-info" color="blue" %}
 
 The image version normally couldn't be changed because it was hard-coded into the `/opt/lantiq/bin/omcid` binary, 
@@ -276,33 +291,37 @@ fw_setenv image1_version YOUR_IMAGE1_VERSION
 Now you can restart the stick.
 {% include alert.html content="Be aware that sometimes `omcid` can rewrite the two variables when runs in non patched state. After reboot, double check the values you put are still there." alert="Info" icon="svg-info" color="blue" %}
 
-## Setting Lantiq MAC address
-```sh
-uci set network.lct.macaddr=00:06:B5:07:D6:04
-uci set network.host.macaddr=00:06:B5:07:D8:04
-uci commit network.lct.macaddr=00:06:B5:07:D6:04
-uci commit network.host.macaddr=00:06:B5:07:D8:04
-```
+# Advanced settings
+
+## Setting `data_1g_8q_us1280_ds512.ini` OMCI MIB file for 2500 Mbps profiles
+{% include alert.html content="The patch below is only compatible with the firmware version `6BA1896SPLQA42`" alert="Info" icon="svg-info" color="blue" %}
+{% include alert.html content="If you need to set the ONU version remember that you will have to do it using the MIB file `/etc/mibs/data_1g_8q_us1280_ds512.ini` instead of `/etc/mibs/data_1g_8q.ini`" alert="Info" icon="svg-info" color="blue" %}
 
-## Setting Lantiq IP address
+The MIB file `data_1g_8q_us1280_ds512.ini` is very useful to avoid performance problems in situations where 2500 Mbps speed profiles are used, to enable it you need to run this command:
 ```sh
-fw_setenv ipaddr 192.168.20.60
-fw_setenv gatewayip 192.168.20.1
+fw_setenv mib_file data_1g_8q_us1280_ds512.ini
 ```
 
-## Reading all EEPROM
+## Setting custom OMCI MIB file
+{% include alert.html content="If you need to set the ONU version remember that you will have to do it using your custom MIB file instead of `/etc/mibs/data_1g_8q.ini`" alert="Info" icon="svg-info" color="blue" %}
+
+You have to copy the MIB file to /etc/mibs and then run this command:
 ```sh
-sfp_i2c -r
+fw_setenv mib_file YOUR_MIB_FILENAME
 ```
 
-## Getting Firmware version
+## Setting management MAC
 ```sh
-strings /opt/lantiq/bin/omcid | grep ^software_Version | awk -F[=,] '{print $2}'
+uci set network.lct.macaddr=00:06:B5:07:D6:04
+uci set network.host.macaddr=00:06:B5:07:D8:04
+uci commit network.lct.macaddr=00:06:B5:07:D6:04
+uci commit network.host.macaddr=00:06:B5:07:D8:04
 ```
 
-## Getting Firmware build time
+## Setting management IP
 ```sh
-strings /opt/lantiq/bin/omcid | grep compiled
+fw_setenv ipaddr 192.168.20.60
+fw_setenv gatewayip 192.168.20.1
 ```
 
 ## Rebooting the ONU
@@ -310,12 +329,6 @@ strings /opt/lantiq/bin/omcid | grep compiled
 reboot
 ```
 
-## Checking whether the connection with the OLT was successful (O5 state)
-
-```shell
-onu ploamsg
-```
-
 ## Disable RX_LOS status
 {% include alert.html content="The patch below is only compatible with the firmware version `6BA1896SPLQA42`" alert="Info" icon="svg-info" color="blue" %}
 
@@ -370,29 +383,22 @@ In case you need to re-enable it issue the following commands from the bootloade
 FALCON => setenv asc0 0
 FALCON => saveenv
 ```
+# SFP EEPROM settings
 
-## Getting/Setting Speed LAN Mode
-
-To get the LAN Mode:
-
+## Reading all EEPROM
 ```sh
-onu lanpsg 0
+sfp_i2c -r
 ```
-The `link_status` variable tells the current speed
 
-| Value (for `sgmii_mode` and `link_status`) | Speed                              |
-| ------------------------------------------ | ---------------------------------- |
-| 3                                          | 1 Gbps / SGMII with auto-neg on    |
-| 4                                          | 1 Gbps / SGMII with auto-neg off   |
-| 5                                          | 2.5 Gbps / HSGMII with auto-neg on |
-
-To change the default lan mode value you can use `fw_setenv sgmii_mode`. The firmware already has the value 5 by default and it is generally not necessary to change it.
+## Getting Firmware version
+```sh
+strings /opt/lantiq/bin/omcid | grep ^software_Version | awk -F[=,] '{print $2}'
+```
 
-## Querying a particular OMCI ME
+## Getting Firmware build time
 ```sh
-omci_pipe.sh meg MIB_IDX ME_IN
+strings /opt/lantiq/bin/omcid | grep compiled
 ```
-Where `MIB_IDX` is the MIB ID and the `ME_IN` is the ME instance number
 
 # EEPROM (I2C slave simulated EEPROM)
 The FS GPON-ONU-34-20BI does not have a physical EEPROM, the Falcon SOC emulates an EEPROM by exposing it on the I2C interface as required by the SFF-8472 specification.
diff --git a/_ont/ont-genexis-ft-g2110c.md b/_ont/ont-genexis-ft-g2110c.md
index 36faf46..8a95a31 100644
--- a/_ont/ont-genexis-ft-g2110c.md
+++ b/_ont/ont-genexis-ft-g2110c.md
@@ -74,7 +74,7 @@ This ONT supports dual boot.
 
 `k0` and `r0` respectively contain the kernel and firmware of the first image, `k1` and `r1` the kernel and the firmware of the second one
 
-# General Settings and Useful Commands
+# GPON/OMCI settings
 
 {% include alert.html content="Some variables are write-protected, you need to unlock them before proceed" alert="Info" icon="svg-info" color="blue" %}
 
@@ -84,7 +84,7 @@ Use the following command to unlock write-protected variables:
 # nv setenv ProtectEnv 0
 ```
 
-## Getting/Setting the ONT's S/N
+## Getting/Setting ONU GPON Serial Number
 
 {% include alert.html content="If your serial number has letters after the Vendor ID (e.g. ZTEGAAA01234), put them in lower case (e.g. ZTEGaaa01234)" alert="Info" icon="svg-info" color="blue" %}
 
@@ -100,28 +100,7 @@ You can check if the serial number was correclty changed using the following com
 ZTEGaaa01234
 ```
 
-## Changing the Hardware Version
-
-```sh
-# nv setenv HV G2110CE2V1D0
-```
-Reboot ONT to apply the change
-
-## Changing the Equipment ID
-
-```sh
-# nv setenv ProdName FT-G2110C-2.5G
-```
-Reboot ONT to apply the change
-
-## Changing the IP address
-```sh
-# /etc/scripts/flash get LAN_IP_ADDR
-LAN_IP_ADDR=192.168.1.1
-# /etc/scripts/flash set LAN_IP_ADDR 192.168.1.1
- ```
-
-## Getting/Setting the ONT's PLOAM password
+## Getting/Setting ONU GPON PLOAM password
 
 {% include alert.html content="The PLOAM password is stored in ASCII format" alert="Info" icon="svg-info" color="blue" %}
 
@@ -137,8 +116,7 @@ If you want to be future proof, put your PLOAM also on U-Boot env using the foll
 # nv setenv ploampwd 1234567890
 ploampwd=1234567890
 ```
-
-## Changing the reported firmware version
+## Setting OMCI software version (ME 7)
 
 The stock firware does not allow changing of the primary and standby software version. 
 Since the ONT uses the Luna SDK, the `/etc/scripts/flash` shell script can be easily modified by creating a custom firmware with
@@ -171,6 +149,29 @@ ImageHash: 0x00000000000000000000000000000000
 =================================
 ```
 
+## Setting OMCI hardware version (ME 256)
+
+```sh
+# nv setenv HV G2110CE2V1D0
+```
+Reboot ONT to apply the change
+
+## Setting OMCI equipment ID (ME 257)
+
+```sh
+# nv setenv ProdName FT-G2110C-2.5G
+```
+Reboot ONT to apply the change
+
+# Advanced settings
+
+## Setting management IP
+```sh
+# /etc/scripts/flash get LAN_IP_ADDR
+LAN_IP_ADDR=192.168.1.1
+# /etc/scripts/flash set LAN_IP_ADDR 192.168.1.1
+ ```
+
 # Known Bugs
 - Web UI can be enabled by modding the firmware, but without an attached fiber the daemon will crash
 
diff --git a/_ont/ont-huawei-eg8010h.md b/_ont/ont-huawei-eg8010h.md
index f5fab57..6077c73 100644
--- a/_ont/ont-huawei-eg8010h.md
+++ b/_ont/ont-huawei-eg8010h.md
@@ -36,4 +36,6 @@ parent: Huawei
 
 ## List of software versions
 
-- V5R020C10S035
\ No newline at end of file
+- V5R020C10S035
+
+{% include_relative ont-huawei-useful-command.md %}
diff --git a/_ont/ont-huawei-ma5671a-carlito.md b/_ont/ont-huawei-ma5671a-carlito.md
index 533b192..afaef44 100644
--- a/_ont/ont-huawei-ma5671a-carlito.md
+++ b/_ont/ont-huawei-ma5671a-carlito.md
@@ -5,48 +5,15 @@ parent: Huawei MA5671A
 layout: default
 ---
 
-# General Settings and Useful Commands
-
 {% include alert.html content="Be careful, back up the goi_config from uboot before changing firmware." alert="Info" icon="svg-info" color="blue" %}
 
-## Setting image version
-```sh
-fw_setenv image0_version V1.7.6-170626
-fw_setenv image1_version V1.7.6-170626
-```
-
-## Setting S/N
-```sh
-fw_setenv ont_serial ABCD12345678
-```
-or
-```sh
-uci set gpon.ploam.nSerial="0x48 0x57 0x54 0x43 0x9D 0xAC 0xC7 0xA3"
-uci commit 
-```
-
-## Setting PLOAM Password
-```sh
-fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
-```
-or
-```sh
-uci set gpon.ploam.nPassword="0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
-uci commit 
-```
-
-## Setting LOID and Checkcode Password
-```sh
-fw_setenv omci_loid 1234567890
-fw_setenv omci_lpwd password01
-```
-If LOID is disabled in the firmware try alternative software.
+# GPON ONU status
 
-## Setting and checking oem-generic
+## Querying a particular OMCI ME
 ```sh
-fw_setenv target oem-generic
-fw_printenv target=oem-generic
+omci_pipe.sh meg MIB_IDX ME_IN
 ```
+Where `MIB_IDX` is the MIB ID and the `ME_IN` is the ME instance number
 
 ## Getting/Setting Speed LAN Mode
 
@@ -74,8 +41,43 @@ The `link_status` variable tells the current speed
 | 4                                          | 1 Gbps / SGMII with auto-neg off   |
 | 5                                          | 2.5 Gbps / HSGMII with auto-neg on |
 
-## Querying a particular OMCI ME
+# GPON/OMCI settings
+
+## Getting/Setting OMCI software version (ME 7)
 ```sh
-omci_pipe.sh meg MIB_IDX ME_IN
+fw_setenv image0_version V1.7.6-170626
+fw_setenv image1_version V1.7.6-170626
+```
+
+## Setting ONU GPON PLOAM password
+```sh
+fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+```
+or
+```sh
+uci set gpon.ploam.nPassword="0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+uci commit 
+```
+
+## Setting ONU GPON LOID and LOID password
+```sh
+fw_setenv omci_loid 1234567890
+fw_setenv omci_lpwd password01
 ```
-Where `MIB_IDX` is the MIB ID and the `ME_IN` is the ME instance number
\ No newline at end of file
+If LOID is disabled in the firmware try alternative software.
+
+## Setting ONU GPON Serial Number
+```sh
+fw_setenv ont_serial ABCD12345678
+```
+or
+```sh
+uci set gpon.ploam.nSerial="0x48 0x57 0x54 0x43 0x9D 0xAC 0xC7 0xA3"
+uci commit 
+```
+
+## Setting and checking oem-generic
+```sh
+fw_setenv target oem-generic
+fw_printenv target=oem-generic
+```
\ No newline at end of file
diff --git a/_ont/ont-huawei-ma5671a-china.md b/_ont/ont-huawei-ma5671a-china.md
deleted file mode 100644
index ddbfb18..0000000
--- a/_ont/ont-huawei-ma5671a-china.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: right.com.cn Firmware for Huawei MA5671A
-has_children: false
-layout: default
-parent: Huawei MA5671A
----
-
-# General setting
-
-{% include alert.html content="Be careful, use this firmware only if you have performance problems with all other firmwares." alert="Info" icon="svg-info" color="blue" %}
-
-{% include alert.html content="Do not use in-browser translators, use a translation app on your phone through virtual reality." alert="Danger" icon="svg-warning" color="red" %}
-
-1. Flash on the 0 partition
-
-2. Run via ssh
-
-```sh
-jffs2reset
-```
-
-3. Reboot
-
-4. Fill in the data from left to right and from top to bottom, with save & apply on every page
-
-5. Reboot
-
-6. Edit the incorrect data, save and apply the pending changes
-
-7. Reboot
\ No newline at end of file
diff --git a/_ont/ont-huawei-ma5671a-fs-mod.md b/_ont/ont-huawei-ma5671a-fs-mod.md
index 622c743..5193db0 100644
--- a/_ont/ont-huawei-ma5671a-fs-mod.md
+++ b/_ont/ont-huawei-ma5671a-fs-mod.md
@@ -50,7 +50,7 @@ onu ploam_state_get
 otop -g s
 ```
 
-## Get information of the OLT
+## Get information of the OLT vendor
 ```sh
 omci_pipe.sh meg 131 0
 ```
@@ -90,42 +90,42 @@ To change the default lan mode value you can use `fw_setenv sgmii_mode`. The fir
 
 # GPON/OMCI settings
 
-## Setting ONU GPON serial number
+## Setting ONU GPON Serial Number
 ```sh
 fw_setenv onu_serial "YOUR_SERIAL_ASCII"
 ```
 
-## Setting ONU GPON ploam
+## Setting ONU GPON PLOAM password
 ```sh
 fw_setenv onu_ploam "YOUR_PLOAM_ASCII"
 ```
 
-## Setting ONU GPON loid
+## Setting ONU GPON LOID
 ```sh
 fw_setenv onu_loid "YOUR_LOID"
 ```
 
-## Setting ONU GPON loid password
+## Setting ONU GPON LOID password
 ```sh
 fw_setenv onu_loid_password "YOUR_LOID_PASSWORD"
 ```
 
-## Setting OMCI vendor ID
+## Setting OMCI vendor ID (ME 256)
 ```sh
 fw_setenv omci_vendor_id "YOUR_VENDOR_ID"
 ```
 
-## Setting OMCI equipment ID
+## Setting OMCI equipment ID (ME 257)
 ```sh
 fw_setenv omci_equip_id "YOUR_EQUIP_ID"
 ```
 
-## Setting OMCI hardware ID
+## Setting OMCI hardware version (ME 256)
 ```sh
 fw_setenv omci_hw_ver "YOUR_HW_VER"
 ```
 
-## Setting OMCI software version
+## Setting OMCI software version (ME 7)
 ```sh
 fw_setenv image0_version "YOUR_SW_VERSION_0"
 fw_setenv image1_version "YOUR_SW_VERSION_1"
@@ -135,7 +135,7 @@ fw_setenv image1_version "YOUR_SW_VERSION_1"
 
 {% include alert.html content="Normally they are not necessary and it would be better not to touch them" alert="Note"  icon="svg-warning" color="red" %}
 
-## Setting custom mib file
+## Setting custom OMCI MIB file
 You have to copy the MIB file to /etc/mibs and then run this command:
 
 ```sh
diff --git a/_ont/ont-huawei-useful-command.md b/_ont/ont-huawei-useful-command.md
index d664b16..4f0e91c 100644
--- a/_ont/ont-huawei-useful-command.md
+++ b/_ont/ont-huawei-useful-command.md
@@ -8,12 +8,11 @@ It is possible that this won't work/has been fixed in more recent versions.
 
 Now that this is done, the modified configuration file can be uploaded via the web interface, the ONT will restart and telnet should be accessible on port 23.
 
-
-# General Settings and Useful Commands
-
 {% include alert.html content="All results need to be converted from HEX to ASCII. You can use our [Converter](/ascii-hex), taking care to add 0x in front and remove the spaces every 8 hex digits." alert="Warning" icon="svg-info" color="blue" %}
 
-## Getting the OLT vendor
+# GPON ONU status
+
+## Get information of the OLT vendor
 
 ```
 WAP>omcicmd mib show meid 131 instid 0
@@ -31,7 +30,9 @@ success!
 ```
 *0x48575443* → *HWTC* (Huawei)
 
-## Getting the ONT SW Version 0 and 1
+# GPON/OMCI settings
+
+## Getting OMCI software version (ME 7)
 
 ```
 WAP>omcicmd mib show meid 7 instid 0
@@ -61,7 +62,7 @@ success!
 ```
 *0x56355230 32304331 30533131 3500* → *V5R020C10S115*
 
-## Getting the ONT Vendor ID and HW Version:
+## Getting OMCI hardware version and vendor ID (ME 256)
 
 ```
 WAP>omcicmd mib show meid 256 instid 0
@@ -90,7 +91,7 @@ success!
 *0x48575443* → *HWTC*
 *0x32343046 2e41* → *240F.A*
 
-## Getting the ONT Equipment ID
+## Getting OMCI equipment ID (ME 257)
 
 ```
 WAP>omcicmd mib show meid 257 instid 0
diff --git a/_ont/ont-luna-sdk-useful-commands.md b/_ont/ont-luna-sdk-useful-commands.md
index 535d62a..a1d5269 100644
--- a/_ont/ont-luna-sdk-useful-commands.md
+++ b/_ont/ont-luna-sdk-useful-commands.md
@@ -1,4 +1,4 @@
-# General Settings and Useful Commands
+# Userful files and binaries
 
 ## Useful files
 - `/var/config/lastgood.xml` - Contains the user portion of the configuration
@@ -15,15 +15,58 @@
 - `omci_app` - The OMCI daemon
 - `diag` - Used to run low-level diagnostics commands on the stick
 
+# GPON ONU status
+
+## Get the operational status of the ONU
+
+```sh
+diag gpon get onu-state
+```
+
+## Querying a particular OMCI ME
+```sh
+# omcicli mib get MIB_IDX
+```
+
+
+{% if include.speedLan %}
+
+## Getting/Setting Speed LAN Mode
+{% assign customSpeedLanAlert = include.customSpeedLanAlert | default: "Before editing the speed make sure your hardware supports it." %}
+{% include alert.html content=customSpeedLanAlert alert="Note" icon="svg-info" color="blue" %}
+
+To change the link mode use this command:
 
-## Getting/Setting the ONT's S/N
+```sh
+# {{ include.flash }} get LAN_SDS_MODE
+LAN_SDS_MODE=0
+# {{ include.flash }} set LAN_SDS_MODE 1
+```
+
+| Value | `cat /proc/kmsg`                     | Mode     | Behavior                    |
+| ----- | ------------------------------------ | -------- | --------------------------- |{% if include.speedLan contains '0' %}
+| 0     | `<4>change mode to 0(GE/FE PHY)`     | `TP`     | 1GbaseT/100baseT            |{% endif %}{% if include.speedLan contains '1' %}
+| 1     | `<4>change mode to 1(Fiber 1G)`      | `FIBER`  | 1GbaseX with auto-neg on    |{% endif %}{% if include.speedLan contains '2' %}
+| 2     | `<4>change mode to 2(SGMII PHY)`     | `TP MII` | 1Gb PHY                     |{% endif %}{% if include.speedLan contains '3' %}
+| 3     | `<4>change mode to 3(SGMII MAC)`     | `MII`    | 1Gb MAC                     |{% endif %}{% if include.speedLan contains '4' %}
+| 4     | `<4>change mode to 4(HiSGMII PHY)`   | `TP MII` | 2.5Gb PHY                   |{% endif %}{% if include.speedLan contains '5' %}
+| 5     | `<4>change mode to 5(HiSGMII MAC)`   | `MII`    | 2.5Gb MAC                   |{% endif %}{% if include.speedLan contains '6' %}
+| 6     | `<4>change mode to 6(2500BaseX)`     | `FIBER`  | 2500baseX with auto-neg on  |{% endif %}{% if include.speedLan contains '7' %}
+| 7     | `<4>change mode to 7(SGMII Force)`   | `TP`     | 1GbaseT with auto-neg off   |{% endif %}{% if include.speedLan contains '8' %}
+| 8     | `<4>change mode to 8(HISGMII Force)` | `TP`     | 2500baseT with auto-neg off |{% endif %}
+
+{% endif %}
+
+# GPON/OMCI settings
+
+## Getting/Setting ONU GPON Serial Number
 ```sh
 # {{ include.flash }} get GPON_SN
 GPON_SN=TMBB00000000
 # {{ include.flash }} set GPON_SN TMBB0A1B2C3D
 ```
 
-## Getting/Setting the ONT's PLOAM password
+## Getting/Setting ONU GPON PLOAM password
 {% if include.ploam == 'asciiAndHex' %}
 
 {% include alert.html content="The ploam can be saved in either ASCII or HEX format, without any 0x or separators" alert="Note" icon="svg-info" color="blue" %}
@@ -55,33 +98,8 @@ GPON_PLOAM_PASSWD=AAAAAAAAAA
 ```
 {% endif %}
 
-## Checking the currently active image
-```sh
-# nv getenv sw_active
-sw_active=1
-# nv getenv sw_version0
-sw_version0=V1_7_8_210412
-# nv getenv sw_version1
-sw_version1=V1_7_8_210412
-```
-
-## Booting to a different image
-```sh
-# nv setenv sw_commit 0|1
-# reboot
-```
-
-## Getting/Setting the ONT Vendor ID
+## Getting/Setting OMCI software version (ME 7)
 
-{% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
-
-```sh
-# flash get PON_VENDOR_ID  
-PON_VENDOR_ID=ZTEG
-# flash set PON_VENDOR_ID HWTC
-```
-
-## Getting/Settng the ONT Custom software version
 {% assign customSwVersionAlert = include.customSwVersionAlert | default: "This needs the OMCI_OLT_MODE value to be set to 3" %}
 {% include alert.html content=customSwVersionAlert alert="Note" icon="svg-info" color="blue" %}
 
@@ -90,7 +108,7 @@ PON_VENDOR_ID=ZTEG
 # nv setenv sw_custom_version1 YOURSECONDSWVER
 ```
 
-## Getting/Setting a custom HW Version
+## Getting/Setting OMCI hardware version (ME 256)
 {% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
 
 ```sh
@@ -99,7 +117,17 @@ HW_HWVER=V2.0
 # {{ include.flash }} set HW_HWVER MYHWVERSION
 ```
 
-## Getting/Setting a custom ONT Equipment ID
+## Getting/Setting OMCI vendor ID (ME 256)
+
+{% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# flash get PON_VENDOR_ID  
+PON_VENDOR_ID=ZTEG
+# flash set PON_VENDOR_ID HWTC
+```
+
+## Getting/Setting OMCI equipment ID (ME 257)
 {% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
 
 ```sh
@@ -134,35 +162,10 @@ Some Fiber Vendor/Wholesale/ISP have explicit LAN Port Number provisioning or pr
 OMCI_FAKE_OK=0
 # {{ include.flash }} set OMCI_FAKE_OK 1
 ```
-{% if include.speedLan %}
-
-## Getting/Setting Speed LAN Mode
-{% assign customSpeedLanAlert = include.customSpeedLanAlert | default: "Before editing the speed make sure your hardware supports it." %}
-{% include alert.html content=customSpeedLanAlert alert="Note" icon="svg-info" color="blue" %}
-
-To change the link mode use this command:
-
-```sh
-# {{ include.flash }} get LAN_SDS_MODE
-LAN_SDS_MODE=0
-# {{ include.flash }} set LAN_SDS_MODE 1
-```
-
-| Value | `cat /proc/kmsg`                     | Mode     | Behavior                    |
-| ----- | ------------------------------------ | -------- | --------------------------- |{% if include.speedLan contains '0' %}
-| 0     | `<4>change mode to 0(GE/FE PHY)`     | `TP`     | 1GbaseT/100baseT            |{% endif %}{% if include.speedLan contains '1' %}
-| 1     | `<4>change mode to 1(Fiber 1G)`      | `FIBER`  | 1GbaseX with auto-neg on    |{% endif %}{% if include.speedLan contains '2' %}
-| 2     | `<4>change mode to 2(SGMII PHY)`     | `TP MII` | 1Gb PHY                     |{% endif %}{% if include.speedLan contains '3' %}
-| 3     | `<4>change mode to 3(SGMII MAC)`     | `MII`    | 1Gb MAC                     |{% endif %}{% if include.speedLan contains '4' %}
-| 4     | `<4>change mode to 4(HiSGMII PHY)`   | `TP MII` | 2.5Gb PHY                   |{% endif %}{% if include.speedLan contains '5' %}
-| 5     | `<4>change mode to 5(HiSGMII MAC)`   | `MII`    | 2.5Gb MAC                   |{% endif %}{% if include.speedLan contains '6' %}
-| 6     | `<4>change mode to 6(2500BaseX)`     | `FIBER`  | 2500baseX with auto-neg on  |{% endif %}{% if include.speedLan contains '7' %}
-| 7     | `<4>change mode to 7(SGMII Force)`   | `TP`     | 1GbaseT with auto-neg off   |{% endif %}{% if include.speedLan contains '8' %}
-| 8     | `<4>change mode to 8(HISGMII Force)` | `TP`     | 2500baseT with auto-neg off |{% endif %}
 
-{% endif %}
+# Advanced settings
 
-## Change IP address
+## Setting management IP
 
 ```sh
 # {{ flash }} get LAN_IP_ADDR
@@ -170,17 +173,6 @@ LAN_IP_ADDR=192.168.2.1
 # {{ flash }} set LAN_IP_ADDR 192.168.1.1
 ```
 
-## Checking whether the connection with the OLT was successful (O5 state)
-
-```sh
-diag gpon get onu-state
-```
-
-## Querying a particular OMCI ME
-```sh
-# omcicli mib get MIB_IDX
-```
-
 ## Getting/Setting the L2 Bridge MTU
 {% include alert.html content="Settings given via diag are not permanent after reboot" alert="Note" icon="svg-info" color="blue" %}
 
@@ -192,4 +184,20 @@ Port Speed
 0 1538 
 2 2031 
 # diag switch set max-pkt-len port all length 2000
+```
+
+## Checking the currently active image
+```sh
+# nv getenv sw_active
+sw_active=1
+# nv getenv sw_version0
+sw_version0=V1_7_8_210412
+# nv getenv sw_version1
+sw_version1=V1_7_8_210412
+```
+
+## Booting to a different image
+```sh
+# nv setenv sw_commit 0|1
+# reboot
 ```
\ No newline at end of file
diff --git a/_ont/ont-nokia-useful-command.md b/_ont/ont-nokia-useful-command.md
index 996407e..464e409 100644
--- a/_ont/ont-nokia-useful-command.md
+++ b/_ont/ont-nokia-useful-command.md
@@ -1,4 +1,42 @@
-# General Settings and Useful Commands
+# GPON ONU status
+
+## Get the operational status of the ONU
+```sh
+#ONT>traffic
+#ONT/system>pon
+#ONT/system/pon>show link
+
+ ----------------- LINK STATE -----------------
+ Link State:              ACTIVE
+ Operation State Machine: OPERATION (O5)
+ ----------------- STATE  END -----------------
+```
+
+## Querying a particular OMCI ME
+
+```sh
+#ONT>system
+#ONT/system>mib
+#ONT/system/mib>show 256
+Table Ontg, Ont-g, total 1 instances
+
+EntityID                  = 0x0000
+VID                       = "GNXS"
+Version                   = 47 32 31 31 30 43 45 32 56 31 44 30 00 00
+SerialNum                 = 47 4e 58 53 05 54 6f b0
+TraffMgtOpt               = 0
+AtmCCOpt                  = 0
+BatteryBack               = 1
+AdminState                = 0
+OpState                   = 0
+OnuSurvivalTime           = 0
+Loid                      = ""
+Password                  = ""
+AuthState                 = 0
+OntState                  = 1
+```
+
+# GPON/OMCI settings
 
 ## Committing changes to the OMCI MIB tables for GPON operation
 ```sh
@@ -7,7 +45,7 @@
 #ONT/system/mib>reset
 ```
 
-## Getting/Setting the ONT's S/N
+## Getting/Setting ONU GPON Serial Number
 ```sh
 #ONT>system
 #ONT/system>misc
@@ -18,7 +56,24 @@ eqsn: ALCL00000001
 ---ATECMDRESULT--- OK
 ```
 
-## Getting/Setting the ONT's Vendor
+## Setting OMCI software version (ME 7)
+The following must be typed from the standard linux shell:
+```sh
+# echo SWVER=C-5.6.1-R > /mnt/rwdir/sys.cfg
+```
+
+## Getting/Setting OMCI hardware version (ME 256)
+```sh
+#ONT>system
+#ONT/system>misc
+#ONT/system/misc>eqvid get
+eqvid: 3FE45458ABAA06
+hex_eqvid: 0x3346453435343538414241413036
+---ATECMDRESULT--- OK
+#ONT/system/misc>eqvid set "G2110CE2V1D0"
+```
+
+## Getting/Setting OMCI vendor ID (ME 256)
 ```sh
 #ONT>system
 #ONT/system>misc
@@ -32,10 +87,9 @@ vendor: ALCL
 ---ATECMDRESULT--- OK
 #ONT/system/misc>eqsnvend set "ALCL"
 ---ATECMDRESULT--- OK
-
 ```
 
-## Getting/Setting the ONT's Equipment ID
+## Getting/Setting OMCI equipment ID (ME 257)
 ```sh
 #ONT>system
 #ONT/system>misc
@@ -47,18 +101,9 @@ hex_eqid: 0x46542d4732313130432d322e3547000000000000
 ---ATECMDRESULT--- OK
 ```
 
-## Getting/Setting the ONT's Hardware Version
-```sh
-#ONT>system
-#ONT/system>misc
-#ONT/system/misc>eqvid get
-eqvid: 3FE45458ABAA06
-hex_eqvid: 0x3346453435343538414241413036
----ATECMDRESULT--- OK
-#ONT/system/misc>eqvid set "G2110CE2V1D0"
-```
+# Advanced settings
 
-## Getting/Setting the ONT's IP/Netmask
+## Setting management IP
 ```sh
 #ONT>system
 #ONT/system>misc
@@ -70,45 +115,4 @@ admin_ip: 192.168.100.1
 admin_mask: 255.255.255.0
 ---ATECMDRESULT--- OK
 #ONT/system/misc>admin_mask set 255.255.255.0
-```
-
-## Getting Operational Status 
-```sh
-#ONT>traffic
-#ONT/system>pon
-#ONT/system/pon>show link
-
- ----------------- LINK STATE -----------------
- Link State:              ACTIVE
- Operation State Machine: OPERATION (O5)
- ----------------- STATE  END -----------------
-```
-
-## Querying a particular OMCI ME
-```sh
-#ONT>system
-#ONT/system>mib
-#ONT/system/mib>show 256
-Table Ontg, Ont-g, total 1 instances
-
-EntityID                  = 0x0000
-VID                       = "GNXS"
-Version                   = 47 32 31 31 30 43 45 32 56 31 44 30 00 00
-SerialNum                 = 47 4e 58 53 05 54 6f b0
-TraffMgtOpt               = 0
-AtmCCOpt                  = 0
-BatteryBack               = 1
-AdminState                = 0
-OpState                   = 0
-OnuSurvivalTime           = 0
-Loid                      = ""
-Password                  = ""
-AuthState                 = 0
-OntState                  = 1
-```
-
-## Setting the ONT's Software Version
-The following must be typed from the standard linux shell:
-```sh
-# echo SWVER=C-5.6.1-R > /mnt/rwdir/sys.cfg
 ```
\ No newline at end of file
diff --git a/_ont/ont-technicolor-afm0002.md b/_ont/ont-technicolor-afm0002.md
index 3e0dc00..24874bf 100644
--- a/_ont/ont-technicolor-afm0002.md
+++ b/_ont/ont-technicolor-afm0002.md
@@ -124,8 +124,6 @@ The following commands are used to flash a new rootfs to image1 and then boot to
 # reboot
 ```
 
-# Low Level Modding
-
 {% include alert.html content="This section is based on the `V1_7_8_210412` version of the stick's firmware " alert="Info" icon="svg-info" color="blue" %}
 
 ## Adding support to configurable SW and HW versions, Vendor ID and much more
diff --git a/_ont/ont-template.md b/_ont/ont-template.md
new file mode 100644
index 0000000..c1a00c3
--- /dev/null
+++ b/_ont/ont-template.md
@@ -0,0 +1,98 @@
+# Hardware Specifications

+

+|                  |                                         |

+| ---------------- | --------------------------------------- |

+| Vendor/Brand     |                                         |

+| Model            |                                         |

+| ODM              | ✅ or manufacter                        |

+| ODM Product Code | (only if ODM present)                   |

+| Chipset          |                                         |

+| Flash            |                                         |

+| RAM              |                                         |

+| CPU              |                                         |

+| CPU Clock        | (only if CPU present)                   |

+| Bootloader       |                                         |

+| System           |                                         |

+| Load addr        |                                         |

+| HSGMII           | Yes/No (only if miniONT SFP PHY)        |

+| 2.5GBaseX        | Yes/No (only if miniONT SFP MAC)        |

+| 2.5GBaseT        | Yes/No (only if ONT)                    |

+| XGMII/XSGMII     | Yes (only if miniONT SFP PHY)           |

+| 10GBaseX         | Yes/No (only if miniONT SFP MAC)        |

+| 10GBaseT         | Yes/No (only if ONT)                    |

+| 2.5/5/10GBaseT   | Yes/No (only if ONT multigig)           |

+| Optics           | SC/APC or SC/UPC                        |

+| IP address       |                                         |

+| Web Gui          | ✅ or note                              |

+| SSH              | ✅ user `admin`, password `admin` or No |

+| Telnet           | ✅ user `admin`, password `admin` or No |

+| Serial           | ✅ user `admin`, password `admin` or No |

+| Serial baud      | 115200                                  |

+| Serial encoding  | 8-N-1                                   |

+| Form Factor      | ONT or miniONT SFP                      |

+

+## Serial

+

+## Firmware is interchangeable with

+

+## List of software versions

+

+## List of partitions

+

+# Userful files and binaries

+

+## Useful files

+

+## Useful binaries

+

+# GPON ONU status

+

+## Get the operational status of the ONU

+

+## Get information of the OLT vendor

+

+## Querying a particular OMCI ME

+

+## Getting/Setting Speed LAN Mode

+

+# GPON/OMCI settings

+

+## Getting/Setting ONU GPON Serial Number

+

+## Getting/Setting ONU GPON PLOAM password

+

+## Getting/Setting ONU GPON LOID and LOID password

+

+## Getting/Setting OMCI software version (ME 7)

+

+## Getting/Setting OMCI hardware version (ME 256)

+

+## Getting/Setting OMCI vendor ID (ME 256)

+

+## Getting/Setting OMCI equipment ID (ME 257)

+

+# Advanced settings

+

+## Setting management MAC

+

+## Setting management IP

+

+## Rebooting the ONU

+

+## Creating a new rootfs

+

+## Flashing a new rootfs

+

+# SFP EEPROM settings

+

+## Reading all EEPROM

+

+# EEPROM (I2C slave simulated EEPROM)

+

+## EEPROM0 layout

+

+## EEPROM1 layout

+

+# Known Bugs

+

+# Miscellaneous Links
\ No newline at end of file
diff --git a/_ont/ont-zyxel-pmg3000-d20b.md b/_ont/ont-zyxel-pmg3000-d20b.md
index 144d769..f5969d1 100644
--- a/_ont/ont-zyxel-pmg3000-d20b.md
+++ b/_ont/ont-zyxel-pmg3000-d20b.md
@@ -74,14 +74,55 @@ The stick has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be a
 This stick supports dual boot, as visible from the presence of `ImageA` and `ImageB`, which contain the rootfs.
 
 
-# List of firmwares and files
+# Userful files and binaries
+
 ## Useful files
 - `/var/config/ont.sys` - Used to customize various settings on the stick. If you don't have it you can copy the stock one from /ont.sys
 
 # General Settings and Useful Commands
 {% include alert.html content="All commands start from the twmanu shell." alert="Note"  icon="svg-info" color="blue" %}
 
-## Changing the ONT's S/N
+# GPON ONU status
+
+## Get the operational status of the ONU
+To see the connection state use the following command:
+```
+linuxshell
+onu ploamsg
+```
+
+`curr_state=5` for O5 state, `curr_state=1` for all other operational states.
+
+## Getting Speed LAN Mode
+This SFP has HSGMII enabled by default: `link_status=5` for HSGMII 2.5Gbit, `link_status=4` for SGMII 1Gbit:
+```
+linuxshell
+onu lanpsg 0
+```
+
+## Setting Speed LAN Mode
+{% include alert.html content="This command forces the speed to 2.5 and is instantaneous and permanent, use it only if your hardware supports HSGMII and be compatible (not to be used with Broadcom 57810s NIC)" alert="Note" icon="svg-warning" color="red" %}
+```sh
+hal
+set speed 2.5g mode full
+```
+
+## Querying a particular OMCI ME
+Query via OMCI ME Class Name
+```sh
+omci
+show me classname OmciClassName (e.g Ont2g)
+```
+
+Query via OMCI ME ID
+```sh
+omci
+show me classid OmciClassId (e.g 7)
+```
+
+# GPON/OMCI settings
+
+## Setting ONU GPON Serial Number
 {% include alert.html content="The S/N is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
 ```sh
 manufactory
@@ -91,7 +132,7 @@ hal
 set sn ALCLf0f0f0f0
 ```
 
-## Changing the ONT's PLOAM password
+## Setting ONU GPON PLOAM password
 {% include alert.html content="The PLOAM password is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
 This can be done easily via web ui. If you prefer to do it via the shell use:
 ```sh
@@ -99,23 +140,7 @@ hal
 set password PLOAMPASS
 ```
 
-## Changing the ONT's equipment ID
-{% include alert.html content="Model number must not be more than 20 characters long in total." alert="Note"  icon="svg-info" color="blue" %}
-```sh
-manufactory
-set equipment id MYEQUIPMENTID
-exit
-omci
-equipment id MYEQUIPMENTID
-```
-
-## Changing the ONT's hardware version
-```sh
-manufactory
-set hardware version 3FE49165BFAA01
-```
-
-## Changing the software version
+## Setting OMCI software version (ME 7)
 Edit the /var/config/ont.sys via vi directly on the stick itself. The file is CRLF terminated, one entry per line.
 The entries for the software version are:
 ```
@@ -124,49 +149,29 @@ SW_VER1:0xabcedf
 ```
 {% include alert.html content="It's better to enter the software version in hex format, all lowercase precedeed by 0x." alert="Note"  icon="svg-info" color="blue" %}
 
-## See link speed
-This SFP has HSGMII enabled by default: `link_status=5` for HSGMII 2.5Gbit, `link_status=4` for SGMII 1Gbit:
-```
-linuxshell
-onu lanpsg 0
-```
-
-## Set link speed
-{% include alert.html content="This command forces the speed to 2.5 and is instantaneous and permanent, use it only if your hardware supports HSGMII and be compatible (not to be used with Broadcom 57810s NIC)" alert="Note" icon="svg-warning" color="red" %}
+## Setting OMCI hardware version (ME 256)
 ```sh
-hal
-set speed 2.5g mode full
-```
-
-## Checking connection state
-To see the connection state use the following command:
-```
-linuxshell
-onu ploamsg
+manufactory
+set hardware version 3FE49165BFAA01
 ```
 
-`curr_state=5` for O5 state, `curr_state=1` for all other operational states.
-
-## Querying a particular OMCI ME
-Query via OMCI ME Class Name
+## Setting OMCI equipment ID (ME 257)
+{% include alert.html content="Model number must not be more than 20 characters long in total." alert="Note"  icon="svg-info" color="blue" %}
 ```sh
+manufactory
+set equipment id MYEQUIPMENTID
+exit
 omci
-show me classname OmciClassName (e.g Ont2g)
+equipment id MYEQUIPMENTID
 ```
 
-Query via OMCI ME ID
-```sh
-omci
-show me classid OmciClassId (e.g 7)
-```
+# Advanced settings
 
 ## Reset Web Gui admin credentials
 
 Sometimes, under certain circumstances, the Web Gui admin credentials might get changed from the default `admin`/`1234` combination.
 To restore the default combination you can try following [this method](https://github.com/xvzf/zyxel-gpon-sfp/issues/6#issuecomment-1065864650).
 
-# Low Level Modding
-
 ## Creating a new rootfs
 The stick has a tricky image packing method, fortunately it has been reverse engineered. A script to help you create a custom rootfs can be found here: [https://github.com/nanomad/zyxel-pmg-3000-mod-kit](https://github.com/nanomad/zyxel-pmg-3000-mod-kit)
 
diff --git a/_ont_xgs/ont-hisense-ltf7267-bha+.md b/_ont_xgs/ont-hisense-ltf7267-bha+.md
index b57cf18..1579737 100644
--- a/_ont_xgs/ont-hisense-ltf7267-bha+.md
+++ b/_ont_xgs/ont-hisense-ltf7267-bha+.md
@@ -16,7 +16,7 @@ parent: HiSense
 | Flash            | 128MB                                                    |
 | RAM              | 128MB                                                    |
 | System           | Custom Linux by Cortina (Saturn SDK) based on Kernel 4.4 |
-| XSGMII           | Yes                                                      |
+| XGMII/XSGMII     | Yes                                                      |
 | Optics           | SC/APC                                                   |
 | IP address       | 192.168.0.1                                              |
 | Web Gui          | ✅ user `admin`, password `system`                       |
@@ -63,7 +63,7 @@ This ONT supports dual boot.
 
 `kernel0` and `rootfs0` respectively contain the kernel and firmware of the first image, `kernel1` and `rootfs1` the kernel and the firmware of the second one
 
-# General Settings and Useful Commands
+# XGS-PON ONU status
 
 To access Cortina Shell (needed to check OMCI stuff and XGSPON status) you can use the following command:
 
@@ -163,7 +163,7 @@ XGe Port idx 0 map to Port 6
 ```
 Please note that some of the above fields are decoded incorrectly, such as `sn` and `versionId`
 
-## Check OLT Vendor (from app-cli session)
+## Get information of the OLT vendor (from app-cli session)
 
 ```sh
 Cortina> enable
@@ -290,106 +290,112 @@ Link to PPTP eth: ------->instance 0x301
     |-----|------|-----|------|---------|---|-----|------|-----|------|
 ```
 
-## Changing the Hardware Version
+# GPON/OMCI settings
+
+## Setting ONU GPON Serial Number
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append line below to the file and save it to change HWVER
+Append lines below to the file and save it to change Serial Number
 
 ```
-CHAR-ARRAY      CFG_ID_GPON_VERSION = {0x46,0x35,0x36,0x38, 0x34,0x53,0x5f,0x76, 0x31,0x00,0x00,0x00, 0x00,0x00}; ##GPON version string, default value is V1.0
+STRING CFG_ID_PON_VENDOR_ID = SMBS;
+INT CFG_ID_PON_VSSN = 0xAABBCCDD;
 ```
 
 Reboot ONT to apply the change
 
-## Changing the Equipment ID
+
+## Setting ONU GPON LOID and LOID password
+
+{% include alert.html content="The value 0x0 is null, take note of your LoID and password from the original ONT" color="red" %}
+
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append the line below to the file and save it to change EQID
+Append lines below to the file and save it to change LoID and LoID password
 
 ```
-CHAR-ARRAY      CFG_ID_GPON_EQID = {0x46,0x49,0x42,0x45, 0x52,0x20,0x42,0x6f, 0x78,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00}; ##GPON ME ONU2G equiment id value, default is saturn
+CHAR-ARRAY      CFG_ID_LOID                                                         = {0x30,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+CHAR-ARRAY      CFG_ID_PASSWD                                                       = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+```
+
+Reboot ONT to apply the change
+
+## Setting OMCI software version (ME 7)
+
+```sh
+# fw_setenv img_version0 20220527052622
+# fw_setenv img_version0 20220527052622
 ```
 
 Reboot ONT to apply the change
 
-## Changing Serial Number
+## Setting OMCI hardware version (ME 256)
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change Serial Number
+Append line below to the file and save it to change HWVER
 
 ```
-STRING CFG_ID_PON_VENDOR_ID = SMBS;
-INT CFG_ID_PON_VSSN = 0xAABBCCDD;
+CHAR-ARRAY      CFG_ID_GPON_VERSION = {0x46,0x35,0x36,0x38, 0x34,0x53,0x5f,0x76, 0x31,0x00,0x00,0x00, 0x00,0x00}; ##GPON version string, default value is V1.0
 ```
 
 Reboot ONT to apply the change
 
-## Changing OLT Emulation Type
+## Setting OMCI equipment ID (ME 257)
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change Serial Number
+Append the line below to the file and save it to change EQID
 
 ```
-STRING          CFG_ID_PON_OLT_TYPE                             = ALCL; ##GPON OLT Vendor name, support ZTE,ADTRAN,ALCL,CALIX,SUMITOMO,CORTINA,HUAWEI
+CHAR-ARRAY      CFG_ID_GPON_EQID = {0x46,0x49,0x42,0x45, 0x52,0x20,0x42,0x6f, 0x78,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00}; ##GPON ME ONU2G equiment id value, default is saturn
 ```
 
 Reboot ONT to apply the change
 
-## Changing OMCC Version
-
-{% include alert.html content="In Italy, if you are under some Huawei OLT it's mandatory to use 0xA3, while on Alcatel 0xB4, otherwise you will get O5 status but no MIBs - Note that this can be quirk of TIM Italy" alert="Warning" icon="svg-warning" color="red" %}
+# Advanced settings
 
+## Changing OLT Emulation Type
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append the line below to the file and save it to change Serial Number
+Append lines below to the file and save it to change Serial Number
 
 ```
-CHAR            CFG_ID_OMCC_VERSION                             = 0xB2;
+STRING          CFG_ID_PON_OLT_TYPE                             = ALCL; ##GPON OLT Vendor name, support ZTE,ADTRAN,ALCL,CALIX,SUMITOMO,CORTINA,HUAWEI
 ```
 
 Reboot ONT to apply the change
 
-## Changing LOID Username/Password
+## Changing OMCC Version
 
-{% include alert.html content="The value 0x0 is null, take note of your LoID and password from the original ONT" color="red" %}
+{% include alert.html content="In Italy, if you are under some Huawei OLT it's mandatory to use 0xA3, while on Alcatel 0xB4, otherwise you will get O5 status but no MIBs - Note that this can be quirk of TIM Italy" alert="Warning" icon="svg-warning" color="red" %}
 
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change LoID and LoID password
+Append the line below to the file and save it to change Serial Number
 
 ```
-CHAR-ARRAY      CFG_ID_LOID                                                         = {0x30,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-CHAR-ARRAY      CFG_ID_PASSWD                                                       = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+CHAR            CFG_ID_OMCC_VERSION                             = 0xB2;
 ```
 
 Reboot ONT to apply the change
 
-## Spoofing firmware version
-
-```sh
-# fw_setenv img_version0 20220527052622
-# fw_setenv img_version0 20220527052622
-```
-
-Reboot ONT to apply the change
 
 # Known Bugs
 - `ALCL` OLT mode uses some static configurations on MIBs, so if your OLT has strict configuration checks it might not work properly
diff --git a/_ont_xgs/ont-huawei-useful-command.md b/_ont_xgs/ont-huawei-useful-command.md
index d664b16..4f0e91c 100644
--- a/_ont_xgs/ont-huawei-useful-command.md
+++ b/_ont_xgs/ont-huawei-useful-command.md
@@ -8,12 +8,11 @@ It is possible that this won't work/has been fixed in more recent versions.
 
 Now that this is done, the modified configuration file can be uploaded via the web interface, the ONT will restart and telnet should be accessible on port 23.
 
-
-# General Settings and Useful Commands
-
 {% include alert.html content="All results need to be converted from HEX to ASCII. You can use our [Converter](/ascii-hex), taking care to add 0x in front and remove the spaces every 8 hex digits." alert="Warning" icon="svg-info" color="blue" %}
 
-## Getting the OLT vendor
+# GPON ONU status
+
+## Get information of the OLT vendor
 
 ```
 WAP>omcicmd mib show meid 131 instid 0
@@ -31,7 +30,9 @@ success!
 ```
 *0x48575443* → *HWTC* (Huawei)
 
-## Getting the ONT SW Version 0 and 1
+# GPON/OMCI settings
+
+## Getting OMCI software version (ME 7)
 
 ```
 WAP>omcicmd mib show meid 7 instid 0
@@ -61,7 +62,7 @@ success!
 ```
 *0x56355230 32304331 30533131 3500* → *V5R020C10S115*
 
-## Getting the ONT Vendor ID and HW Version:
+## Getting OMCI hardware version and vendor ID (ME 256)
 
 ```
 WAP>omcicmd mib show meid 256 instid 0
@@ -90,7 +91,7 @@ success!
 *0x48575443* → *HWTC*
 *0x32343046 2e41* → *240F.A*
 
-## Getting the ONT Equipment ID
+## Getting OMCI equipment ID (ME 257)
 
 ```
 WAP>omcicmd mib show meid 257 instid 0