diff --git a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/images/4935x3296.jpg b/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/images/4935x3296.jpg
deleted file mode 120000
index f40a1fa..0000000
--- a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/images/4935x3296.jpg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/backgrounds/etiona.jpg
\ No newline at end of file
diff --git a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/screenshot.png b/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/screenshot.png
deleted file mode 100644
index dae6b86..0000000
Binary files a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/contents/screenshot.png and /dev/null differ
diff --git a/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/images/4494x3000.jpg b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/images/4494x3000.jpg
new file mode 100644
index 0000000..604b123
Binary files /dev/null and b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/images/4494x3000.jpg differ
diff --git a/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/screenshot.png b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/screenshot.png
new file mode 100644
index 0000000..80771a6
Binary files /dev/null and b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/contents/screenshot.png differ
diff --git a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/metadata.desktop b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/metadata.desktop
similarity index 80%
rename from helpers/DATA/kubuntu-settings/wallpaper/Etiona/metadata.desktop
rename to helpers/DATA/kubuntu-settings/wallpaper/Nabia/metadata.desktop
index 80542c7..685b442 100644
--- a/helpers/DATA/kubuntu-settings/wallpaper/Etiona/metadata.desktop
+++ b/helpers/DATA/kubuntu-settings/wallpaper/Nabia/metadata.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 
-Name=Etiona
+Name=Nabia
 X-KDE-PluginInfo-License=GPLv3+
diff --git a/helpers/make-kubuntu-settings b/helpers/make-kubuntu-settings
index f7c63c3..978509c 100644
--- a/helpers/make-kubuntu-settings
+++ b/helpers/make-kubuntu-settings
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 COMPONENT=main
 . ./config
 
@@ -60,7 +60,7 @@ X-KDE-PluginInfo-EnabledByDefault=true
 X-Plasma-API=5.0
  
 [Wallpaper]
-defaultWallpaperTheme=Etiona
+defaultWallpaperTheme=Nabia
 defaultFileSuffix=.jpg
 defaultWidth=4935
 defaultHeight=3296
@@ -75,16 +75,16 @@ EOF
 cat << EOF > desktop/kf5-settings/kdeglobals
 [General]
 fixed=Monospace,9,-1,0,50,0,0,0,0,0,Regular
-font=Roboto,10,-1,0,50,0,0,0,0,0,Regular
-menuFont=Roboto,10,-1,0,50,0,0,0,0,0,Regular
-smallestReadableFont=Roboto,8,-1,0,50,0,0,0,0,0,Regular
-toolBarFont=Roboto,10,-1,0,50,0,0,0,0,0,Regular
+font=Noto Sans,10,-1,0,50,0,0,0,0,0,Regular
+menuFont=Noto Sans,10,-1,0,50,0,0,0,0,0,Regular
+smallestReadableFont=Noto Sans,8,-1,0,50,0,0,0,0,0,Regular
+toolBarFont=Noto Sans,10,-1,0,50,0,0,0,0,0,Regular
 XftAntialias=true
 XftHintStyle=hintslight
 XftSubPixel=rgb
 
 [WM]
-activeFont=Roboto,10,-1,0,57,0,0,0,0,0,Medium
+activeFont=Noto Sans,10,-1,0,57,0,0,0,0,0,Bold
 
 [KDE]
 LookAndFeelPackage=org.triskel.desktop
@@ -96,10 +96,34 @@ echo 'wallpaper/*	usr/share/wallpapers/' >> debian/triskel-settings-desktop.inst
 
 sed 's/gtk-fallback-icon-theme=gnome/gtk-fallback-icon-theme=trisquel/' -i desktop/usr-share/settings.ini
 
-cat << EOF >> desktop/theme/look-and-feel/org.triskel.desktop/contents/defaults
+cat << EOF > desktop/theme/look-and-feel/org.triskel.desktop/contents/defaults
+[kdeglobals][KDE]
+widgetStyle=Breeze
+
+[kdeglobals][General]
+ColorScheme=Breeze
+
+[kdeglobals][Icons]
+Theme=breeze
+
+[plasmarc][Theme]
+name=Triskel
+
+[Wallpaper]
+Image=Next
+
+[kcminputrc][Mouse]
+cursorTheme=DMZ-White
+
+[Desktop][org.kde.plasma.desktop]
+Containment=org.kde.plasma.folder
+
 [ksplashrc][KSplash]
 Engine=none
 Theme=none
+
+[ksmserverrc][General]
+loginMode=emptySession
 EOF
 
 cat << EOF1 > debian/triskel-settings-desktop.preinst
@@ -121,7 +145,7 @@ gtk-theme-name = Breeze
 gtk-icon-theme-name = Breeze
 gtk-fallback-icon-theme = Trisquel
 gtk-sound-theme-name = Trisquel
-gtk-font-name=Sans Serif Regular 10
+gtk-font-name=Noto Sans Regular 10
 gtk-menu-images=1
 gtk-button-images=1
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
@@ -138,10 +162,10 @@ cat << EOF > \$item
 include "/usr/share/themes/Breeze/gtk-2.0/gtkrc"
 style "user-font" 
 {
-        font_name="Sans Serif Regular"
+        font_name="Noto Sans Regular"
 }
 widget_class "*" style "user-font"
-gtk-font-name="Sans Serif Regular 10"
+gtk-font-name="Noto Sans Regular 10"
 gtk-theme-name="Breeze"
 gtk-icon-theme-name="breeze"
 gtk-fallback-icon-theme="trisquel"