diff --git a/.config/awesome/private.lua.example b/.config/awesome/private.lua.example
index 6920b611..f6ce39a7 100644
--- a/.config/awesome/private.lua.example
+++ b/.config/awesome/private.lua.example
@@ -1,7 +1,7 @@
 private = {}
 private.thermal_zone = "thermal_zone1"
 private.net_device = "wlp4s0"
-private.battery = {"BAT0", "BAT1"}
+private.battery = "BAT0"
 private.font_awesome = "Source Code Pro"
 private.font_awesome_size = "10"
 private.font_xterm = "Source Code Pro Semibold"
diff --git a/.config/emulationstation/es_settings.cfg b/.config/emulationstation/es_settings.cfg
new file mode 100644
index 00000000..cf66fee2
--- /dev/null
+++ b/.config/emulationstation/es_settings.cfg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<bool name="BackgroundJoystickInput" value="false" />
+<bool name="DrawFramerate" value="false" />
+<bool name="EnableSounds" value="true" />
+<bool name="QuickSystemSelect" value="true" />
+<bool name="ScrapeRatings" value="true" />
+<bool name="ShowHelpPrompts" value="true" />
+<bool name="ShowHiddenFiles" value="false" />
+<bool name="SplashScreen" value="false" />
+<int name="DisplayNumber" value="0" />
+<int name="ScraperResizeHeight" value="0" />
+<int name="ScraperResizeWidth" value="400" />
+<int name="ScreenSaverTime" value="300000" />
+<string name="ConfigDirectory" value="/home/hanez/.config/emulationstation" />
+<string name="Scraper" value="TheGamesDB" />
+<string name="ScreenSaverBehavior" value="dim" />
+<string name="TransitionStyle" value="fade" />
diff --git a/.config/emulationstation/es_systems.cfg b/.config/emulationstation/es_systems.cfg
new file mode 100644
index 00000000..9b2c1609
--- /dev/null
+++ b/.config/emulationstation/es_systems.cfg
@@ -0,0 +1,11 @@
+<systemList>	
+    <system>
+		<name>gb</name>
+		<fullname>Nintendo Gameboy</fullname>
+		<path>/home/hanez/roms/gb</path>
+		<extension>.gb .zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/gambatte_libretro.so %ROM%</command>
+		<platform>gb</platform>
+		<theme>gb</theme>
+	</system>
+</systemList>
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 99266f46..5107b2c3 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,3 +1,10 @@
+# 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
+# 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.
+# 
 XDG_DESKTOP_DIR="$HOME/desktop"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
 XDG_TEMPLATES_DIR="$HOME/templates"