diff --git a/roles/httpd/README.md b/roles/httpd/README.md
new file mode 100644
index 000000000..d3368793d
--- /dev/null
+++ b/roles/httpd/README.md
@@ -0,0 +1,3 @@
+See also Internet-in-a-Box's new NGINX README.md, evolving here:
+
+[https://github.com/iiab/iiab/tree/master/roles/nginx](../nginx)
diff --git a/roles/httpd/defaults/main.yml b/roles/httpd/defaults/main.yml
index 9aadcea3f..e3a6706d8 100644
--- a/roles/httpd/defaults/main.yml
+++ b/roles/httpd/defaults/main.yml
@@ -5,7 +5,7 @@
 # apache_high_php_limits: False
 # WARNING: Enabling this might cause excess use of RAM/disk or other resources!
 # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS...
-# https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84
+# https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/enable.yml#L1-L14
 # ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini
 
 # Make this False to disable http://box/common/services/power_off.php button:
diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2
index fed0b0210..ef2492c36 100755
--- a/roles/httpd/templates/010-iiab.conf.j2
+++ b/roles/httpd/templates/010-iiab.conf.j2
@@ -1,7 +1,7 @@
 # This configuration file supplements the main Apache 
 # server configuration file (conf/httpd.conf).  It contains the
 # configuration directives that specifically relate to the
-# XSCE Schoolserver.
+# IIAB Schoolserver.
 #
 # Some of the choices are a bit subjective, but in general directives
 # that are still valid in 2.4 are left if they override something
@@ -214,7 +214,7 @@ DocumentRoot "{{ doc_root }}"
 # negotiated documents.  The MultiViews Option can be used for the 
 # same purpose, but it is much slower.
 #
-# XSCE has both multiview and .var strategies
+# IIAB has both multiview and .var strategies
 
 DirectoryIndex index.html index.html.var
 
diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml
index 99dfda781..59e2174a3 100644
--- a/roles/kolibri/tasks/install.yml
+++ b/roles/kolibri/tasks/install.yml
@@ -77,12 +77,13 @@
 #  become_user: "{{ kolibri_user }}"
 #  when: kolibri_provision | bool
 
-- name: Set Kolibri default language ({{ kolibri_language }})
-  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
-  ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
-  when: kolibri_provision | bool
+# 2020-01-05: Deprecated per https://github.com/iiab/iiab/issues/2103
+#- name: Set Kolibri default language ({{ kolibri_language }})
+#  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
+#  ignore_errors: yes
+#  become: yes
+#  become_user: "{{ kolibri_user }}"
+#  when: kolibri_provision | bool
 
 - name: 'Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language'
   shell: >
diff --git a/roles/network/templates/network/br0.j2 b/roles/network/templates/network/br0.j2
index d59ccd5df..1891b0bc5 100644
--- a/roles/network/templates/network/br0.j2
+++ b/roles/network/templates/network/br0.j2
@@ -1,4 +1,4 @@
-# generated by XSCE
+# Generated by IIAB
 # gui_desired_network_role is {{ gui_desired_network_role }}
 
 # we always want the wireless to be configured (and under bridge)
diff --git a/roles/network/templates/network/ifcfg-WAN.j2 b/roles/network/templates/network/ifcfg-WAN.j2
index 8e1387442..1498ef9dd 100644
--- a/roles/network/templates/network/ifcfg-WAN.j2
+++ b/roles/network/templates/network/ifcfg-WAN.j2
@@ -1,4 +1,4 @@
-# Generated by XSCE
+# Generated by IIAB
 NAME="iiab-WAN"
 TYPE="Ethernet"
 DEFROUTE="yes"
diff --git a/roles/network/templates/network/ifcfg-slave.j2 b/roles/network/templates/network/ifcfg-slave.j2
index 30947af05..06e575e06 100644
--- a/roles/network/templates/network/ifcfg-slave.j2
+++ b/roles/network/templates/network/ifcfg-slave.j2
@@ -1,4 +1,4 @@
-# Generated by XSCE
+# Generated by IIAB
 TYPE=Ethernet
 BOOTPROTO=none
 BRIDGE=br0
diff --git a/roles/network/templates/network/ifcfg.j2 b/roles/network/templates/network/ifcfg.j2
index d109d6eb5..d551636ab 100644
--- a/roles/network/templates/network/ifcfg.j2
+++ b/roles/network/templates/network/ifcfg.j2
@@ -1,4 +1,4 @@
-# Generated by XSCE
+# Generated by IIAB
 {% if iiab_lan_iface == "br0" %}
 DEVICE=br0
 TYPE=Bridge
diff --git a/roles/network/templates/network/wifi-slave.j2 b/roles/network/templates/network/wifi-slave.j2
index 5985aecb4..39040d16d 100644
--- a/roles/network/templates/network/wifi-slave.j2
+++ b/roles/network/templates/network/wifi-slave.j2
@@ -1,4 +1,4 @@
-# Generated by XSCE for wifi-slave
+# Generated by IIAB for wifi-slave
 # used mostly for the NM_CONTROLLED part
 TYPE=Ethernet
 BOOTPROTO=none
diff --git a/roles/nextcloud/README.md b/roles/nextcloud/README.md
index 3f1ecb612..d47739523 100644
--- a/roles/nextcloud/README.md
+++ b/roles/nextcloud/README.md
@@ -33,7 +33,7 @@ To further refine Nextcloud access controls based on IPv4 addresses, you can edi
 - max_execution_time
 - max_input_time
 
-Useful PHP recommendations for these settings (while largely tailored to WordPress, and aimed at very low-end hardware) can be found here: [/opt/iiab/iiab/roles/httpd/tasks/main.yml](https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84)
+Useful PHP recommendations for these settings (while largely tailored to WordPress, and aimed at very low-end hardware) can be found here: [/opt/iiab/iiab/roles/httpd/tasks/enable.yml](https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/enable.yml#L1-L14)
 
 ## Using It
 
diff --git a/roles/rachel/README.rst b/roles/rachel/README.rst
index 31aa1453d..08df5a8f2 100644
--- a/roles/rachel/README.rst
+++ b/roles/rachel/README.rst
@@ -2,7 +2,7 @@
 RACHEL README
 =============
 
-This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to XSCE.
+This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to IIAB.
 It takes RACHEL in its entirety and the download must be copied manually.
 This version is based on rachelusb_32EN_3.1.5.zip.
 
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 4717c6837..a9351635c 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -144,9 +144,9 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
-captiveportal_install: False
-captiveportal_enabled: False
+# extensively later refined (PRs #1179, #1300, #1327, #2070).
+captiveportal_install: True
+captiveportal_enabled: True
 captiveportal_port: 9090
 captiveportal_splash_page: /
 # You might also want to set iiab_home_url (above!)
@@ -254,7 +254,6 @@ apache_high_php_limits: False
 # https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84
 # ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini
 #
-
 # Make this False to disable http://box/common/services/power_off.php button:
 apache_allow_sudo: True
 
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index e9baf6526..238a33487 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -82,9 +82,9 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
-captiveportal_install: False
-captiveportal_enabled: False
+# extensively later refined (PRs #1179, #1300, #1327, #2070).
+captiveportal_install: True
+captiveportal_enabled: True
 captiveportal_splash_page: /
 # You might also want to set iiab_home_url (above!)
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index b29ed0db9..9e0a8affe 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -82,9 +82,9 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
-captiveportal_install: False
-captiveportal_enabled: False
+# extensively later refined (PRs #1179, #1300, #1327, #2070).
+captiveportal_install: True
+captiveportal_enabled: True
 captiveportal_splash_page: /
 # You might also want to set iiab_home_url (above!)
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 37af97b0c..c1e0f6ae6 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -82,9 +82,9 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070).
-captiveportal_install: False
-captiveportal_enabled: False
+# extensively later refined (PRs #1179, #1300, #1327, #2070).
+captiveportal_install: True
+captiveportal_enabled: True
 captiveportal_splash_page: /
 # You might also want to set iiab_home_url (above!)
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO