16 files changed, 26 insertions, 31 deletions

diff --git a/app/admin.png b/app/admin.png
deleted file mode 100644
index cde922e8e..000000000
--- a/app/admin.png
+++ /dev/null
diff --git a/app/caldav.apd b/app/caldav.apd
new file mode 100644
index 000000000..a5839fd6e
--- /dev/null
+++ b/app/caldav.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/cdav/calendar
+requires: local_channel
+name: CalDAV
+photo: icon:calendar
+categories: Productivity, Personal
diff --git a/app/carddav.apd b/app/carddav.apd
new file mode 100644
index 000000000..3b60ebcfe
--- /dev/null
+++ b/app/carddav.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/cdav/addressbook
+requires: local_channel
+name: CardDAV
+photo: icon:vcard-o
+categories: Productivity, Personal
diff --git a/app/cards.apd b/app/cards.apd
new file mode 100644
index 000000000..047aaeac9
--- /dev/null
+++ b/app/cards.apd
@@ -0,0 +1,6 @@
+version: 1.1
+url: $baseurl/cards/$nick
+name: Cards
+requires: local_channel, cards
+photo: icon:list
+categories: Productivity
diff --git a/app/features.apd b/app/features.apd
deleted file mode 100644
index bffbdffec..000000000
--- a/app/features.apd
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/settings/features
-requires: local_channel
-name: Features
-photo: icon:cogs
-categories: System
diff --git a/app/features.png b/app/features.png
deleted file mode 100644
index 5faf14bc3..000000000
--- a/app/features.png
+++ /dev/null
diff --git a/app/login.apd b/app/login.apd
deleted file mode 100644
index 1cbb44f1b..000000000
--- a/app/login.apd
+++ /dev/null
@@ -1,5 +0,0 @@
-version: 1
-url: $baseurl/login
-requires: nologin
-name: Login
-photo: icon:sign-in
diff --git a/app/manage.apd b/app/manage.apd
deleted file mode 100644
index b525efa6c..000000000
--- a/app/manage.apd
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/manage
-requires: local_channel
-name: Channel Manager
-photo: icon:id-card-o
-categories: Personal
diff --git a/app/manage.png b/app/manage.png
deleted file mode 100644
index 38a4dcbae..000000000
--- a/app/manage.png
+++ /dev/null
diff --git a/app/photos.apd b/app/photos.apd
index 7a7a4b7b6..048e623bb 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -3,4 +3,4 @@ url: $baseurl/photos/$nick
 requires: local_channel
 name: Photos
 photo: icon:photo
-categories: Multimedia
+categories: nav_featured_app, Multimedia
diff --git a/app/profile.apd b/app/profile.apd
deleted file mode 100644
index c8205df63..000000000
--- a/app/profile.apd
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/profile/$nick
-requires: local_channel
-name: View Profile
-photo: icon:user
-categories: Personal
diff --git a/app/profile.png b/app/profile.png
deleted file mode 100644
index e6e137c82..000000000
--- a/app/profile.png
+++ /dev/null
diff --git a/app/pubstream.apd b/app/pubstream.apd
new file mode 100644
index 000000000..ebfcf38b0
--- /dev/null
+++ b/app/pubstream.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/pubstream
+requires: config:disable_discover_tab=0
+name: Public Stream
+photo: icon:globe
+categories: Social
diff --git a/app/settings.apd b/app/settings.apd
deleted file mode 100644
index b244f6774..000000000
--- a/app/settings.apd
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/settings
-requires: local_channel
-name: Settings
-photo: icon:cog
-categories: System
diff --git a/app/settings.png b/app/settings.png
deleted file mode 100644
index 2ba11a79a..000000000
--- a/app/settings.png
+++ /dev/null
diff --git a/app/storage.apd b/app/storage.apd
index 7dcbcc089..cafcf81e8 100644
--- a/app/storage.apd
+++ b/app/storage.apd
@@ -3,4 +3,4 @@ url: $baseurl/cloud/$nick
 requires: local_channel
 name: Files
 photo: icon:folder-open
-categories: Productivity
+categories: nav_featured_app, Productivity