diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh
index a6ba5eb..4f9fb1b 100644
--- a/repo_functions_ub1604.sh
+++ b/repo_functions_ub1604.sh
@@ -109,7 +109,6 @@ python-musicbrainz2;apt;multimedia;python-musicbrainz2
 gmusicbrowser;apt;multimedia;gmusicbrowser
 peek;apt;multimedia;peek
 bino;apt;multimedia;bino
-owncloud-client;apt;internet;owncloud-client
 syncthing-gtk;apt;internet;syncthing-gtk
 syncthing;apt;internet;syncthing
 insync;apt;internet;insync
@@ -470,7 +469,6 @@ etcher-electron;addRepo_Etcher
 sublime-text;addRepo_SublimeText
 vivaldi-stable;addRepo_Vivaldi
 virtualbox-5.2;addRepo_VirtualBox
-owncloud-client;addRepo_OwnCloud
 syncthing;addRepo_Syncthing
 opera-stable;addRepo_Opera
 insync;addRepo_Insync
@@ -1075,15 +1073,6 @@ function addRepo_Syncthing () {
           "deb http://apt.syncthing.net/ syncthing release"
 }
 
-#
-# OwnCloud
-#
-function addRepo_OwnCloud () {
-  addKey "http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_16.04/Release.key"
-  addRepo owncloud-client.list \
-          "deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ /"
-}
-
 #
 # VirtualBox
 #
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index f377d4b..ae20d3f 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -103,7 +103,6 @@ python-musicbrainz2;apt;multimedia;python-musicbrainz2
 gmusicbrowser;apt;multimedia;gmusicbrowser
 peek;apt;multimedia;peek
 bino;apt;multimedia;bino
-owncloud-client;apt;internet;owncloud-client
 syncthing;apt;internet;syncthing
 syncthing-gtk;apt;internet;syncthinggtk
 insync;apt;internet;insync
@@ -399,7 +398,6 @@ etcher-electron;addRepo_Etcher
 sublime-text;addRepo_SublimeText
 vivaldi-stable;addRepo_Vivaldi
 virtualbox-5.2;addRepo_VirtualBox
-owncloud-client;addRepo_OwnCloud
 syncthing;addRepo_Syncthing
 syncthinggtk;addRepo_SyncthingGtk
 opera-stable;addRepo_Opera
@@ -890,15 +888,6 @@ function addRepo_Syncthing () {
           "deb http://apt.syncthing.net/ syncthing release"
 }
 
-#
-# OwnCloud
-#
-function addRepo_OwnCloud () {
-  addKey "http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_16.04/Release.key"
-  addRepo owncloud-client.list \
-          "deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ /"
-}
-
 #
 # VirtualBox
 #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index f5a6242..76d1e5c 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -73,12 +73,12 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
       msg "Installing Apps"
       installAppsFromList base
       installAppsFromList office
-      installBurningTools
+      installAppsFromList burningtools
       installAppsFromList ebook
       installAppsFromList games
       installAppsFromList steam
       installAppsFromList internet
-      installJava10
+      installAppsFromList java10
       installAppsFromList utilities
       installAppsFromList multimedia
       installAppsFromList nettools
@@ -116,12 +116,12 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
       msg "Installing Apps"
       installAppsFromList base
       installAppsFromList office
-      installBurningTools
+      installAppsFromList burningtools
       installAppsFromList ebook
       installAppsFromList games
       installAppsFromList steam
       installAppsFromList internet
-      installJava10
+      installAppsFromList java10
       installAppsFromList utilities
       installAppsFromList multimedia
       installAppsFromList nettools
@@ -142,7 +142,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
       addScreenfetchBashrc
       enableHistoryTS
       installUnattendedUpgrades
-      enableUnbound
+      installAppsFromList unbound
       msg "Installing additional themes/icons"
       installAppsFromList icons
       installAppsFromList gtkthemes