diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index 014f21393..46d7c4de3 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -116,11 +116,11 @@
     postgresql_enabled: True
   when: moodle_enabled or pathagar_enabled
 
-- name: Turn on vars for Docker if SchoolTool is to be installed
-  set_fact:
-    docker_install: True
-    docker_enabled: True
-  when: schooltool_enabled or schooltool_install
+#- name: Turn on vars for Docker if SchoolTool is to be installed
+#  set_fact:
+#    docker_install: True
+#    docker_enabled: True
+#  when: schooltool_enabled or schooltool_install
 
 - name: Set python_path (redhat)
   set_fact:
diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml
index 38f707041..40a432e5d 100644
--- a/roles/6-generic-apps/tasks/main.yml
+++ b/roles/6-generic-apps/tasks/main.yml
@@ -33,11 +33,11 @@
   when: nextcloud_install
   tags: nextcloud
 
-- name: OWNCLOUD
-  include_role:
-    name: owncloud
-  when: owncloud_install
-  tags: owncloud
+#- name: OWNCLOUD
+#  include_role:
+#    name: owncloud
+#  when: owncloud_install
+#  tags: owncloud
 
 - name: WORDPRESS
   include_role:
diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml
index 941f6347e..f36742ec3 100644
--- a/roles/7-edu-apps/tasks/main.yml
+++ b/roles/7-edu-apps/tasks/main.yml
@@ -36,7 +36,7 @@
 - name: PATHAGAR
   include_role:
     name: pathagar
-  when: pathagar_install
+  when: pathagar_install is defined and pathagar_install
   tags: pathagar
 
 - name: SUGARIZER
diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml
index b94404814..c29b86169 100644
--- a/roles/8-mgmt-tools/tasks/main.yml
+++ b/roles/8-mgmt-tools/tasks/main.yml
@@ -3,12 +3,6 @@
 - name: ...IS BEGINNING ======================================
   command: echo
 
-- name: TRANSMISSION
-  include_role:
-    name: transmission
-  when: transmission_install
-  tags: transmission
-
 - name: AWSTATS
   include_role:
     name: awstats
diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
index ba8d7d74b..0479c4734 100644
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: ...IS BEGINNING ====================================
   command: echo
-  
+
 - name: CALIBRE
   include_role:
     name: calibre
@@ -15,6 +15,12 @@
   when: calibreweb_install
   tags: calibre-web
 
+- name: TRANSMISSION
+  include_role:
+    name: transmission
+  when: transmission_install
+  tags: transmission
+
 - name: Recording STAGE 9 HAS COMPLETED ====================
   lineinfile:
     dest: /etc/iiab/iiab.env
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index e2d00699c..1756516c9 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -153,16 +153,9 @@ wan_nameserver:
 # Our past convention was to install everything in all aggregates
 # And to enable everything in 1-PREP, 2-COMMON, and 3-BASE-SERVER
 
+
 # 1-PREP
 
-# Docker (lesser-supported)
-docker_install: False
-docker_enabled: False
-
-# SchoolTool - unmaintained
-schooltool_install: False
-schooltool_enabled: False
-
 # 2-COMMON
 
 # 3-BASE-SERVER
@@ -180,6 +173,7 @@ mysql_enabled: True
 # mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0
 mysql_root_password: fixmysql
 
+
 # 4-SERVER-OPTIONS
 
 # sshd
@@ -237,6 +231,7 @@ iiab_usb_lib_show_all: False
 # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
 nodocs: False
 
+
 # 5-XO-SERVICES
 
 # Lesser-supported XO services need additional testing.  Please contact
@@ -257,32 +252,9 @@ ejabberd_xs_enabled: False
 idmgr_install: False
 idmgr_enables: False
 
+
 # 6-GENERIC-APPS
 
-# Calibre E-Book Library
-# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
-# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
-
-calibre_install: True
-calibre_enabled: True
-# vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default:
-calibre_via_debs: False
-calibre_unstable_debs: False
-# vars/<most-OS's>.yml use Calibre's python installer/upgrader (x86_64), overriding this default:
-calibre_via_python: False
-# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
-calibre_port: 8080
-# Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ
-calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
-
-# Calibre-Web alternative to Calibre, offers a clean/modern UX
-calibreweb_install: True
-calibreweb_enabled: True
-calibreweb_port: 8083
-# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
-calibreweb_url: /books
-calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
-
 # DokuWiki
 dokuwiki_install: False
 dokuwiki_enabled: False
@@ -305,14 +277,11 @@ ejabberd_enabled: False
 nextcloud_install: True
 nextcloud_enabled: False
 
-# ownCloud
-owncloud_install: False
-owncloud_enabled: False
-
 # WordPress
 wordpress_install: True
 wordpress_enabled: False
 
+
 # 7-EDU-APPS
 
 # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS
@@ -348,10 +317,6 @@ osm_enabled: False
 # iiab_install: True
 # iiab_enabled: False
 
-# Pathagar - similar to Calibre, but unmaintained
-pathagar_install: False
-pathagar_enabled: False
-
 # Sugarizer
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
@@ -359,8 +324,62 @@ sugarizer_install: True
 sugarizer_enabled: False
 sugarizer_port: 8089
 
+
 # 8-MGMT-TOOLS
 
+# AWStats - summarizes http access logs
+awstats_install: True
+awstats_enabled: False
+
+# Monit
+monit_install: False
+monit_enabled: False
+watchdog:
+  - sshd
+  - idmgr
+  - ejabberd
+  - httpd
+  - postgresql
+  - squid
+
+# Munin
+munin_install: True
+munin_enabled: False
+
+# Handy for maintaining tables, but DANGEROUS if not locked down
+phpmyadmin_install: False
+phpmyadmin_enabled: False
+
+# vnStat
+vnstat_install: True
+vnstat_enabled: False
+
+
+# 9-LOCAL-ADDONS
+
+# Calibre E-Book Library
+# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
+# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
+calibre_install: True
+calibre_enabled: True
+# vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default:
+calibre_via_debs: False
+calibre_unstable_debs: False
+# vars/<most-OS's>.yml use Calibre's python installer/upgrader (x86_64), overriding this default:
+calibre_via_python: False
+# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
+calibre_port: 8080
+# Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ
+calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
+
+# Calibre-Web alternative to Calibre, offers a clean/modern UX
+calibreweb_install: True
+calibreweb_enabled: True
+calibreweb_port: 8083
+# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
+calibreweb_url: /books
+calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
+
 # Transmission is a BitTorrent downloader for large Content Packs etc
 transmission_install: False
 transmission_enabled: False
@@ -400,39 +419,27 @@ transmission_kalite_languages:
 transmission_username: Admin
 transmission_password: changeme
 
-# AWStats - summarizes http access logs
-awstats_install: True
-awstats_enabled: False
 
-# Monit
-monit_install: False
-monit_enabled: False
-watchdog:
-  - sshd
-  - idmgr
-  - ejabberd
-  - httpd
-  - postgresql
-  - squid
-
-# Munin
-munin_install: True
-munin_enabled: False
-
-# Handy for maintaining tables, but DANGEROUS if not locked down
-phpmyadmin_install: False
-phpmyadmin_enabled: False
-
-# vnStat
-vnstat_install: True
-vnstat_enabled: False
-
-# ================================================================
-
-# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
+# TeamViewer - unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
 
+# Docker - unmaintained
+# docker_install: False
+# docker_enabled: False
+
+# SchoolTool - unmaintained
+# schooltool_install: False
+# schooltool_enabled: False
+
+# Debian SchoolTool - nnmaintained
+# debian_schooltool_install: False
+# debian_schooltool_enabled: False
+
+# Pathagar - unmaintained (consider Calibre or Calibre-Web above?)
+# pathagar_install: False
+# pathagar_enabled: False
+
 # sugar-stats - unmaintained
 # sugar_stats_install: False
 # sugar_stats_enabled: False
@@ -450,6 +457,10 @@ vnstat_enabled: False
 # xovis_backup_dir: "/library/users"
 # xovis_chart_heading: "My School: Usage Data Visualization"
 
+# ownCloud - unmaintained
+# owncloud_install: False
+# owncloud_enabled: False
+
 # Ajenti - unmaintained
 # ajenti_install: False
 # ajenti_enabled: False
@@ -479,3 +490,9 @@ is_rpi: False
 is_redhat: False
 is_fedora: False
 is_centos: False
+
+# How This Works:
+# 1. /opt/iiab/iiab/iiab-install copies scripts/local_facts.fact to /etc/ansible/facts.d/local_facts.fact
+# 2. Ansible runs /etc/ansible/facts.d/local_facts.fact to identify the OS
+# 3. ./iiab-install (iiab-stages.yml) or ./runrole (run-one-role.yml) or Admin Console (iiab-from-console.yml) invoke the correct /opt/iiab/iiab/vars/<OS>.yml
+# Longer Explanation: https://github.com/iiab/iiab/wiki/IIAB-Variables (Order of Execution and Precedence)
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index cc755ef22..142cdf298 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -69,6 +69,7 @@ dansguardian_enabled: True
 # wondershaper_install: False
 # wondershaper_enabled: False
 
+
 # 1-PREP
 
 # 2-COMMON
@@ -80,6 +81,7 @@ allow_apache_sudo: True
 
 # roles/mysql runs here (mandatory)
 
+
 # 4-SERVER-OPTIONS
 
 # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security
@@ -113,6 +115,7 @@ samba_enabled: False
 # Show entire contents of USB sticks/drives (at http://box/usb)
 iiab_usb_lib_show_all: True
 
+
 # 5-XO-SERVICES
 
 # Lesser-supported XO services need additional testing.  Please contact
@@ -131,33 +134,9 @@ iiab_usb_lib_show_all: True
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
+
 # 6-GENERIC-APPS
 
-# Calibre E-Book Library
-# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
-# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
-
-calibre_install: True
-calibre_enabled: True
-# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
-# calibre_via_debs: True
-calibre_unstable_debs: False
-# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
-# calibre_via_python: True
-# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
-calibre_port: 8080
-# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
-calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
-# In addition to: http://box/books box/libros box/livres box/livros box/liv
-
-# Calibre-Web alternative to Calibre, offers a clean/modern UX
-calibreweb_install: True
-calibreweb_enabled: True
-calibreweb_port: 8083
-# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
-calibreweb_url: /books
-calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
-
 dokuwiki_install: True
 dokuwiki_enabled: True
 
@@ -176,6 +155,7 @@ nextcloud_enabled: True
 wordpress_install: True
 wordpress_enabled: True
 
+
 # 7-EDU-APPS
 
 # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS
@@ -198,21 +178,60 @@ moodle_enabled: True
 osm_install: True
 osm_enabled: True
 
-# Similar to Calibre, but unmaintained
-pathagar_install: False
-pathagar_enabled: False
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: True
 sugarizer_enabled: True
 
+
 # 8-MGMT-TOOLS
 
+awstats_install: True
+awstats_enabled: True
+
+monit_install: True
+monit_enabled: True
+
+munin_install: True
+munin_enabled: True
+
+# Handy for maintaining tables, but DANGEROUS if not locked down
+phpmyadmin_install: True
+phpmyadmin_enabled: False
+
+vnstat_install: True
+vnstat_enabled: True
+
+
+# 9-LOCAL-ADDONS
+
+# Calibre E-Book Library
+# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
+# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
+calibre_install: True
+calibre_enabled: True
+# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
+# calibre_via_debs: True
+calibre_unstable_debs: False
+# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
+# calibre_via_python: True
+# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
+calibre_port: 8080
+# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
+calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
+# In addition to: http://box/books box/libros box/livres box/livros box/liv
+
+# Calibre-Web alternative to Calibre, offers a clean/modern UX
+calibreweb_install: True
+calibreweb_enabled: True
+calibreweb_port: 8083
+# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
+calibreweb_url: /books
+calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
+
 # BitTorrent downloader for large Content Packs etc
 transmission_install: False
 transmission_enabled: False
-
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
@@ -231,33 +250,14 @@ transmission_kalite_languages:
 #    then click "Scan content folder for videos" (can take many minutes!)
 # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO
 
-awstats_install: True
-awstats_enabled: True
-
-monit_install: True
-monit_enabled: True
-
-munin_install: True
-munin_enabled: True
-
-# Handy for maintaining tables, but DANGEROUS if not locked down
-phpmyadmin_install: True
-phpmyadmin_enabled: False
-
-vnstat_install: True
-vnstat_enabled: True
 
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
 
 # Unmaintained
-# sugar_stats_install: False
-# sugar_stats_enabled: False
-
-# Unmaintained
-# xovis_install: False
-# xovis_enabled: False
+# docker_install: False
+# docker_enabled: False
 
 # Unmaintained
 # schooltool_install: False
@@ -266,3 +266,15 @@ vnstat_enabled: True
 # Unmaintained
 # debian_schooltool_install: False
 # debian_schooltool_enabled: False
+
+# Unmaintained (consider Calibre or Calibre-Web above?)
+# pathagar_install: False
+# pathagar_enabled: False
+
+# Unmaintained
+# sugar_stats_install: False
+# sugar_stats_enabled: False
+
+# Unmaintained
+# xovis_install: False
+# xovis_enabled: False
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index db8d3e62f..6f2f5f6bf 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -69,6 +69,7 @@ dansguardian_enabled: False
 # wondershaper_install: False
 # wondershaper_enabled: False
 
+
 # 1-PREP
 
 # 2-COMMON
@@ -80,6 +81,7 @@ allow_apache_sudo: True
 
 # roles/mysql runs here (mandatory)
 
+
 # 4-SERVER-OPTIONS
 
 # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security
@@ -113,6 +115,7 @@ samba_enabled: False
 # Show entire contents of USB sticks/drives (at http://box/usb)
 iiab_usb_lib_show_all: True
 
+
 # 5-XO-SERVICES
 
 # Lesser-supported XO services need additional testing.  Please contact
@@ -131,33 +134,9 @@ iiab_usb_lib_show_all: True
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
+
 # 6-GENERIC-APPS
 
-# Calibre E-Book Library
-# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
-# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
-
-calibre_install: True
-calibre_enabled: True
-# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
-# calibre_via_debs: True
-calibre_unstable_debs: False
-# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
-# calibre_via_python: True
-# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
-calibre_port: 8080
-# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
-calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
-# In addition to: http://box/books box/libros box/livres box/livros box/liv
-
-# Calibre-Web alternative to Calibre, offers a clean/modern UX
-calibreweb_install: True
-calibreweb_enabled: True
-calibreweb_port: 8083
-# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
-calibreweb_url: /books
-calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
-
 dokuwiki_install: False
 dokuwiki_enabled: False
 
@@ -176,6 +155,7 @@ nextcloud_enabled: True
 wordpress_install: True
 wordpress_enabled: True
 
+
 # 7-EDU-APPS
 
 # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS
@@ -198,21 +178,60 @@ moodle_enabled: False
 osm_install: True
 osm_enabled: True
 
-# Similar to Calibre, but unmaintained
-pathagar_install: False
-pathagar_enabled: False
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: True
 sugarizer_enabled: True
 
+
 # 8-MGMT-TOOLS
 
+awstats_install: True
+awstats_enabled: True
+
+monit_install: False
+monit_enabled: False
+
+munin_install: True
+munin_enabled: True
+
+# Handy for maintaining tables, but DANGEROUS if not locked down
+phpmyadmin_install: False
+phpmyadmin_enabled: False
+
+vnstat_install: True
+vnstat_enabled: True
+
+
+# 9-LOCAL-ADDONS
+
+# Calibre E-Book Library
+# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
+# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
+calibre_install: True
+calibre_enabled: True
+# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
+# calibre_via_debs: True
+calibre_unstable_debs: False
+# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
+# calibre_via_python: True
+# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
+calibre_port: 8080
+# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
+calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
+# In addition to: http://box/books box/libros box/livres box/livros box/liv
+
+# Calibre-Web alternative to Calibre, offers a clean/modern UX
+calibreweb_install: True
+calibreweb_enabled: True
+calibreweb_port: 8083
+# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
+calibreweb_url: /books
+calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
+
 # BitTorrent downloader for large Content Packs etc
 transmission_install: False
 transmission_enabled: False
-
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
@@ -231,33 +250,14 @@ transmission_kalite_languages:
 #    then click "Scan content folder for videos" (can take many minutes!)
 # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO
 
-awstats_install: True
-awstats_enabled: True
-
-monit_install: False
-monit_enabled: False
-
-munin_install: True
-munin_enabled: True
-
-# Handy for maintaining tables, but DANGEROUS if not locked down
-phpmyadmin_install: False
-phpmyadmin_enabled: False
-
-vnstat_install: True
-vnstat_enabled: True
 
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
 
 # Unmaintained
-# sugar_stats_install: False
-# sugar_stats_enabled: False
-
-# Unmaintained
-# xovis_install: False
-# xovis_enabled: False
+# docker_install: False
+# docker_enabled: False
 
 # Unmaintained
 # schooltool_install: False
@@ -266,3 +266,15 @@ vnstat_enabled: True
 # Unmaintained
 # debian_schooltool_install: False
 # debian_schooltool_enabled: False
+
+# Unmaintained (consider Calibre or Calibre-Web above?)
+# pathagar_install: False
+# pathagar_enabled: False
+
+# Unmaintained
+# sugar_stats_install: False
+# sugar_stats_enabled: False
+
+# Unmaintained
+# xovis_install: False
+# xovis_enabled: False
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 2ba4bdbc0..6c19e7125 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -69,6 +69,7 @@ dansguardian_enabled: False
 # wondershaper_install: False
 # wondershaper_enabled: False
 
+
 # 1-PREP
 
 # 2-COMMON
@@ -80,6 +81,7 @@ allow_apache_sudo: True
 
 # roles/mysql runs here (mandatory)
 
+
 # 4-SERVER-OPTIONS
 
 # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security
@@ -113,6 +115,7 @@ samba_enabled: False
 # Show entire contents of USB sticks/drives (at http://box/usb)
 iiab_usb_lib_show_all: True
 
+
 # 5-XO-SERVICES
 
 # Lesser-supported XO services need additional testing.  Please contact
@@ -131,33 +134,9 @@ iiab_usb_lib_show_all: True
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
+
 # 6-GENERIC-APPS
 
-# Calibre E-Book Library
-# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
-# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
-
-calibre_install: False
-calibre_enabled: False
-# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
-# calibre_via_debs: True
-calibre_unstable_debs: False
-# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
-# calibre_via_python: True
-# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
-calibre_port: 8080
-# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
-calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
-# In addition to: http://box/books box/libros box/livres box/livros box/liv
-
-# Calibre-Web alternative to Calibre, offers a clean/modern UX
-calibreweb_install: False
-calibreweb_enabled: False
-calibreweb_port: 8083
-# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
-calibreweb_url: /books
-calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
-
 dokuwiki_install: False
 dokuwiki_enabled: False
 
@@ -176,6 +155,7 @@ nextcloud_enabled: False
 wordpress_install: False
 wordpress_enabled: False
 
+
 # 7-EDU-APPS
 
 # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS
@@ -198,21 +178,60 @@ moodle_enabled: False
 osm_install: False
 osm_enabled: False
 
-# Similar to Calibre, but unmaintained
-pathagar_install: False
-pathagar_enabled: False
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: False
 sugarizer_enabled: False
 
+
 # 8-MGMT-TOOLS
 
+awstats_install: True
+awstats_enabled: True
+
+monit_install: False
+monit_enabled: False
+
+munin_install: True
+munin_enabled: True
+
+# Handy for maintaining tables, but DANGEROUS if not locked down
+phpmyadmin_install: False
+phpmyadmin_enabled: False
+
+vnstat_install: True
+vnstat_enabled: True
+
+
+# 9-LOCAL-ADDONS
+
+# Calibre E-Book Library
+# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
+# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
+calibre_install: False
+calibre_enabled: False
+# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does)
+# calibre_via_debs: True
+calibre_unstable_debs: False
+# Try python x86_64 upgrade of Calibre (like vars/<most-OS's>.yml already do)
+# calibre_via_python: True
+# Change calibre_port to 8010 if you're using XO laptops needing above idmgr
+calibre_port: 8080
+# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ
+calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
+# In addition to: http://box/books box/libros box/livres box/livros box/liv
+
+# Calibre-Web alternative to Calibre, offers a clean/modern UX
+calibreweb_install: False
+calibreweb_enabled: False
+calibreweb_port: 8083
+# http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
+calibreweb_url: /books
+calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
+
 # BitTorrent downloader for large Content Packs etc
 transmission_install: False
 transmission_enabled: False
-
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
@@ -231,33 +250,14 @@ transmission_kalite_languages:
 #    then click "Scan content folder for videos" (can take many minutes!)
 # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO
 
-awstats_install: True
-awstats_enabled: True
-
-monit_install: False
-monit_enabled: False
-
-munin_install: True
-munin_enabled: True
-
-# Handy for maintaining tables, but DANGEROUS if not locked down
-phpmyadmin_install: False
-phpmyadmin_enabled: False
-
-vnstat_install: True
-vnstat_enabled: True
 
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
 
 # Unmaintained
-# sugar_stats_install: False
-# sugar_stats_enabled: False
-
-# Unmaintained
-# xovis_install: False
-# xovis_enabled: False
+# docker_install: False
+# docker_enabled: False
 
 # Unmaintained
 # schooltool_install: False
@@ -266,3 +266,15 @@ vnstat_enabled: True
 # Unmaintained
 # debian_schooltool_install: False
 # debian_schooltool_enabled: False
+
+# Unmaintained (consider Calibre or Calibre-Web above?)
+# pathagar_install: False
+# pathagar_enabled: False
+
+# Unmaintained
+# sugar_stats_install: False
+# sugar_stats_enabled: False
+
+# Unmaintained
+# xovis_install: False
+# xovis_enabled: False