diff --git a/.config/lxpanel/LXDE/panels/panel b/.config/lxpanel/LXDE/panels/panel
index 99b565c..5d82428 100644
--- a/.config/lxpanel/LXDE/panels/panel
+++ b/.config/lxpanel/LXDE/panels/panel
@@ -54,7 +54,7 @@ Plugin {
       id=pcmanfm.desktop
     }
     Button {
-      id=firefox.desktop
+      id=firefox-Tadgy.desktop
     }
   }
 }
@@ -119,23 +119,6 @@ Plugin {
   Config {
   }
 }
-Plugin {
-  type=batt
-  Config {
-    BackgroundColor=black
-    ChargingColor1=#28f200
-    ChargingColor2=#22cc00
-    DischargingColor1=#ffee00
-    DischargingColor2=#d9ca00
-    HideIfNoBattery=0
-    AlarmCommand=notify-send "Battery low" --icon=battery-caution
-    AlarmTime=10
-    BorderWidth=1
-    Size=15
-    ShowExtendedInformation=0
-    BatteryNumber=0
-  }
-}
 Plugin {
   type=dclock
   Config {
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 723ae61..94b0164 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,18 +1,15 @@
 # This file is written by xdg-user-dirs-update
 # If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run
+# interested in. All local changes will be retained on the next run.
 # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-# There is no point setting these to the correct locations in ~/files
-# as, when the directory doesn't exist, it's reset to '$HOME/' or in
-# the case of DESKTOP created to prevent an error on login.
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_DOCUMENTS_DIR="$HOME"
-XDG_TEMPLATES_DIR="$HOME"
-XDG_PICTURES_DIR="$HOME"
-XDG_MUSIC_DIR="$HOME"
-XDG_VIDEOS_DIR="$HOME"
-XDG_PUBLICSHARE_DIR="$HOME"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_TEMPLATES_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"
+XDG_PUBLICSHARE_DIR="$HOME/"