diff --git a/tromjaro/xfce/Packages-Desktop b/tromjaro/xfce/Packages-Desktop
index ce7cd01e..54dc050a 100644
--- a/tromjaro/xfce/Packages-Desktop
+++ b/tromjaro/xfce/Packages-Desktop
@@ -49,7 +49,6 @@ catfish
 easystroke
 czkawka-gui
 pika-backup
-orage
 rustdesk-nightly
 zeit-git
 touche
@@ -67,8 +66,8 @@ autokey-gtk
 
 
 #Kernels
-linux515
-linux515-headers
+linux61
+linux61-headers
 
 
 #Thunar
@@ -86,7 +85,7 @@ zsh-autosuggestions
 #Global Menus and HUD
 mate-hud
 vala-panel-appmenu-xfce-git
-vala-panel-appmenu-registrar-git
+vala-panel-appmenu-registrar
 vala-panel-appmenu-common-git
 appmenu-gtk-module
 libdbusmenu-gtk2
@@ -133,7 +132,6 @@ flatpak
 libappimage
 frei0r-plugins
 appimagelauncher
-linux515-headers
 ffmpegthumbnailer
 rebuild-detector
 btrfsmaintenance
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-10.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-10.rc
deleted file mode 100644
index e87bb37b..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-10.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-lines_vertically=false
-rotation=0
-data0=%H:%M
-font0=Ubuntu Condensed, Bold 13
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-11.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-11.rc
deleted file mode 100644
index 7657fab1..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-11.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-lines_vertically=true
-rotation=0
-data0=%H:%M
-font0=Ubuntu Condensed, Bold 13
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-15.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-15.rc
deleted file mode 100644
index e87bb37b..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-15.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-lines_vertically=false
-rotation=0
-data0=%H:%M
-font0=Ubuntu Condensed, Bold 13
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-20.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-20.rc
deleted file mode 100644
index 90a6608e..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-20.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=true
-width=52
-height_set=false
-lines_vertically=false
-rotation=0
-data0=%H:%M
-font0=Ubuntu Condensed, 15
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-3.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-3.rc
deleted file mode 100644
index e87bb37b..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/org.xfce.orage.clock-plugin-3.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-lines_vertically=false
-rotation=0
-data0=%H:%M
-font0=Ubuntu Condensed, Bold 13
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/wckbuttons-1.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/wckbuttons-1.rc
index 8cca8189..3833bbbc 100644
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/wckbuttons-1.rc
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/wckbuttons-1.rc
@@ -2,7 +2,7 @@ only_maximized=true
 show_on_desktop=false
 sync_wm_theme=true
 button_layout=CMH
-theme=Skeuos-Magenta-Light-XFWM
+theme=Skeuos-Green-Dark-XFWM
 inactive_text_alpha=60
 inactive_text_shade=110
 
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
new file mode 100644
index 00000000..1b0cfd0d
--- /dev/null
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@@ -0,0 +1,88 @@
+favorites=
+recent=o
+button-icon=org.xfce.panel.whiskermenu
+button-single-row=false
+show-button-title=false
+show-button-icon=true
+launcher-show-name=true
+launcher-show-description=true
+launcher-show-tooltip=true
+launcher-icon-size=2
+hover-switch-category=false
+category-show-name=true
+category-icon-size=1
+sort-categories=true
+view-mode=1
+default-category=0
+recent-items-max=10
+favorites-in-recent=true
+position-search-alternate=false
+position-commands-alternate=false
+position-categories-alternate=false
+position-categories-horizontal=false
+stay-on-focus-out=false
+profile-shape=0
+confirm-session-command=true
+menu-width=450
+menu-height=500
+menu-opacity=100
+command-settings=xfce4-settings-manager
+show-command-settings=true
+command-lockscreen=xflock4
+show-command-lockscreen=true
+command-switchuser=dm-tool switch-to-greeter
+show-command-switchuser=false
+command-logoutuser=xfce4-session-logout --logout --fast
+show-command-logoutuser=false
+command-restart=xfce4-session-logout --reboot --fast
+show-command-restart=false
+command-shutdown=xfce4-session-logout --halt --fast
+show-command-shutdown=false
+command-suspend=xfce4-session-logout --suspend
+show-command-suspend=false
+command-hibernate=xfce4-session-logout --hibernate
+show-command-hibernate=false
+command-logout=xfce4-session-logout
+show-command-logout=true
+command-menueditor=menulibre
+show-command-menueditor=true
+command-profile=mugshot
+show-command-profile=true
+search-actions=6
+
+[action0]
+name=Man Pages
+pattern=#
+command=exo-open --launch TerminalEmulator man %s
+regex=false
+
+[action1]
+name=Search the Web
+pattern=?
+command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
+regex=false
+
+[action2]
+name=Search for Files
+pattern=-
+command=catfish --path=~ --start %s
+regex=false
+
+[action3]
+name=Wikipedia
+pattern=!w
+command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
+regex=false
+
+[action4]
+name=Run in Terminal
+pattern=!
+command=exo-open --launch TerminalEmulator %s
+regex=false
+
+[action5]
+name=Open URI
+pattern=^(file|http|https):\\/\\/(.*)$
+command=exo-open \\0
+regex=true
+
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index dc3946e3..0c0f8887 100644
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -33,8 +33,9 @@
         <value type="int" value="25"/>
         <value type="int" value="4"/>
         <value type="int" value="6"/>
-        <value type="int" value="10"/>
         <value type="int" value="18"/>
+        <value type="int" value="3"/>
+        <value type="int" value="10"/>
       </property>
       <property name="position" type="string" value="p=6;x=96;y=25"/>
       <property name="position-locked" type="bool" value="true"/>
@@ -51,7 +52,9 @@
       </property>
     </property>
     <property name="plugin-1" type="string" value="wckbuttons"/>
-    <property name="plugin-10" type="string" value="org.xfce.orage.clock-plugin"/>
+    <property name="plugin-10" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
     <property name="plugin-13" type="string" value="pager"/>
     <property name="plugin-18" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
@@ -64,7 +67,7 @@
     <property name="plugin-25" type="string" value="pulseaudio">
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
       <property name="enable-wnck" type="bool" value="true"/>
-      <property name="mpris-players" type="string" value="smplayer"/>
+      <property name="mpris-players" type="string" value="com.github.neithern.g4music;smplayer"/>
     </property>
     <property name="plugin-28" type="string" value="systray">
       <property name="hidden-items" type="array">
@@ -102,6 +105,10 @@
       <property name="square-icons" type="bool" value="true"/>
       <property name="symbolic-icons" type="bool" value="true"/>
     </property>
+    <property name="plugin-3" type="string" value="clock">
+      <property name="digital-layout" type="uint" value="3"/>
+      <property name="digital-time-font" type="string" value="Ubuntu Condensed, Bold 13"/>
+    </property>
     <property name="plugin-4" type="string" value="power-manager-plugin"/>
     <property name="plugin-5" type="string" value="whiskermenu"/>
     <property name="plugin-6" type="string" value="xkb">
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage-settings.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage-settings.desktop
deleted file mode 100644
index 94506b86..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage-settings.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.1
-Type=Application
-Name=Calendar Settings
-GenericName=Orage Calendar Preferences
-Comment=Settings for the Xfce 4 Calendar Application (Orage)
-Icon=org.xfce.orage
-OnlyShowIn=XFCE;
-Exec=orage -p
-Actions=
-Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.desktop
deleted file mode 100644
index 9850ce19..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.1
-Type=Application
-Name=Calendar
-GenericName=Calendar
-Comment=Desktop calendar
-Icon=org.xfce.orage
-Exec=orage
-Actions=
-MimeType=text/calendar;
-Categories=Calendar;GTK;System;
-StartupNotify=true
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.globaltime.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.globaltime.desktop
deleted file mode 100644
index 1ef4df58..00000000
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/org.xfce.orage.globaltime.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.1
-Type=Application
-Name=Orage Globaltime
-GenericName=Globaltime
-NoDisplay=true
-Comment=Show clocks from different countries
-Icon=org.xfce.orage.globaltime
-Exec=Global Time
-Actions=
-Categories=Clock;GTK;Office;Utility;X-XFCE;
-StartupNotify=true
diff --git a/tromjaro/xfce/profile.conf b/tromjaro/xfce/profile.conf
index 06d8acc5..c9ec6989 100644
--- a/tromjaro/xfce/profile.conf
+++ b/tromjaro/xfce/profile.conf
@@ -2,7 +2,7 @@
 ###### use this file in the profile ######
 ##########################################
 
-kernel="linux515"
+kernel="linux61"
 
 # use multilib packages; x86_64 only
 # multilib="true"