diff --git a/config/libfm/libfm.conf b/config/libfm/libfm.conf
new file mode 100644
index 0000000000000000000000000000000000000000..ab47806affadaa16124d9aa5882684e29b8ddc41
--- /dev/null
+++ b/config/libfm/libfm.conf
@@ -0,0 +1,42 @@
+# Configuration file for the libfm version 1.3.1.
+# Autogenerated file, don't edit, your changes will be overwritten.
+
+[config]
+single_click=0
+use_trash=1
+confirm_del=1
+confirm_trash=1
+advanced_mode=0
+si_unit=0
+force_startup_notify=1
+backup_as_hidden=1
+no_usb_trash=1
+no_child_non_expandable=0
+show_full_names=0
+only_user_templates=0
+template_run_app=0
+template_type_once=0
+auto_selection_delay=600
+drop_default_action=auto
+defer_content_test=0
+quick_exec=1
+show_internal_volumes=0
+terminal=x-terminal-emulator %s
+archiver=xarchiver
+thumbnail_local=1
+thumbnail_max=2048
+smart_desktop_autodrop=1
+cutdown_menus=1
+cutdown_places=1
+real_expanders=1
+
+[places]
+places_home=1
+places_desktop=1
+places_root=0
+places_computer=0
+places_trash=0
+places_applications=0
+places_network=0
+places_unmounted=0
+places_volmounts=0
diff --git a/config/lxsession/LXDE/autostart b/config/lxsession/LXDE/autostart
new file mode 100644
index 0000000000000000000000000000000000000000..90ff4ce7f3d7e39054d477559e1dda71dc526836
--- /dev/null
+++ b/config/lxsession/LXDE/autostart
@@ -0,0 +1,2 @@
+@lxpanel --profile LXDE
+@pcmanfm --desktop --profile LXDE
diff --git a/config/lxsession/LXDE/desktop.conf b/config/lxsession/LXDE/desktop.conf
new file mode 100644
index 0000000000000000000000000000000000000000..420d2a8151090db818369ac0efa8a359bfb55a2d
--- /dev/null
+++ b/config/lxsession/LXDE/desktop.conf
@@ -0,0 +1,50 @@
+[Session]
+window_manager=openbox-lxde
+disable_autostart=no
+polkit/command=
+clipboard/command=lxclipboard
+xsettings_manager/command=build-in
+proxy_manager/command=build-in
+keyring/command=ssh-agent
+quit_manager/command=lxsession-logout
+lock_manager/command=lxlock
+terminal_manager/command=lxterminal --working-directory=$HOME
+quit_manager/image=/usr/share/lxde/images/logout-banner.png
+quit_manager/layout=top
+
+[GTK]
+sNet/ThemeName=Adwaita-dark
+sNet/IconThemeName=nuoveXT2
+sGtk/FontName=Liberation Sans 10
+iGtk/ToolbarStyle=3
+iGtk/ButtonImages=1
+iGtk/MenuImages=1
+iGtk/CursorThemeSize=18
+iXft/Antialias=1
+iXft/Hinting=1
+sXft/HintStyle=hintslight
+sXft/RGBA=rgb
+iNet/EnableEventSounds=1
+iNet/EnableInputFeedbackSounds=1
+sGtk/ColorScheme=
+iGtk/ToolbarIconSize=3
+sGtk/CursorThemeName=DMZ-White
+
+[Mouse]
+AccFactor=20
+AccThreshold=10
+LeftHanded=0
+
+[Keyboard]
+Delay=500
+Interval=30
+Beep=1
+
+[State]
+guess_default=true
+
+[Dbus]
+lxde=true
+
+[Environment]
+menu_prefix=lxde-
diff --git a/setup.sh b/setup.sh
index e38bad64968a05428dd31676136525e4c9a9bdd7..9d28a1a61bc26b4ef3e88d231ae756c3c105aaf7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -153,18 +153,8 @@
 		sudo cp /usr/share/applications/arduino.desktop /home/pi$i/Desktop/
 	done
 
-# Not functional as no vnc has been set up for pi? users
-# Disable "How to execute"-PopUp
-#	echo " Enabling quick execution of desktop shortcuts."
-#	for i in $(seq 1 $vncCount)
-#	do
-#		sed -e 's/quick_exec=0/quick_exec=1/' -i /home/pi$i/.config/libfm/libfm.conf
-#	done
-
-
 
 # Camera Stuff...
 #python3 -m pip install --upgrade --force-reinstall Pillow
 # https://gist.github.com/melissacoleman/8e6bf42089ccb2a5ee60c0bea26c2061
 # sudo userdel -r -f pi5
-# sudo apt install xscreensaver ?