diff --git a/.emulationstation/es_input.cfg b/.emulationstation/es_input.cfg
deleted file mode 100644
index 9b951228..00000000
--- a/.emulationstation/es_input.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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
deleted file mode 100644
index 3dc03ab2..00000000
--- a/.emulationstation/es_settings.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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/.gitignore b/.gitignore
index 6ab3e1d8..f28edce9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,8 @@
 .config/awesome/private.lua
 
 !.emulationstation
-!.emulationstation/es_input.cfg
-!.emulationstation/es_settings.cfg
+#!.emulationstation/es_input.cfg
+#!.emulationstation/es_settings.cfg
 !.emulationstation/es_systems.cfg
 #!.emulationstation/themes
 #!.emulationstation/themes/**