diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index efc06f1c..98dff879 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -140,7 +140,8 @@ vicious.register(cpuwidget, vicious.widgets.cpu, "$1")
 
 -- {{{ Wibar
 -- Create a textclock widget
-mytextclock = wibox.widget.textclock()
+--mytextclock = wibox.widget.textclock()
+mytextclock = awful.widget.textclock(" %a %b %d, %H:%M:%S ", 1)
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
diff --git a/.emulationstation/es_input.cfg b/.emulationstation/es_input.cfg
new file mode 100644
index 00000000..9b951228
--- /dev/null
+++ b/.emulationstation/es_input.cfg
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<inputList>
+	<inputConfig type="joystick" deviceName="USB Gamepad " deviceGUID="03000000790000001100000010010000">
+		<input name="a" type="button" id="1" value="1" />
+		<input name="b" type="button" id="2" value="1" />
+		<input name="down" type="axis" id="1" value="1" />
+		<input name="hotkeyenable" type="button" id="8" value="1" />
+		<input name="left" type="axis" id="0" value="-1" />
+		<input name="right" type="axis" id="0" value="1" />
+		<input name="select" type="button" id="8" value="1" />
+		<input name="start" type="button" id="9" value="1" />
+		<input name="up" type="axis" id="1" value="-1" />
+	</inputConfig>
+	<inputConfig type="joystick" deviceName="8Bitdo NES30 GamePad" deviceGUID="05000000202800000900000000010000">
+		<input name="a" type="button" id="0" value="1" />
+		<input name="b" type="button" id="1" value="1" />
+		<input name="x" type="button" id="3" value="1" />
+		<input name="y" type="button" id="4" value="1" />
+		<input name="up" type="axis" id="1" value="-1" />
+		<input name="down" type="axis" id="1" value="1" />
+		<input name="right" type="axis" id="0" value="1" />
+		<input name="left" type="axis" id="0" value="-1" />
+		<input name="leftshoulder" type="button" id="6" value="1" />
+		<input name="rightshoulder" type="button" id="7" value="1" />
+		<input name="select" type="button" id="10" value="1" />
+		<input name="start" type="button" id="11" value="1" />
+		<input name="hotkeyenable" type="button" id="10" value="1" />
+	</inputConfig>
+</inputList>
diff --git a/.emulationstation/es_settings.cfg b/.emulationstation/es_settings.cfg
new file mode 100644
index 00000000..3dc03ab2
--- /dev/null
+++ b/.emulationstation/es_settings.cfg
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<bool name="BackgroundJoystickInput" value="false" />
+<bool name="CaptionsCompatibility" value="true" />
+<bool name="DrawFramerate" value="false" />
+<bool name="EnableSounds" value="true" />
+<bool name="MoveCarousel" value="true" />
+<bool name="ParseGamelistOnly" value="false" />
+<bool name="QuickSystemSelect" value="false" />
+<bool name="SaveGamelistsOnExit" value="true" />
+<bool name="ScrapeRatings" value="true" />
+<bool name="ScreenSaverControls" value="true" />
+<bool name="ScreenSaverOmxPlayer" value="false" />
+<bool name="ShowHelpPrompts" value="true" />
+<bool name="ShowHiddenFiles" value="false" />
+<bool name="SlideshowScreenSaverCustomImageSource" value="false" />
+<bool name="SlideshowScreenSaverRecurse" value="false" />
+<bool name="SlideshowScreenSaverStretch" value="false" />
+<bool name="SortAllSystems" value="false" />
+<bool name="StretchVideoOnScreenSaver" value="false" />
+<bool name="UseCustomCollectionsSystem" value="true" />
+<bool name="VideoAudio" value="true" />
+<bool name="VideoOmxPlayer" value="false" />
+<bool name="hideQuitMenuOnKidUI" value="false" />
+<int name="DisplayNumber" value="0" />
+<int name="MaxVRAM" value="100" />
+<int name="ScraperResizeHeight" value="0" />
+<int name="ScraperResizeWidth" value="400" />
+<int name="ScreenSaverSwapImageTimeout" value="10000" />
+<int name="ScreenSaverSwapVideoTimeout" value="30000" />
+<int name="ScreenSaverTime" value="300000" />
+<string name="AudioDevice" value="Master" />
+<string name="CollectionSystemsAuto" value="" />
+<string name="CollectionSystemsCustom" value="" />
+<string name="ConfigDirectory" value="/home/hanez/.emulationstation" />
+<string name="GamelistViewStyle" value="basic" />
+<string name="OMXAudioDev" value="both" />
+<string name="PowerSaverMode" value="disabled" />
+<string name="Scraper" value="TheGamesDB" />
+<string name="ScreenSaverBehavior" value="dim" />
+<string name="ScreenSaverGameInfo" value="never" />
+<string name="SlideshowScreenSaverBackgroundAudioFile" value="/home/hanez/.emulationstation/slideshow/audio/slideshow_bg.wav" />
+<string name="SlideshowScreenSaverImageDir" value="/home/hanez/.emulationstation/slideshow/image" />
+<string name="SlideshowScreenSaverImageFilter" value=".png,.jpg" />
+<string name="StartupSystem" value="" />
+<string name="ThemeSet" value="es-theme-carbon" />
+<string name="TransitionStyle" value="fade" />
+<string name="UIMode" value="Full" />
+<string name="UIMode_passkey" value="uuddlrlrba" />
diff --git a/.emulationstation/es_systems.cfg b/.emulationstation/es_systems.cfg
new file mode 100644
index 00000000..cf2bfa94
--- /dev/null
+++ b/.emulationstation/es_systems.cfg
@@ -0,0 +1,93 @@
+<systemList>
+    <system>
+		<name>gb</name>
+		<fullname>Nintendo Gameboy</fullname>
+		<path>~/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>
+    <system>
+		<name>nes</name>
+		<fullname>Nintendo Entertainment System</fullname>
+		<path>~/roms/nes</path>
+		<extension>.nes .zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/quicknes_libretro.so %ROM%</command>
+		<platform>nes</platform>
+		<theme>nes</theme>
+	</system>
+	<system>
+		<name>snes</name>
+		<fullname>Super Nintendo Entertainment System</fullname>
+		<path>~/roms/snes</path>
+		<extension>.sfc .zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/snes9x_libretro.so %ROM%</command>
+		<platform>snes</platform>
+		<theme>snes</theme>
+	</system>
+	<system>
+		<name>gamegear</name>
+		<fullname>Sega Game Gear</fullname>
+		<path>~/roms/gamegear</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/genesis_plus_gx_libretro.so %ROM%</command>
+		<platform>gamegear</platform>
+		<theme>gamegear</theme>
+	</system>
+	<system>
+		<name>mastersystem</name>
+		<fullname>Sega Master System</fullname>
+		<path>~/roms/mastersystem</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/picodrive_libretro.so %ROM%</command>
+		<platform>mastersystem</platform>
+		<theme>mastersystem</theme>
+	</system>
+	<system>
+		<name>megadrive</name>
+		<fullname>Sega Megadrive</fullname>
+		<path>~/roms/megadrive</path>
+		<extension>.zip .7z</extension>
+		<!--<command>retroarch -f -L /usr/lib/libretro/genesis_plus_gx_libretro.so %ROM%</command>-->
+		<command>retroarch -f -L /usr/lib/libretro/picodrive_libretro.so %ROM%</command>
+		<platform>megadrive</platform>
+		<theme>megadrive</theme>
+	</system>
+	<system>
+		<name>atari2600</name>
+		<fullname>Atari 2600</fullname>
+		<path>~/roms/atari2600</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/stella_libretro.so %ROM%</command>
+		<platform>atari2600</platform>
+		<theme>atari2600</theme>
+	</system>
+    <system>
+		<name>atari5200</name>
+		<fullname>Atari 5200</fullname>
+		<path>~/roms/atari5200</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/atari800_libretro.so %ROM%</command>
+		<platform>atari5200</platform>
+		<theme>atari5200</theme>
+	</system>
+    <system>
+		<name>atari7800</name>
+		<fullname>Atari 7800</fullname>
+		<path>~/roms/atari7800</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/prosystem_libretro.so %ROM%</command>
+		<platform>atari7800</platform>
+		<theme>atari7800</theme>
+	</system>
+    <system>
+		<name>atarilynx</name>
+		<fullname>Atari Lynx</fullname>
+		<path>~/roms/atarilynx</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/handy_libretro.so %ROM%</command>
+		<platform>atarilynx</platform>
+		<theme>atarilynx</theme>
+	</system>
+</systemList>
diff --git a/.gitignore b/.gitignore
index 59314d59..d7fed0a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,13 +6,13 @@
 !.config/awesome/**
 .config/awesome/private.lua
 
-!.config/emulationstation
-!.config/emulationstation/es_input.cfg
-!.config/emulationstation/es_settings.cfg
-!.config/emulationstation/es_systems.cfg
-!.config/emulationstation/themes
-!.config/emulationstation/themes/es-theme-carbon
-!.config/emulationstation/themes/simple
+!.emulationstation
+!.emulationstation/es_input.cfg
+!.emulationstation/es_settings.cfg
+!.emulationstation/es_systems.cfg
+#!.config/emulationstation/themes
+#!.config/emulationstation/themes/es-theme-carbon
+#!.config/emulationstation/themes/simple
 
 #!.config/mc
 #!.config/mc/ini