diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 205d360d8..e09f43644 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -59,11 +59,13 @@
     state: present
   when: is_debuntu
 
-- name: 'Install php{{ php_version }}-mcrypt (debuntu but not ubuntu-18) NOTE: php7.2 dropped mcrypt'
+- name: 'Install php{{ php_version }}-mcrypt IF this is a "pre-2018" distro in the debuntu family. NOTE: PHP 7.1 deprecated mcrypt 1-Dec-2016 and PHP 7.2 dropped it completely 30-Nov-2017, as it should no longer be nec.'
   package:
     name: "php{{ php_version }}-mcrypt"
     state: present
-  when: is_debuntu and not is_ubuntu_18
+  when: is_debuntu and (is_debian_8 or is_debian_9 or is_ubuntu_16 or is_ubuntu_17)
+  # NOT NEC TO TEST FOR is_raspbian_8 OR is_raspbian_9 AS /opt/iiab/iiab/vars/<OS>.yml
+  # DEFINES THESE AS SUBSETS OF is_debian_8 OR is_debian_9 (FOR NOW!)
 
 # we need to install the rpm in order to get the dependencies
 # but we only need to do this the first time
diff --git a/vars/centos-7.yml b/vars/centos-7.yml
index 1c584df8a..c2efe174c 100644
--- a/vars/centos-7.yml
+++ b/vars/centos-7.yml
@@ -1,5 +1,7 @@
-is_centos: True
 is_redhat: True
+is_centos: True
+is_centos_7: True
+
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/debian-10.yml b/vars/debian-10.yml
index dd820dd0c..c7553ef2b 100644
--- a/vars/debian-10.yml
+++ b/vars/debian-10.yml
@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_10: True
+
 dns_service: bind9
 dhcp_service: isc-dhcp-server
 dns_user: bind
@@ -17,8 +18,8 @@ mysql_service: mariadb
 apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
-php_version: 7.1
-postgresql_version: 10
+php_version: 7.3
+postgresql_version: 11
 systemd_location: /lib/systemd/system
 # Upgrade OS's own Calibre to very latest:
 calibre_via_debs: True
diff --git a/vars/debian-8.yml b/vars/debian-8.yml
index 8027ed3a6..821c56188 100644
--- a/vars/debian-8.yml
+++ b/vars/debian-8.yml
@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_8: True
+
 dns_service: bind9
 dns_user: bind
 proxy: squid3
diff --git a/vars/debian-9.yml b/vars/debian-9.yml
index 856c9fa7e..d8140de67 100644
--- a/vars/debian-9.yml
+++ b/vars/debian-9.yml
@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_9: True
+
 dns_service: bind9
 dhcp_service: isc-dhcp-server
 dns_user: bind
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 08aff8424..a58d8a361 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -490,16 +490,22 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 is_debuntu: False
 is_ubuntu: False
 is_ubuntu_18: False
+is_ubuntu_17: False
 is_ubuntu_16: False
 is_debian: False
 is_debian_10: False
 is_debian_9: False
 is_debian_8: False
 is_rpi: False
+is_raspbian_9: False
+is_raspbian_8: False
 
 is_redhat: False
-is_fedora: False
 is_centos: False
+is_centos_7: False
+is_fedora: False
+is_fedora_22: False
+is_fedora_18: False
 
 # How This Works:
 # 1. /opt/iiab/iiab/iiab-install copies scripts/local_facts.fact to /etc/ansible/facts.d/local_facts.fact
diff --git a/vars/fedora-18.yml b/vars/fedora-18.yml
index 71377feca..a86d7c192 100644
--- a/vars/fedora-18.yml
+++ b/vars/fedora-18.yml
@@ -1,4 +1,7 @@
 is_redhat: True
+is_fedora: True
+is_fedora_18: True
+
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml
index 4c295e475..a7e182fa2 100644
--- a/vars/fedora-22.yml
+++ b/vars/fedora-22.yml
@@ -1,4 +1,7 @@
 is_redhat: True
+is_fedora: True
+is_fedora_22: True
+
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml
index 9b66b9af2..ec8f3abd8 100644
--- a/vars/raspbian-8.yml
+++ b/vars/raspbian-8.yml
@@ -1,6 +1,8 @@
-is_rpi: True
-is_debian: True
 is_debuntu: True
+is_debian: True
+is_debian_8: True
+is_raspbian_8: True
+is_rpi: True
 rtc_id: ds3231
 
 dns_service: bind9
diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml
index 3084cb761..e33bf0e0c 100644
--- a/vars/raspbian-9.yml
+++ b/vars/raspbian-9.yml
@@ -1,6 +1,8 @@
-is_rpi: True
-is_debian: True
 is_debuntu: True
+is_debian: True
+is_debian_9: True
+is_raspbian_9: True
+is_rpi: True
 rtc_id: ds3231
 
 dns_service: bind9
diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml
index e8eea1d8d..72958fc00 100644
--- a/vars/ubuntu-16.yml
+++ b/vars/ubuntu-16.yml
@@ -1,6 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
 is_ubuntu_16: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server
diff --git a/vars/ubuntu-17.yml b/vars/ubuntu-17.yml
index a198e9d3d..be1c6ef0a 100644
--- a/vars/ubuntu-17.yml
+++ b/vars/ubuntu-17.yml
@@ -1,5 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
+is_ubuntu_17: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server
diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml
index b1bd1fd53..94d8b48ac 100644
--- a/vars/ubuntu-18.yml
+++ b/vars/ubuntu-18.yml
@@ -1,6 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
 is_ubuntu_18: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server