diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index d49e8f29612f95b4f580d915c63ddca46f7aadf0..59fd269615c6d28b74946a4c61d08e0d6a0503e8 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -85,11 +85,11 @@ function app_expected_to_be_installed {
     read_config_param ONION_ONLY
 
     if [[ "$select_all_apps" == "add-all" ]]; then
-        if [[ "$app_name" == "vim"  ]]; then
+        if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla"  ]]; then
             echo "0"
             return
         fi
-        if [[ $ONION_ONLY != 'no' && "$app_name" == "hubzilla"  ]]; then
+        if ! grep -q "IN_DEFAULT_INSTALL=1" /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}; then
             echo "0"
             return
         fi
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index 1bda0405a408ac95c235448f3a3fcfb545251624..9f188d92e84a700ff1be88d3c30109a1f3766a83 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim media'
 
+IN_DEFAULT_INSTALL=1
+
 dlna_variables=(SYSTEM_TYPE
                 USB_MOUNT
                 INSTALLED_WITHIN_DOCKER
diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index acd412677624665eccc67fdb5ce27d12080201c4..ebefaff74344697d8bb5f541fdbac66cea67077a 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim writer'
 
+IN_DEFAULT_INSTALL=1
+
 SHOW_ON_ABOUT=1
 
 DOKUWIKI_DOMAIN_NAME=
diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index 131e6e2413ab709a8b6b04299b2ee195bd7f0795..99667321f9e6f669e0a1d7fb0e1e15e712945d90 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -30,6 +30,8 @@
 
 VARIANTS='full'
 
+IN_DEFAULT_INSTALL=1
+
 emacs_variables=(USB_MOUNT
                  MY_USERNAME)
 
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index ae3b55fcf760b1efcfde3d647e4fd68a03a9c203..a93a31d2c1819d1012a6638c50b3d617c53f506f 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim media'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 GNUSOCIAL_DOMAIN_NAME=
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 67d4589d8cbdce0a54ca8ad1288b00f07b4f61e2..19004323e01f05905624158a2a26a19e0164c96d 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -30,6 +30,7 @@
 
 VARIANTS='developer'
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 GOGS_USERNAME='gogs'
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 508a1fcae38d25230d07ee24589a2b816cfaf2ca..0a37208454d6831152713e3fb02b8f03fc014d60 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -30,6 +30,7 @@
 
 VARIANTS="full full-vim writer"
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 HTMLY_DOMAIN_NAME=
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index f266093d43ad8d4d38d1cd54069c76bac1b29bff..34468d933cf5157ad9cf4e2c1978e331af44261c 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim social'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 HUBZILLA_DOMAIN_NAME=
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 0cd0d0f354cce93044d8493c10f86016aa4dd700..fa34b40afd469c2da3f71251575d5bb11b108e6e 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 IPFS_GO_REPO_BASE="github.com/ipfs/go-ipfs"
 IPFS_GO_REPO='https://github.com/ipfs/go-ipfs'
 IPFS_COMMIT='6fdfaaf6e4783ae1be7b348e7a6bc0640982c7df'
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 477747d86e33ead39f8d8422a8d100f27c5a2683..149635bd29ded182253bd21b3930638c5156728d 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 IRC_PORT=6697
diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault
index d5f25b9c7b046c34833f015c8fe5d3746a01ceec..b88e76fb6a84bfd71ebbaa7fe8ee3213cb913415 100755
--- a/src/freedombone-app-librevault
+++ b/src/freedombone-app-librevault
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 PROTOBUF_REPO="https://github.com/google/protobuf"
 PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53'
 
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index ce3e4b21651e2395b523d60f73e428b26c324ee6..aaf5a86d01a39541e016b6c5a89ceb87756fb58d 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -30,6 +30,7 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 MEDIAGOBLIN_DOMAIN_NAME=
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 5c676253cfcb31ae7c9b9758bb3c557a49507c31..ad7020d57a545ce7501894f9fd1d27ba04066087 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 # Password used for mumble server
diff --git a/src/freedombone-app-pelican b/src/freedombone-app-pelican
index 088bcd56b2e2a55887bf2eff9d1e87d499c85a75..444d2e4aee7595d2366ffe24c6b9ea5ad586328c 100755
--- a/src/freedombone-app-pelican
+++ b/src/freedombone-app-pelican
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 STATIC_BLOG_INSTALL_DIR=/etc/staticblog
 PELICAN_THEMES_REPO="https://github.com/getpelican/pelican-themes"
 PELICAN_PLUGINS_REPO="https://github.com/getpelican/pelican-plugins"
diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index 6ecadbd637be9558e3f175c0a416409fbe7952f7..a47c57c533a026cb46fb12361a7481a99545dfd8 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -33,6 +33,8 @@
 
 VARIANTS='full full-vim adblocker'
 
+IN_DEFAULT_INSTALL=1
+
 PIHOLE_IFACE=eth0
 PIHOLE_DNS1='85.214.73.63'
 PIHOLE_DNS2='213.73.91.35'
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 6c7d75680b02e6c5b337490c3b9b24a958235db5..cee9a07cdbb60f0540289d07f688ca82f800b9bc 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim writer'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 RSS_READER_REPO="https://tt-rss.org/git/tt-rss.git"
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index 6525ac18f62de914bc9348bb109726c6ad8c56b8..164b56fa2043dbed16704892bac0182b9160efbe 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -30,6 +30,7 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 SEARX_REPO="https://github.com/asciimoo/searx"
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index 967f51f4ae8edba49aa18da12ce9f6029a29bfc7..3163c66b5856e274012fbb8f5bf6c1e3eecea44d 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 SIP_SERVER_PASSWORD=
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 6650349a6f939315cc874d36b623294389e20a1f..08f28d6a3479bddafb1b3df14d21c3b417435cee 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim cloud'
 
+IN_DEFAULT_INSTALL=1
+
 SYNCTHING_ID=
 SYNCTHING_CONFIG_PATH=/root/.config/syncthing
 SYNCTHING_CONFIG_FILE=$SYNCTHING_CONFIG_PATH/config.xml
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 114701127fbf04e477944d4d942e9a9c0555ab34..9965b8f755a4873823089c3364a60f3d8f16485b 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -30,6 +30,7 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 38eb5617dff263d53a03d659d04835efda8d37c7..10ebd851dae386d6c49dd976ff31d237bcc668be 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 TOX_PORT=33445
diff --git a/src/freedombone-app-vim b/src/freedombone-app-vim
index 4ee5664c8ed2bfd6f92b5f7246bd2cbc31d3a52c..1a09953bd49e4588f5cce7e9499291bb21f2ee99 100755
--- a/src/freedombone-app-vim
+++ b/src/freedombone-app-vim
@@ -30,6 +30,8 @@
 
 VARIANTS='full-vim'
 
+IN_DEFAULT_INSTALL=0
+
 VIM_TEMP_DIR='.vimtemp'
 VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/ +9'
 
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 088c0dbfd83604392381130b0bd4350f911f58c0..47542deb0e5efc929092914882db8eb4ccc27995 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 WEBMAIL_REPO="https://github.com/roundcube/roundcubemail"
 WEBMAIL_COMMIT='78cf9c2e5cff2d78cd8beb647d60570f195a2a9c'
 WEBMAIL_ONION_HOSTNAME=
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 8a8627e728e3980ed09aac56a1953e11606a01f9..175301bc0c6d138fe774256f3d80b8add5122239 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -30,6 +30,7 @@
 
 VARIANTS='full full-vim chat'
 
+IN_DEFAULT_INSTALL=1
 SHOW_ON_ABOUT=1
 
 # Directory where XMPP settings are stored
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index d60ed2e7a60750cc0589268ababe8e5510d2e133..7a2e21ede6daa053c7d3d0b0eff4f3826a79fa71 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+IN_DEFAULT_INSTALL=0
+
 MESH_INSTALL_DIR=/var/lib
 
 ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"