diff --git a/docs/settings/config/display.mdx b/docs/settings/config/display.mdx
index 6a0575a6..09c25ccf 100644
--- a/docs/settings/config/display.mdx
+++ b/docs/settings/config/display.mdx
@@ -62,19 +62,14 @@ All display config options are available on iOS, iPadOS and macOS at Settings >
 
 All display config options are available in the python CLI. Example commands are below:
 
-```shell title="Set display_screen_on_secs to default (10 minutes)"
+```shell title="Set Screen On Duration (Default of 0 is 10 minutes)"
 meshtastic --set screen_on_secs 0
-```
-
-```shell title="Set display_screen_on_secs to 120 seconds (2 minutes)"
 meshtastic --set screen_on_secs 120
 ```
 
-```shell title="Set display_auto_screen_carousel_secs to default value of off"
+```shell title="Set Auto Carousel Interval (Default of 0 is Off)"
 meshtastic --set auto_screen_carousel_secs 0
-```
-
-```shell title="Set display_auto_screen_carousel_secs to 120 seconds (2 minutes)"
+// Set to 2 Minutes (120 Seconds)
 meshtastic --set auto_screen_carousel_secs 120
 ```
 
diff --git a/docs/settings/config/position.mdx b/docs/settings/config/position.mdx
index d5b507d3..dec5c108 100644
--- a/docs/settings/config/position.mdx
+++ b/docs/settings/config/position.mdx
@@ -111,22 +111,16 @@ All Position config conmmands are available in the python CLI. Example commands
 |      fixed_position      |                                                                        `true`, `false`                                                                        |     `false`     |
 | position_broadcast_smart |                                                                        `true`, `false`                                                                        |     `true`     |
 | position_broadcast_secs  |                                                                      `integer` (seconds)                                                                      | Default of `0` is 15 Minutes  |
-|      position_flags      | `POS_UNDEFINED`, `POS_ALTITUDE`, `POS_ALT_MSL`, `POS_GEO_SEP`, `POS_DOP`, `POS_HVDOP`, `PDOP`, `POS_BATTERY`, `POS_SATINVIEW`, `POS_SEQ_NOS`, `POS_TIMESTAMP` | `POS_UNDEFINED` |
+|      position_flags      | `POS_UNDEFINED`, `POS_ALTITUDE`, `POS_ALT_MSL`, `POS_GEO_SEP`, `POS_DOP`, `POS_HVDOP`, `PDOP`, `POS_BATTERY`, `POS_SATINVIEW`, `POS_SEQ_NOS`, `POS_TIMESTAMP`, `POS_HEADING`, `POS_SPEED` | `POS_UNDEFINED` |
 
 
-```shell title="Set GPS update interval to default settings (every 30 seconds)"
+```shell title="Set GPS update interval (Default of 0 is 30 seconds)"
 meshtastic --set gps_update_interval 0
-```
-
-```shell title="Set GPS update interval to every 45 seconds"
 meshtastic --set gps_update_interval 45
 ```
 
-```shell title="Set GPS attempt time to default (30 seconds)"
+```shell title="Set GPS attempt time (Default of 0 is 30 seconds)"
 meshtastic --set gps_attempt_time 0
-```
-
-```shell title="Set GPS attempt time to 45 seconds"
 meshtastic --set gps_attempt_time 45
 ```
 
@@ -146,19 +140,13 @@ meshtastic --setlat 37.8651 --setlon -119.5383
 meshtastic --set fixed_position false
 ```
 
-```shell title="Enable smart position broadcast (default)"
+```shell title="Enable / Disable Smart position broadcast (Enabled by default)"
 meshtastic --set position_broadcast_smart true
-```
-
-```shell title="Disable smart position broadcast"
 meshtastic --set position_broadcast_smart false
 ```
 
-```shell title="Set GPS update interval to default settings (every 15 minutes)"
+```shell title="Set Position Broadcast Interval (Default of 0 is 15 minutes)"
 meshtastic --set position_broadcast_secs 0
-```
-
-```shell title="Set GPS update interval to every 60 seconds"
 meshtastic --set position_broadcast_secs 60
 ```
 
@@ -170,11 +158,8 @@ It may take some time to see that the change has taken effect. The GPS location
 Include each flag desired separated by a single space.
 :::
 
-```shell title="Set Position Flags"
+```shell title="Set / Unset Position Flags"
 meshtastic --pos-fields POS_ALTITUDE POS_ALT_MSL
-```
-
-```shell title="Unset Position Flags"
 meshtastic --pos-fields POS_UNDEFINED
 ```
 
diff --git a/docs/settings/config/wifi.mdx b/docs/settings/config/wifi.mdx
index a25829f0..6036d5ee 100644
--- a/docs/settings/config/wifi.mdx
+++ b/docs/settings/config/wifi.mdx
@@ -87,11 +87,8 @@ All WiFi config options are available in the python CLI.
 | wifi_password |      string       |  `""`   |
 |   wifi_ssid   |      string       |  `""`   |
 
-```shell title="Enable SoftAP"
+```shell title="Enable / Disable SoftAP"
 meshtastic --set wifi_ap_mode true
-```
-
-```shell title="Disable SoftAP"
 meshtastic --set wifi_ap_mode false
 ```
 
@@ -99,19 +96,16 @@ meshtastic --set wifi_ap_mode false
 meshtastic --set wifi_ap_hidden false
 ```
 
-```shell title="Set WiFi network"
-meshtastic --set wifi_ssid mynetwork
-```
+```shell title="Set WiFi SSID"
 
-```shell title="Set WiFi network (with spaces)"
+meshtastic --set wifi_ssid mynetwork
+// With spaces
 meshtastic --set wifi_ssid "my network"
 ```
 
 ```shell title="Set WiFi password"
 meshtastic --set wifi_password mypassword
-```
-
-```shell title="Set WiFi password (with spaces)"
+// With spaces
 meshtastic --set wifi_password "my password"
 ```