diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml
index 70a67d517..57b109bc1 100644
--- a/roles/calibre-web/defaults/main.yml
+++ b/roles/calibre-web/defaults/main.yml
@@ -14,7 +14,7 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-calibreweb_version: 0.6.7    # WAS: master, 0.6.4, 0.6.5, 0.6.7
+calibreweb_version: 0.6.8    # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7
 
 calibreweb_venv_path: /usr/local/calibre-web-py3
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index 12d780f7d..d41bc10de 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -26,9 +26,9 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
 # http://download.kiwix.org/release/kiwix-tools/ ...or sometimes...
 # http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1-0
-kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1-0
-kiwix_version_i686: kiwix-tools_linux-i586-3.1.1-0
+kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1-4
+kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1-4
+kiwix_version_i686: kiwix-tools_linux-i586-3.1.1-4
 
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact
index 5b60bbe08..9f4143ce9 100755
--- a/scripts/local_facts.fact
+++ b/scripts/local_facts.fact
@@ -11,6 +11,9 @@ fi
 
 OS=`grep ^ID= /etc/*elease|cut -d= -f2`
 OS=${OS//\"/}
+if [ -f /etc/rpi-issue ]; then
+    OS="raspbian"
+fi
 VERSION_ID=`grep VERSION_ID /etc/*elease | cut -d= -f2`
 VERSION_ID=${VERSION_ID//\"/}
 VERSION_ID=${VERSION_ID%%.*}
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 955e128c0..1076649af 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -252,7 +252,7 @@ nginx_log_dir: /var/log/nginx
 nginx_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/www_options/tasks/main.yml#L53-L67
+# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66
 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php/<VERSION>/fpm/php.ini
 
 # Make this False to disable http://box/common/services/power_off.php button:
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index e39639121..2b859b4bd 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -128,8 +128,6 @@ openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
 openvpn_handle: 
-# The following seems necessary on CentOS:
-# openvpn_cron_enabled: True
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/
@@ -150,7 +148,7 @@ pi_swap_file_size: 1024
 nginx_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/www_options/tasks/main.yml#L53-L67
+# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66
 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php/<VERSION>/fpm/php.ini
 
 # See also Apache vars {default_language, language_priority} @ top of this file
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 69202f6b1..f4f5f7464 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -128,8 +128,6 @@ openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
 openvpn_handle: 
-# The following seems necessary on CentOS:
-# openvpn_cron_enabled: True
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/
@@ -150,7 +148,7 @@ pi_swap_file_size: 1024
 nginx_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/www_options/tasks/main.yml#L53-L67
+# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66
 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php/<VERSION>/fpm/php.ini
 
 # See also Apache vars {default_language, language_priority} @ top of this file
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index dd3e57de1..f32591746 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -128,8 +128,6 @@ openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
 openvpn_handle: 
-# The following seems necessary on CentOS:
-# openvpn_cron_enabled: True
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/
@@ -150,7 +148,7 @@ pi_swap_file_size: 1024
 nginx_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/www_options/tasks/main.yml#L53-L67
+# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66
 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php/<VERSION>/fpm/php.ini
 
 # See also Apache vars {default_language, language_priority} @ top of this file