diff --git a/roles/awstats/tasks/main.yml b/roles/awstats/tasks/main.yml
index b249b6a22..70c42ece4 100644
--- a/roles/awstats/tasks/main.yml
+++ b/roles/awstats/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install AWStats if awstats_install
   include_tasks: install.yml
-  when: awstats_install | bool and not awstats_installed is defined
+  when: awstats_install and not awstats_installed is defined
 
 - name: Enable AWStats
   include_tasks: enable.yml
-  when: awstats_install | bool or awstats_installed is defined
+  when: awstats_install or awstats_installed is defined
diff --git a/roles/azuracast/tasks/main.yml b/roles/azuracast/tasks/main.yml
index efa0fe446..6b3fb0d5f 100644
--- a/roles/azuracast/tasks/main.yml
+++ b/roles/azuracast/tasks/main.yml
@@ -1,8 +1,8 @@
 - name: Install AzuraCast if azuracast_install
   include_tasks: install.yml
-  when: azuracast_install | bool and not azuracast_installed is defined | bool
+  when: azuracast_install and not azuracast_installed is defined | bool
 
 # TODO figure out what to turn off for azuracast
 #- name: Enable AzuraCast
 #  include_tasks: enable.yml
-#  when: azuracast_install | bool or azuracast_installed is defined | bool
+#  when: azuracast_install or azuracast_installed is defined | bool
diff --git a/roles/calibre-web/tasks/enable.yml b/roles/calibre-web/tasks/enable.yml
index af38393c7..59d4db6cb 100644
--- a/roles/calibre-web/tasks/enable.yml
+++ b/roles/calibre-web/tasks/enable.yml
@@ -66,7 +66,7 @@
     - option: name
       value: calibre-web
     - option: description
-      value: '"calibre-web is a web app providing a clean interface for browsing, reading and downloading e-books."'
+      value: '"Calibre-Web is a web app providing a clean interface for browsing, reading and downloading e-books."'
     - option: calibreweb_url1
       value: "{{ calibreweb_url1 }}"
     - option: calibreweb_url2
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index ad5ba75a7..4ed805b2a 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install DokuWiki
   include_tasks: install.yml
-  when: dokuwiki_install | bool and not dokuwiki_installed is defined
+  when: dokuwiki_install and not dokuwiki_installed is defined
 
 - name: Enable DokuWiki
   include_tasks: enable.yml
-  when: dokuwiki_install | bool or dokuwiki_installed is defined
+  when: dokuwiki_install or dokuwiki_installed is defined
diff --git a/roles/gitea/tasks/enable.yml b/roles/gitea/tasks/enable.yml
index 6e1dd8993..5b706a14e 100644
--- a/roles/gitea/tasks/enable.yml
+++ b/roles/gitea/tasks/enable.yml
@@ -60,7 +60,7 @@
     - option: name
       value: gitea
     - option: description
-      value: '"Gitea: Git with a cup of tea"'
+      value: '"Gitea is like GitHub for more offline communities: Git with a cup of tea"'
     - option: gitea_run_directory
       value: "{{ gitea_run_directory }}"
     - option: gitea_url
diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 135287181..34b9d9c81 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install Kolibri
   include_tasks: install.yml
-  when: kolibri_install | bool and not kolibri_installed is defined
+  when: kolibri_install and not kolibri_installed is defined
 
 - name: Enable Kolibri
   include_tasks: enable.yml
-  when: kolibri_install | bool or kolibri_installed is defined
+  when: kolibri_install or kolibri_installed is defined
diff --git a/roles/lokole/tasks/main.yml b/roles/lokole/tasks/main.yml
index 159a92485..cd33c7692 100644
--- a/roles/lokole/tasks/main.yml
+++ b/roles/lokole/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install Lokole {{ lokole_version }} if lokole_install
   include_tasks: install.yml
-  when: lokole_install | bool and not lokole_installed is defined
+  when: lokole_install and not lokole_installed is defined
 
 - name: Enable Lokole
   include_tasks: enable.yml
-  when: lokole_install | bool or lokole_installed is defined
+  when: lokole_install or lokole_installed is defined
diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml
index 33efcd89d..5f531f697 100644
--- a/roles/mediawiki/tasks/enable.yml
+++ b/roles/mediawiki/tasks/enable.yml
@@ -45,7 +45,7 @@
     - option: name
       value: mediawiki
     - option: description
-      value: '"mediawiki is a blog and web site management application."'
+      value: '"MediaWiki is a blog and web site management application, from the people who create Wikipedia."'
     - option: mediawiki_src
       value: "{{ mediawiki_src }}"
     - option: mediawiki_abs_path
diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index d3565e63d..df4bbcc74 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -5,4 +5,3 @@
 - name: Enable MediaWiki
   include_tasks: enable.yml
   when: mediawiki_install or mediawiki_installed is defined
-  # when: mediawiki_enabled | bool
diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml
index baadf93c4..9665f3d6d 100644
--- a/roles/moodle/tasks/main.yml
+++ b/roles/moodle/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: "Install Moodle"
   include_tasks: install.yml
-  when: moodle_install | bool and not moodle_installed is defined
+  when: moodle_install and not moodle_installed is defined
 
 - name: Enable Moodle
   include_tasks: enable.yml
-  when: moodle_install | bool or moodle_installed is defined
+  when: moodle_install or moodle_installed is defined
diff --git a/roles/mosquitto/tasks/main.yml b/roles/mosquitto/tasks/main.yml
index b6654ef3b..61bcf25e9 100644
--- a/roles/mosquitto/tasks/main.yml
+++ b/roles/mosquitto/tasks/main.yml
@@ -1,5 +1,5 @@
 - include_tasks: install.yml
-  when: mosquitto_install | bool and not mosquitto_installed is defined
+  when: mosquitto_install and not mosquitto_installed is defined
 
 - include_tasks: enable.yml
-  when: mosquitto_install | bool or mosquitto_installed is defined
+  when: mosquitto_install or mosquitto_installed is defined
diff --git a/roles/munin/tasks/enable.yml b/roles/munin/tasks/enable.yml
index b2256e46f..81420cbcb 100644
--- a/roles/munin/tasks/enable.yml
+++ b/roles/munin/tasks/enable.yml
@@ -60,7 +60,7 @@
     - option: name
       value: Munin
     - option: description
-      value: '"Munin is a networked resource monitoring tool that can help analyze resource trends and \"what just happened to kill our performance?\" problems."'
+      value: '"Munin is a networked resource monitoring tool that can help analyze resource trends and ''what just happened to kill our performance?'' problems."'
     - option: installed
       value: "{{ munin_install }}"
     - option: enabled
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 431498f21..31e9ef1e4 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -48,7 +48,7 @@
 
 - name: Configure wondershaper
   include_tasks: wondershaper.yml
-  when: wondershaper_install | bool or wondershaper_installed is defined
+  when: wondershaper_install or wondershaper_installed is defined
   #tags: network, wondershaper
 
 - name: (Re)Install named
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 9a7c90dfc..9618a9960 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -15,13 +15,13 @@
     name: "{{ proxy }}"
     state: stopped
   async: 120
-  when: squid_install | bool or squid_installed is defined
+  when: squid_install or squid_installed is defined
 
 - name: Stop DansGuardian
   systemd:
     name: dansguardian
     state: stopped
-  when: dansguardian_install | bool or dansguardian_installed is defined
+  when: dansguardian_install or dansguardian_installed is defined
 
 - name: Restart DansGuardian service (dansguardian) except Ubuntu which needs reboot to activate
   systemd:
diff --git a/roles/nginx/tasks/disable.yml.deprecated b/roles/nginx/tasks/disable.yml.deprecated
index 8ff87f1ba..d2e8f7a06 100644
--- a/roles/nginx/tasks/disable.yml.deprecated
+++ b/roles/nginx/tasks/disable.yml.deprecated
@@ -1,14 +1,14 @@
 #grep -r "not nginx_enabled" roles/
-#roles/calibre-web/tasks/main.yml:  when: calibreweb_enabled | bool and not nginx_enabled | bool
+#roles/calibre-web/tasks/main.yml:  when: calibreweb_enabled and not nginx_enabled | bool
 #roles/calibre-web/tasks/main.yml:  when: not nginx_enabled | bool
-#roles/kolibri/tasks/main.yml:  when: kolibri_enabled | bool and not nginx_enabled | bool
+#roles/kolibri/tasks/main.yml:  when: kolibri_enabled and not nginx_enabled | bool
 #roles/kolibri/tasks/main.yml:  when: not nginx_enabled | bool
-#roles/kiwix/tasks/kiwix_install.yml:  when: kiwix_enabled | bool and not nginx_enabled | bool
+#roles/kiwix/tasks/kiwix_install.yml:  when: kiwix_enabled and not nginx_enabled | bool
 #roles/kiwix/tasks/kiwix_install.yml:  when: not nginx_enabled | bool
 #roles/nginx/tasks/main.yml:  when: not nginx_enabled | bool
 #roles/nginx/tasks/main.yml:  when: not nginx_enabled | bool
-#roles/sugarizer/tasks/install.yml:  when: sugarizer_enabled | bool and not nginx_enabled | bool
-#roles/sugarizer/tasks/install.yml:  when: sugarizer_enabled | bool and not nginx_enabled | bool
+#roles/sugarizer/tasks/install.yml:  when: sugarizer_enabled and not nginx_enabled | bool
+#roles/sugarizer/tasks/install.yml:  when: sugarizer_enabled and not nginx_enabled | bool
 
 - name: Enable Gitea for Apache
   command: a2ensite gitea.conf
diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml
index 3b5001416..6ee3d8abe 100644
--- a/roles/nodered/tasks/main.yml
+++ b/roles/nodered/tasks/main.yml
@@ -1,5 +1,5 @@
 - include_tasks: install.yml
-  when: nodered_install | bool and not nodered_installed is defined
+  when: nodered_install and not nodered_installed is defined
 
 - include_tasks: enable.yml
-  when: nodered_install | bool or nodered_installed is defined
+  when: nodered_install or nodered_installed is defined
diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index fa9a0ddff..8eb963551 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Install 'sugarizer' if sugarizer_install and not Debian 10+
   include_tasks: install.yml
-  when: not sugarizer_installed is defined and sugarizer_install | bool and not ((is_debian and not is_raspbian) and (not is_debian_8) and (not is_debian_9))
+  when: not sugarizer_installed is defined and sugarizer_install and not ((is_debian and not is_raspbian) and (not is_debian_8) and (not is_debian_9))
 
 - name: Enable 'sugarizer' if sugarizer_enabled
   include_tasks: enable.yml