diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php
index 0ed6ea8d7..22822bb87 100644
--- a/Zotlabs/Module/Suggest.php
+++ b/Zotlabs/Module/Suggest.php
@@ -36,10 +36,8 @@ class Suggest extends \Zotlabs\Web\Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Suggest Channels')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Suggest Channels App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Suggestions for channels in the $Projectname network you might be interested in');
-			return $o;
+			$papp = Apps::get_papp('Suggest Channels');
+			return Apps::app_render($papp, 'module');
 		}
 
 		$o = '';
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index 72deba305..bc47484be 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -44,10 +44,8 @@ class Webpages extends Controller {
 		if(! Apps::system_app_installed(App::$profile_uid, 'Webpages')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Webpages App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Provide managed web pages on your channel');
-			return $o;
+			$papp = Apps::get_papp('Webpages');
+			return Apps::app_render($papp, 'module');
 		}
 
 		nav_set_selected('Webpages');
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index da6e9dda6..a06119506 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -48,10 +48,8 @@ class Wiki extends Controller {
 		if(! Apps::system_app_installed(App::$profile_uid, 'Wiki')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Wiki App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Provide a wiki for your channel');
-			return $o;
+			$papp = Apps::get_papp('Wiki');
+			return Apps::app_render($papp, 'module');
 		}
 
 
diff --git a/app/bookmarks.png b/app/bookmarks.png
deleted file mode 100644
index fffad3329..000000000
Binary files a/app/bookmarks.png and /dev/null differ
diff --git a/app/bugreport.png b/app/bugreport.png
deleted file mode 100644
index 4b59da185..000000000
Binary files a/app/bugreport.png and /dev/null differ
diff --git a/app/chat.png b/app/chat.png
deleted file mode 100644
index 9d3fdebd7..000000000
Binary files a/app/chat.png and /dev/null differ
diff --git a/app/connections.png b/app/connections.png
deleted file mode 100644
index 6f6100761..000000000
Binary files a/app/connections.png and /dev/null differ
diff --git a/app/directory.png b/app/directory.png
deleted file mode 100644
index 659f69051..000000000
Binary files a/app/directory.png and /dev/null differ
diff --git a/app/firefoxshare.png b/app/firefoxshare.png
deleted file mode 100644
index 755952284..000000000
Binary files a/app/firefoxshare.png and /dev/null differ
diff --git a/app/help.png b/app/help.png
deleted file mode 100644
index 6b9b1ccb6..000000000
Binary files a/app/help.png and /dev/null differ
diff --git a/app/home.png b/app/home.png
deleted file mode 100644
index 4b45f2a7a..000000000
Binary files a/app/home.png and /dev/null differ
diff --git a/app/invite.png b/app/invite.png
deleted file mode 100644
index dbc2cbbfa..000000000
Binary files a/app/invite.png and /dev/null differ
diff --git a/app/lang.png b/app/lang.png
deleted file mode 100644
index 89a61c26a..000000000
Binary files a/app/lang.png and /dev/null differ
diff --git a/app/login.png b/app/login.png
deleted file mode 100644
index 4e5625ee7..000000000
Binary files a/app/login.png and /dev/null differ
diff --git a/app/mood.png b/app/mood.png
deleted file mode 100644
index 2a5c1aca6..000000000
Binary files a/app/mood.png and /dev/null differ
diff --git a/app/photos.png b/app/photos.png
deleted file mode 100644
index 59b038288..000000000
Binary files a/app/photos.png and /dev/null differ
diff --git a/app/poke.png b/app/poke.png
deleted file mode 100644
index 9655d54ff..000000000
Binary files a/app/poke.png and /dev/null differ
diff --git a/app/post.png b/app/post.png
deleted file mode 100644
index 4a4355581..000000000
Binary files a/app/post.png and /dev/null differ
diff --git a/app/pphoto.png b/app/pphoto.png
deleted file mode 100644
index 041ff1e0c..000000000
Binary files a/app/pphoto.png and /dev/null differ
diff --git a/app/probe.png b/app/probe.png
deleted file mode 100644
index 21bd85cd9..000000000
Binary files a/app/probe.png and /dev/null differ
diff --git a/app/randprof.png b/app/randprof.png
deleted file mode 100644
index 7bb438dcd..000000000
Binary files a/app/randprof.png and /dev/null differ
diff --git a/app/search.png b/app/search.png
deleted file mode 100644
index 505d93c3f..000000000
Binary files a/app/search.png and /dev/null differ
diff --git a/app/storage.png b/app/storage.png
deleted file mode 100644
index ad8b89f6a..000000000
Binary files a/app/storage.png and /dev/null differ
diff --git a/app/suggest.apd b/app/suggest.apd
index 0fdd8a399..56bced0dc 100644
--- a/app/suggest.apd
+++ b/app/suggest.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/suggest
 requires: local_channel
 name: Suggest Channels
 photo: icon:lightbulb-o
 categories: Networking
+desc: Suggestions for channels in the network you might be interested in.
diff --git a/app/suggest.png b/app/suggest.png
deleted file mode 100644
index ca9180528..000000000
Binary files a/app/suggest.png and /dev/null differ
diff --git a/app/webpages.apd b/app/webpages.apd
index 1c215512f..e72b8586b 100644
--- a/app/webpages.apd
+++ b/app/webpages.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/webpages/$nick
 requires: local_channel
 name: Webpages
 photo: icon:newspaper-o
 categories: nav_featured_app, Productivity
+desc: Create and manage web pages for your channel.
diff --git a/app/webpages.png b/app/webpages.png
deleted file mode 100644
index 72a091831..000000000
Binary files a/app/webpages.png and /dev/null differ
diff --git a/app/wiki.apd b/app/wiki.apd
index e2fbe77e1..d59bdd8a4 100644
--- a/app/wiki.apd
+++ b/app/wiki.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/wiki/$nick
 requires: local_channel
 name: Wiki
 photo: icon:pencil-square-o
 categories: nav_featured_app, Productivity
+desc: A simple yet powerful wiki for your channel.
diff --git a/app/wiki.png b/app/wiki.png
deleted file mode 100644
index 31d981679..000000000
Binary files a/app/wiki.png and /dev/null differ