diff --git a/roles/awstats/tasks/main.yml b/roles/awstats/tasks/main.yml
index 8a9cd37e3..6f662ada9 100644
--- a/roles/awstats/tasks/main.yml
+++ b/roles/awstats/tasks/main.yml
@@ -10,7 +10,7 @@
     - option: name
       value: awstats
     - option: description
-      value: '"AWStats is Advanced Web Statistics package written in Perl which generates static or dynamic html summaries based upon web server logs"'
+      value: '"AWStats (originally known as Advanced Web Statistics) is a package written in Perl which generates static or dynamic html summaries based upon web server logs."'
     - option: installed
       value: "{{ awstats_install }}"
     - option: enabled
diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 9852e05c8..580d26358 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -59,7 +59,7 @@
             value='{{ item.value }}'
   with_items:
     - option: description
-      value: '"Calibre epub book server"'
+      value: '"Calibre is an extremely popular personal library system for e-books."'
     - option: url
       value: "{{ calibre_src_url }}"
     - option: database
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index 5b2d738ce..7dd11ef93 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -11,7 +11,7 @@
     - option: name
       value: dokuwiki
     - option: description
-      value: '"DokuWiki is a simple to use and highly versatile Open Source wiki software that does not require a database. "'
+      value: '"DokuWiki is a simple to use and highly versatile Open Source wiki software that does not require a database."'
     - option: installed
       value: "{{ dokuwiki_install }}"
     - option: enabled
diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst
index 280f2d6df..1dadfb4b5 100644
--- a/roles/elgg/README.rst
+++ b/roles/elgg/README.rst
@@ -1,5 +1,5 @@
 ===========
-ELGG README
+Elgg README
 ===========
 
 Elgg is an award-winning social networking engine, delivering the building blocks
diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml
index e30ceffec..975797857 100644
--- a/roles/elgg/tasks/main.yml
+++ b/roles/elgg/tasks/main.yml
@@ -120,7 +120,7 @@
     - option: name
       value: elgg-social-netwoking
     - option: description
-      value: '"Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications"'
+      value: '"Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications."'
     - option: path
       value: /opt/elgg
     - option: enabled
diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index e30323b02..297d0ff7f 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -117,7 +117,7 @@
     - option: name
       value: kiwix-serve
     - option: description
-      value: '"kiwix-serve is a web server for zim files"'
+      value: '"Part of https://github.com/kiwix/kiwix-tools/ - kiwix-serve is the most used web server for ZIM files."'
     - option: kiwix_url
       value: "{{ kiwix_url }}"
     - option: kiwix_path
diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml
index 1bd9485d0..e61c5ab84 100644
--- a/roles/network/tasks/squid.yml
+++ b/roles/network/tasks/squid.yml
@@ -85,7 +85,7 @@
     - option: name
       value: squid
     - option: description
-      value: '"Squid caches web pages the first time they are accessed, and pulls them from the cache thereafter"'
+      value: '"Squid caches web pages the first time they are accessed, and pulls them from the cache thereafter."'
     - option: enabled
       value: "{{ squid_enabled }}"
 
diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index d0b45f685..ffee8caf5 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -111,7 +111,7 @@
     - option: name
       value: "openvpn"
     - option: description
-      value: '"OpenVPN is a means of connecting to a server anywhere on the internet via a middleman server"'
+      value: '"OpenVPN is a means of connecting to a server anywhere on the internet, via a middleman server."'
     - option: middleman_url
       value: "{{ vpn_presence }}"
     - option: port
diff --git a/roles/samba/tasks/main.yml b/roles/samba/tasks/main.yml
index 7a0ef3fc3..8a32d7a6a 100755
--- a/roles/samba/tasks/main.yml
+++ b/roles/samba/tasks/main.yml
@@ -57,6 +57,6 @@
     - option: name
       value: samba
     - option: description
-      value: '"Samba is a Microsoft compatible remote file access system  - generalized to CIFS --common internet file system"'
+      value: '"Samba is a Microsoft-compatible network file system that re-implements SMB/CIFS (Common Internet File System)."'
     - option: enabled
       value: "{{ samba_enabled }}"