diff --git a/.config/emulationstation/es_input.cfg b/.config/emulationstation/es_input.cfg
new file mode 100644
index 00000000..36390294
--- /dev/null
+++ b/.config/emulationstation/es_input.cfg
@@ -0,0 +1,13 @@
+<?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="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>
+</inputList>
diff --git a/.config/emulationstation/es_settings.cfg b/.config/emulationstation/es_settings.cfg
new file mode 100644
index 00000000..469ef0f7
--- /dev/null
+++ b/.config/emulationstation/es_settings.cfg
@@ -0,0 +1,18 @@
+<?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="ThemeSet" value="es-theme-carbon" />
+<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..ddc41e24
--- /dev/null
+++ b/.config/emulationstation/es_systems.cfg
@@ -0,0 +1,110 @@
+<systemList>	
+    <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>
+    <system>
+		<name>c64</name>
+		<fullname>Commodore C64</fullname>
+		<path>~/roms/c64</path>
+		<extension>.zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/frodo_libretro.so %ROM%</command>
+		<platform>c64</platform>
+		<theme>c64</theme>
+	</system>
+    <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>gba</name>
+		<fullname>Nintendo Gameboy Advance</fullname>
+		<path>~/roms/gba</path>
+		<extension>.gba .zip .7z</extension>
+		<command>retroarch -f -L /usr/lib/libretro/vba_next_libretro.so %ROM%</command>
+		<platform>gba</platform>
+		<theme>gba</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</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/picodrive_libretro %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 %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/picodrive_libretro %ROM%</command>
+		<platform>megadrive</platform>
+		<theme>megadrive</theme>
+	</system>
+</systemList>
diff --git a/.gitignore b/.gitignore
index c32feae5..11c27b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,12 @@
 !.config/awesome
 !.config/awesome/**
 .config/awesome/private.lua
+!.config/emulationstation
+!.config/emulationstation/**
+.config/emulationstation/downloaded_images
+.config/emulationstation/es_log.txt
+.config/emulationstation/gamelists
+.config/emulationstation/themes
 #!.config/mc
 #!.config/mc/ini
 !.config/user-dirs.dirs