diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index b89b08b41..cb522fc42 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -108,6 +108,7 @@ squid_install: False
 squid_enabled: False
 
 # wondershaper
+# unmaintained and high-risk: https://github.com/iiab/iiab/pull/382
 wondershaper_install: False
 wondershaper_enabled: False
 
@@ -129,6 +130,7 @@ iiab_home_url: /home
 #iiab_home_url: /wiki - either dokuwiki or mediawiki
 
 # 4-SERVER-OPTIONS
+
 # sshd
 sshd_enabled: True
 
@@ -163,17 +165,59 @@ docker_enabled: False
 cups_install: True
 cups_enabled: False
 
+# 5-XO-SERVICES
+
+# Lesser-supported XO services need additional testing.  Please uncomment
+# the line containing 5-xo-services within /opt/iiab/iiab/iiab.yml and contact
+# http://lists.laptop.org/pipermail/server-devel/ if you're able to help test.
+
+xo_services_install: False
+xo_services_enabled: False
+
+# ejabberd
+ejabberd_install: False
+ejabberd_enabled: False
+
+ejabberd_xs_install: False
+ejabberd_xs_enabled: False
+
+# idmgr and activity-server
+idmgr_install: False
+idmgr_enables: False
+
+activity_server_install: False
+activity_server_enabled: False
+
+# xovis
+xovis_install: False
+xovis_enabled: False
+xovis_target_host: "127.0.0.1:5984"
+xovis_deployment_name: olpc
+
+xovis_db_name: xovis
+xovis_db_user: admin
+xovis_db_password: admin
+
+xovis_root: "/opt/xovis"
+xovis_backup_dir: "/library/users"
+xovis_chart_heading: "My School: Usage Data Visualization"
+
+# sugar-stats
+sugar_stats_install: False
+sugar_stats_enabled: False
+
 # 6-GENERIC-APPS
 
 # MYSQL
 mysql_install: True
 mysql_enabled: False
-phpmyadmin_install: False
-phpmyadmin_enabled: False
 # password is fixmysql
 # mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0
 mysql_root_password: fixmysql
 
+phpmyadmin_install: False
+phpmyadmin_enabled: False
+
 # ELGG
 elgg_install: True
 elgg_enabled: False
@@ -205,7 +249,6 @@ moodle_enabled: False
 osm_install: True
 osm_enabled: False
 
-
 # Pathagar
 pathagar_install: False
 pathagar_enabled: False
@@ -268,43 +311,10 @@ vnstat_enabled: False
 awstats_install: True
 awstats_enabled: False
 
-
-#  =========== Less-supported XO services need additional testing===========
-# 5-XO-SERVICES
-
-# ejabberd
-ejabberd_install: False
-ejabberd_enabled: False
-
-# idmgr and activity-server
-idmgr_install: False
-activity_server_install: False
-xo_services_enabled: False
-ejabberd_xs_install: False
-ejabberd_xs_enabled: False
-
-# xovis
-xovis_install: False
-xovis_enabled: False
-xovis_target_host: "127.0.0.1:5984"
-xovis_deployment_name: olpc
-
-xovis_db_name: xovis
-xovis_db_user: admin
-xovis_db_password: admin
-
-xovis_root: "/opt/xovis"
-xovis_backup_dir: "/library/users"
-xovis_chart_heading: "My School: Usage Data Visualization"
-
 # schooltool
 schooltool_install: False
 schooltool_enabled: False
 
-# sugar-stats
-sugar_stats_install: False
-sugar_stats_enabled: False
-
 # ajenti
 ajenti_install: False
 ajenti_enabled: False