diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 68bca2cc..7b22be00 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -492,6 +492,10 @@ modules:
         - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
         - cp retrodeck-retroarch.cfg ${FLATPAK_DEST}/retrodeck/retrodeck-retroarch.cfg
 
+        # Logo
+        - rm -f /app/share/emulationstation/resources/graphics/splash.svg
+        - cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+
         #- find / -iname es_settings.xml #debug
         #- BREAK #debug
         
@@ -514,4 +518,6 @@ modules:
         path: retrodeck.sh
       - type: file
         path: retrodeck-retroarch.cfg
+      - type: file
+        path: res/splash.svg
     # create desktop entry
\ No newline at end of file
diff --git a/es_input.xml b/es_input.xml
index 108f83d3..a374a3a3 100644
--- a/es_input.xml
+++ b/es_input.xml
@@ -3,15 +3,10 @@
 	<inputConfig type="keyboard" deviceName="Keyboard" deviceGUID="-1">
 		<input name="a" type="key" id="120" value="1" />
 		<input name="b" type="key" id="122" value="1" />
-		<input name="back" type="key" id="13" value="1" />
+		<input name="back" type="key" id="8" value="1" />
 		<input name="down" type="key" id="1073741905" value="1" />
 		<input name="left" type="key" id="1073741904" value="1" />
 		<input name="leftshoulder" type="key" id="119" value="1" />
-		<input name="leftthumbstickclick" type="key" id="111" value="1" />
-		<input name="leftthumbstickdown" type="key" id="107" value="1" />
-		<input name="leftthumbstickleft" type="key" id="106" value="1" />
-		<input name="leftthumbstickright" type="key" id="108" value="1" />
-		<input name="leftthumbstickup" type="key" id="105" value="1" />
 		<input name="lefttrigger" type="key" id="113" value="1" />
 		<input name="right" type="key" id="1073741903" value="1" />
 		<input name="rightshoulder" type="key" id="101" value="1" />
@@ -21,7 +16,7 @@
 		<input name="rightthumbstickright" type="key" id="1073741918" value="1" />
 		<input name="rightthumbstickup" type="key" id="1073741920" value="1" />
 		<input name="righttrigger" type="key" id="114" value="1" />
-		<input name="start" type="key" id="1073742053" value="1" />
+		<input name="start" type="key" id="13" value="1" />
 		<input name="up" type="key" id="1073741906" value="1" />
 		<input name="x" type="key" id="97" value="1" />
 		<input name="y" type="key" id="115" value="1" />
diff --git a/res/splash.svg b/res/splash.svg
new file mode 100755
index 00000000..f08a7ff3
--- /dev/null
+++ b/res/splash.svg
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="792.61493"
+   height="495.38437"
+   viewBox="0 0 209.7127 131.07045"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="splash.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.50268269"
+     inkscape:cx="-233.74586"
+     inkscape:cy="329.23354"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer2"
+     units="px"
+     width="1920px"
+     height="1122.5196px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs2">
+    <rect
+       x="22.877255"
+       y="497.33163"
+       width="668.41371"
+       height="146.2155"
+       id="rect89677" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient78351">
+      <stop
+         style="stop-color:#946beb;stop-opacity:1"
+         offset="0"
+         id="stop78347" />
+      <stop
+         style="stop-color:#1a9fff;stop-opacity:1"
+         offset="1"
+         id="stop78349" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient78351"
+       id="linearGradient78353"
+       x1="10.00051"
+       y1="46.318153"
+       x2="196.06264"
+       y2="47.107666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient78351"
+       id="linearGradient104819"
+       x1="26.855909"
+       y1="512.25159"
+       x2="441.63049"
+       y2="514.24091"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient78351"
+       id="linearGradient86391"
+       x1="60.585548"
+       y1="249.27652"
+       x2="369.62967"
+       y2="548.81158"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Livello 2"
+     style="display:inline">
+    <g
+       aria-label="RETRO
+"
+       id="text2352"
+       style="font-size:9.525px;line-height:1.25;fill:url(#linearGradient78353);stroke-width:0.264583">
+      <path
+         d="m 13.27873,33.995418 h 23.783924 q 1.343025,0 2.447925,0.32385 1.114425,0.32385 2.00025,0.885825 0.89535,0.561975 1.552575,1.3335 0.66675,0.771525 1.1049,1.6764 0.43815,0.89535 0.657225,1.88595 0.219075,0.981075 0.20955,1.981199 0,1.019175 -0.219075,2.0193 -0.219075,1.000125 -0.657225,1.905 -0.43815,0.89535 -1.1049,1.65735 -0.657225,0.762 -1.54305,1.323975 -0.885825,0.55245 -2.00025,0.866775 -1.1049,0.314325 -2.447925,0.314325 h -0.104775 l 8.5725,10.49655 H 38.624754 L 30.052255,50.168867 H 15.79333 v 10.49655 h -5.562599 l -0.0095,-23.612474 q 0,-0.6858 0.219075,-1.247775 0.219075,-0.561975 0.619125,-0.962025 0.409575,-0.409575 0.971549,-0.62865 0.561975,-0.219075 1.247775,-0.219075 z m 23.679149,11.077574 q 0.619125,0 1.08585,-0.257175 0.466725,-0.257175 0.78105,-0.676275 0.314325,-0.4191 0.466725,-0.9525 0.161925,-0.542925 0.161925,-1.1049 0.0095,-0.561975 -0.142875,-1.095374 -0.1524,-0.542925 -0.466725,-0.962025 -0.3048,-0.4191 -0.78105,-0.676275 -0.466725,-0.257175 -1.1049,-0.257175 H 15.79333 v 5.981699 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS;letter-spacing:0.264583px"
+         id="path110710" />
+      <path
+         d="M 48.709617,57.607892 V 37.052943 q 0,-0.6858 0.219074,-1.247775 0.219075,-0.561975 0.619125,-0.962025 0.409575,-0.409575 0.97155,-0.62865 0.561975,-0.219075 1.247775,-0.219075 H 82.83769 v 5.095875 H 54.281741 v 5.400674 H 79.37059 v 5.095875 H 54.281741 v 5.9817 H 82.83769 v 5.095875 H 51.767141 q -0.6858,0 -1.247775,-0.219075 -0.561975,-0.219075 -0.97155,-0.619125 -0.40005,-0.409575 -0.619125,-0.97155 -0.219074,-0.561975 -0.219074,-1.247775 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS;letter-spacing:0.264583px"
+         id="path110712" />
+      <path
+         d="m 86.188378,39.091293 v -5.095875 h 34.137602 v 5.095875 H 106.048 v 21.574124 h -5.57212 V 39.091293 Z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS;letter-spacing:0.264583px"
+         id="path110714" />
+      <path
+         d="m 127.41045,33.995418 h 23.78393 q 1.34302,0 2.44792,0.32385 1.11443,0.32385 2.00025,0.885825 0.89535,0.561975 1.55258,1.3335 0.66675,0.771525 1.1049,1.6764 0.43815,0.89535 0.65722,1.88595 0.21908,0.981075 0.20955,1.981199 0,1.019175 -0.21907,2.0193 -0.21908,1.000125 -0.65723,1.905 -0.43815,0.89535 -1.1049,1.65735 -0.65722,0.762 -1.54305,1.323975 -0.88582,0.55245 -2.00025,0.866775 -1.1049,0.314325 -2.44792,0.314325 h -0.10478 l 8.5725,10.49655 h -6.90562 l -8.5725,-10.49655 h -14.25893 v 10.49655 h -5.5626 l -0.01,-23.612474 q 0,-0.6858 0.21907,-1.247775 0.21908,-0.561975 0.61913,-0.962025 0.40957,-0.409575 0.97155,-0.62865 0.56197,-0.219075 1.24777,-0.219075 z m 23.67915,11.077574 q 0.61913,0 1.08585,-0.257175 0.46673,-0.257175 0.78105,-0.676275 0.31433,-0.4191 0.46673,-0.9525 0.16192,-0.542925 0.16192,-1.1049 0.01,-0.561975 -0.14287,-1.095374 -0.1524,-0.542925 -0.46673,-0.962025 -0.3048,-0.4191 -0.78105,-0.676275 -0.46672,-0.257175 -1.1049,-0.257175 h -21.16455 v 5.981699 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS;letter-spacing:0.264583px"
+         id="path110716" />
+      <path
+         d="m 165.47024,58.036517 q -1.24778,-1.209675 -1.9431,-2.7813 -0.6858,-1.58115 -0.6858,-3.40995 v -9.0297 q 0,-1.828799 0.67627,-3.371849 0.67628,-1.54305 1.95263,-2.8194 1.27635,-1.27635 2.8194,-1.952625 1.55257,-0.676275 3.37185,-0.676275 h 16.4973 q 1.81927,0 3.36232,0.676275 1.55258,0.676275 2.82893,1.952625 1.27635,1.27635 1.95262,2.8194 0.67628,1.54305 0.67628,3.371849 v 9.0297 q 0,1.8288 -0.69533,3.40995 -0.6858,1.571625 -1.93357,2.7813 -0.60008,0.581025 -1.30493,1.0668 -0.70485,0.485775 -1.49542,0.8382 -0.78105,0.3429 -1.6383,0.5334 -0.84773,0.1905 -1.7526,0.1905 h -16.4973 q -0.90488,0 -1.76213,-0.1905 -0.84772,-0.1905 -1.6383,-0.5334 -0.78105,-0.352425 -1.4859,-0.8382 -0.70485,-0.485775 -1.30492,-1.0668 z m 2.9337,-5.724525 q 0,0.62865 0.27622,1.2192 0.27623,0.581025 0.7239,1.038225 0.4572,0.447675 1.03823,0.7239 0.59055,0.276225 1.2192,0.276225 h 16.4973 q 0.62865,0 1.20967,-0.276225 0.59055,-0.276225 1.03823,-0.7239 0.4572,-0.4572 0.73342,-1.038225 0.27623,-0.59055 0.27623,-1.2192 v -9.96315 q 0,-0.676275 -0.25718,-1.266824 -0.24765,-0.600075 -0.69532,-1.038225 -0.43815,-0.447675 -1.03823,-0.695325 -0.59055,-0.257175 -1.26682,-0.257175 h -16.4973 q -0.67628,0 -1.27635,0.257175 -0.59055,0.24765 -1.03823,0.695325 -0.43815,0.43815 -0.69532,1.038225 -0.24765,0.590549 -0.24765,1.266824 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS;letter-spacing:0.264583px"
+         id="path110718" />
+    </g>
+    <g
+       aria-label="ECK"
+       id="text17644"
+       style="font-size:9.525px;line-height:1.25;letter-spacing:0.79375px;fill:#ffffff;stroke-width:0.264583">
+      <path
+         d="M 48.818965,87.645493 V 67.090544 q 0,-0.6858 0.219075,-1.247775 0.219075,-0.561975 0.619125,-0.962025 0.409575,-0.409575 0.97155,-0.62865 0.561975,-0.219075 1.247775,-0.219075 h 31.070548 v 5.095875 H 54.39109 v 5.400675 h 25.088849 v 5.095875 H 54.39109 v 5.981699 h 28.555948 v 5.095875 H 51.87649 q -0.6858,0 -1.247775,-0.219075 -0.561975,-0.219075 -0.97155,-0.619125 -0.40005,-0.409575 -0.619125,-0.97155 -0.219075,-0.561975 -0.219075,-1.247775 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS"
+         id="path110739" />
+      <path
+         d="m 90.132069,66.661919 q 1.27635,-1.27635 2.8194,-1.952625 1.552575,-0.676275 3.37185,-0.676275 h 25.412701 v 5.095875 H 96.323319 q -0.676275,0 -1.27635,0.257175 -0.59055,0.24765 -1.038225,0.695325 -0.43815,0.43815 -0.695325,1.038225 -0.24765,0.59055 -0.24765,1.266825 v 9.96315 q 0,0.628649 0.276225,1.219199 0.276225,0.581025 0.7239,1.038225 0.4572,0.447675 1.038225,0.7239 0.59055,0.276225 1.2192,0.276225 h 25.412701 v 5.095875 H 96.323319 q -0.904875,0 -1.762125,-0.1905 -0.847725,-0.1905 -1.6383,-0.5334 -0.78105,-0.352425 -1.4859,-0.8382 -0.70485,-0.485775 -1.304925,-1.0668 -1.247775,-1.209675 -1.9431,-2.7813 -0.6858,-1.58115 -0.6858,-3.409949 v -9.0297 q 0,-1.8288 0.676275,-3.37185 0.676275,-1.54305 1.952625,-2.8194 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS"
+         id="path110741" />
+      <path
+         d="m 126.29215,64.033019 h 5.5626 v 14.4399 l 19.0881,-14.449425 h 8.31532 l -11.56335,8.753475 12.74445,17.935574 -6.84847,-0.01905 -10.3251,-14.554199 -11.41095,8.648699 v 5.915025 h -5.5626 z"
+         style="font-family:DREAMS;-inkscape-font-specification:DREAMS"
+         id="path110743" />
+    </g>
+    <g
+       id="g38619"
+       transform="matrix(0.82704001,0,0,0.82704001,-148.41704,-223.88161)">
+      <g
+         id="g38832"
+         transform="matrix(0.06692755,0,0,0.06692755,191.3323,337.17343)"
+         style="display:inline;fill:#ffffff">
+        <path
+           d="M 200.25,600.27 C 89.51,600.27 0,510.89 0,400.32 0,289.75 89.51,200.37 200.25,200.37 c 110.74,0 200.26,89.38 200.26,199.95 0,110.57 -89.52,199.95 -200.26,199.95 z"
+           fill="url(#a)"
+           id="path38820"
+           style="fill:url(#linearGradient86391);fill-opacity:1" />
+        <path
+           d="M 456.98,399.89 C 456.98,258.32 342.03,143.55 200.24,143.55 V 0 c 221.2,0 400.51,179.04 400.51,399.89 0,220.86 -179.31,399.9 -400.51,399.9 V 656.24 c 141.79,0 256.74,-114.77 256.74,-256.35 z"
+           fill="#1b1b1b"
+           id="path38822"
+           style="fill:#ffffff" />
+      </g>
+    </g>
+    <g
+       aria-label="Powered by EmulationStation-DE"
+       transform="matrix(0.26458333,0,0,0.26458333,42.370582,-40.265212)"
+       id="text89675"
+       style="font-size:24px;line-height:1.25;white-space:pre;shape-inside:url(#rect89677);fill:url(#linearGradient104819)">
+      <path
+         d="m 28.841797,515.39062 v 6.01172 h -3.867188 v -17.66015 h 6.679688 q 3.433594,0 5.214844,1.40625 1.78125,1.39453 1.78125,4.08984 0,2.8125 -1.96875,4.48828 -1.96875,1.66406 -5.132813,1.66406 z m -0.02344,-8.87109 v 6.07031 h 1.03125 q 2.90625,0 3.84375,-0.79687 0.949219,-0.8086 0.949219,-2.47266 0,-1.37109 -0.914062,-2.08594 -0.902344,-0.71484 -3.585938,-0.71484 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110764" />
+      <path
+         d="m 46.572266,521.82422 q -3.304688,0 -5.132813,-1.89844 -1.828125,-1.91016 -1.828125,-5.29687 0,-3.39844 1.839844,-5.3086 1.851562,-1.91015 5.121094,-1.91015 3.292968,0 5.121093,1.91015 1.839844,1.91016 1.839844,5.3086 0,3.38671 -1.839844,5.29687 -1.828125,1.89844 -5.121093,1.89844 z m 0,-11.90625 q -3.199219,0 -3.199219,4.74609 0,4.65235 3.246094,4.65235 3.152343,0 3.152343,-4.65235 0,-4.74609 -3.199218,-4.74609 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110766" />
+      <path
+         d="m 75.505859,507.83203 -4.125,13.57031 h -3.140625 l -3.128906,-9.6914 -3.128906,9.6914 h -3.164063 l -4.125,-13.57031 h 3.773438 l 2.34375,8.92969 2.847656,-8.92969 h 3.152344 l 2.777344,8.90625 2.285156,-8.90625 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110768" />
+      <path
+         d="m 89.919922,515.17969 h -9.621094 q 0.234375,4.07812 4.628906,4.07812 2.296875,0 4.617188,-1.66406 h 0.128906 v 3.11719 q -2.753906,1.05468 -5.179687,1.05468 -3.820313,0 -5.824219,-1.8164 -2.003906,-1.81641 -2.003906,-5.23828 0,-3.39844 1.898437,-5.34375 1.898438,-1.95703 5.238281,-1.95703 6.117188,0 6.117188,6.5039 z m -3.597656,-2.03907 q -0.04687,-3.5039 -2.847657,-3.5039 -2.976562,0 -3.175781,3.5039 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110770" />
+      <path
+         d="m 101.75586,511.5 h -0.11719 q -0.72656,-0.1875 -1.945311,-0.1875 -1.910156,0 -3.515625,0.60937 v 9.48047 h -3.597656 v -13.57031 h 3.597656 v 2.46094 q 1.652344,-1.48828 2.71875,-1.99219 1.066407,-0.51562 2.097656,-0.51562 0.26953,0 0.76172,0.0234 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110772" />
+      <path
+         d="m 116.07617,515.17969 h -9.62109 q 0.23437,4.07812 4.6289,4.07812 2.29688,0 4.61719,-1.66406 h 0.12891 v 3.11719 q -2.75391,1.05468 -5.17969,1.05468 -3.82031,0 -5.82422,-1.8164 -2.0039,-1.81641 -2.0039,-5.23828 0,-3.39844 1.89843,-5.34375 1.89844,-1.95703 5.23828,-1.95703 6.11719,0 6.11719,6.5039 z m -3.59765,-2.03907 q -0.0469,-3.5039 -2.84766,-3.5039 -2.97656,0 -3.17578,3.5039 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110774" />
+      <path
+         d="m 130.98242,521.40234 h -3.59765 v -1.78125 q -1.75782,1.42969 -2.64844,1.79297 -0.89063,0.36328 -1.91016,0.36328 -2.33203,0 -3.71484,-1.88672 -1.38281,-1.89843 -1.38281,-5.15625 0,-3.23437 1.67578,-5.25 1.67578,-2.02734 4.16015,-2.02734 0.89063,0 1.62891,0.19922 0.73828,0.19922 2.19141,0.96094 v -5.66016 h 3.59765 z m -3.59765,-3.48047 v -7.34765 q -1.17188,-0.50391 -2.17969,-0.50391 -3.75,0 -3.75,4.57031 0,2.3086 0.77344,3.33985 Q 123.00195,519 124.6543,519 q 1.24218,0 2.73047,-1.07813 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110776" />
+      <path
+         d="m 146.28711,520.44141 -0.23438,0.96093 h -3.375 v -18.44531 h 3.59766 v 6.69141 q 1.57031,-1.32422 2.55469,-1.75782 0.99609,-0.43359 2.09765,-0.43359 2.39063,0 3.69141,1.83984 1.3125,1.83985 1.3125,5.16797 0,3.25782 -1.66406,5.28516 -1.66406,2.02734 -4.14844,2.02734 -1.78125,0 -3.83203,-1.33593 z m -0.0117,-9.2461 v 7.52344 q 1.19531,0.44531 2.19141,0.44531 3.73828,0 3.73828,-4.60547 0,-4.32422 -3.12891,-4.32422 -1.27734,0 -2.80078,0.96094 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110778" />
+      <path
+         d="m 171.29492,507.83203 -7.4414,18.45703 h -3.79688 l 2.0625,-4.86328 -5.30859,-13.59375 h 3.90234 l 3.42188,9.69141 3.45703,-9.69141 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110780" />
+      <path
+         d="m 193.73633,521.40234 h -12.30469 v -17.66015 h 12.30469 v 2.92968 h -8.46094 v 3.77344 h 7.86328 v 2.91797 h -7.86328 v 5.10938 h 8.46094 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110782" />
+      <path
+         d="m 217.88867,521.40234 h -3.62109 v -6.80859 q 0,-1.35938 -0.12891,-2.37891 -0.11719,-1.03125 -0.71484,-1.40625 -0.58594,-0.375 -1.62891,-0.375 -0.92578,0 -2.61328,1.03125 v 9.9375 h -3.62109 v -6.80859 q 0,-1.42969 -0.14063,-2.41406 -0.14062,-0.9961 -0.73828,-1.3711 -0.58594,-0.375 -1.60547,-0.375 -0.97265,0 -2.60156,1.04297 v 9.92578 h -3.59766 v -13.57031 h 3.59766 v 1.89844 q 1.78125,-1.46485 2.69531,-1.86328 0.92578,-0.41016 1.91016,-0.41016 2.55469,0 3.77344,2.60156 1.72265,-1.5 2.8125,-2.05078 1.08984,-0.55078 2.13281,-0.55078 4.08984,0 4.08984,5.02734 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110784" />
+      <path
+         d="m 234.10742,521.40234 h -3.59765 v -1.89843 q -1.64063,1.33593 -2.67188,1.80468 -1.03125,0.46875 -2.14453,0.46875 -4.28906,0 -4.28906,-5.02734 v -8.91797 h 3.62109 v 6.76172 q 0,2.83594 0.62109,3.52734 0.6211,0.69141 2.02735,0.69141 1.20703,0 2.83594,-1.05469 v -9.92578 h 3.59765 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110786" />
+      <path
+         d="m 241.43164,521.40234 h -3.59766 v -18.44531 h 3.59766 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110788" />
+      <path
+         d="m 256.66602,521.40234 h -3.57422 v -1.76953 q -1.65235,1.41797 -2.6836,1.76953 -1.01953,0.36328 -2.17968,0.36328 -1.78125,0 -2.95313,-1.14843 -1.17187,-1.16016 -1.17187,-2.97657 0,-2.29687 1.72265,-3.48046 1.73438,-1.1836 7.30078,-1.47657 v -0.36328 q 0,-1.27734 -0.8789,-1.85156 -0.87891,-0.57422 -2.90625,-0.57422 -1.38282,0 -3.96094,1.05469 h -0.12891 v -2.84766 q 2.71875,-0.65625 4.92188,-0.65625 3.43359,0 4.95703,1.11328 1.53516,1.10157 1.53516,3.51563 z m -3.57422,-3.30468 v -3.42188 q -3.53907,0.29297 -4.42969,0.91406 -0.89063,0.60938 -0.89063,1.69922 0,1.16016 0.6211,1.61719 0.62109,0.45703 1.94531,0.45703 1.39453,0 2.75391,-1.26562 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110790" />
+      <path
+         d="m 268.2793,521.32031 q -1.44141,0.35156 -3.08203,0.35156 -2.42579,0 -3.55079,-1.03125 -1.125,-1.04296 -1.125,-3.36328 v -7.0664 h -1.78125 v -2.37891 h 1.79297 v -3.80859 h 3.58594 v 3.80859 h 4.16016 v 2.37891 h -4.16016 v 5.58984 q 0,2.15625 0.55078,2.8125 0.55078,0.65625 1.85156,0.65625 0.83204,0 1.65235,-0.41016 h 0.10547 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110792" />
+      <path
+         d="m 274.2207,506.13281 h -3.85547 v -3.17578 h 3.85547 z m -0.1289,15.26953 h -3.59766 v -13.57031 h 3.59766 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110794" />
+      <path
+         d="m 283.74805,521.82422 q -3.30469,0 -5.13282,-1.89844 -1.82812,-1.91016 -1.82812,-5.29687 0,-3.39844 1.83984,-5.3086 1.85157,-1.91015 5.1211,-1.91015 3.29297,0 5.12109,1.91015 1.83984,1.91016 1.83984,5.3086 0,3.38671 -1.83984,5.29687 -1.82812,1.89844 -5.12109,1.89844 z m 0,-11.90625 q -3.19922,0 -3.19922,4.74609 0,4.65235 3.24609,4.65235 3.15235,0 3.15235,-4.65235 0,-4.74609 -3.19922,-4.74609 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110796" />
+      <path
+         d="m 306.10742,521.40234 h -3.62109 v -6.76172 q 0,-2.83593 -0.63281,-3.51562 -0.6211,-0.69141 -2.02735,-0.69141 -1.17187,0 -2.82422,1.04297 v 9.92578 h -3.59765 v -13.57031 h 3.59765 v 1.89844 q 1.6875,-1.38281 2.69532,-1.82813 1.01953,-0.44531 2.12109,-0.44531 4.28906,0 4.28906,5.02734 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110798" />
+      <path
+         d="m 308.97852,520.34766 v -3.73829 h 0.39843 q 1.3125,1.07813 3.01172,1.71094 1.71094,0.63281 3.28125,0.63281 1.62891,0 2.625,-0.58593 0.9961,-0.58594 0.9961,-1.62891 0,-0.80859 -0.48047,-1.28906 -0.46875,-0.48047 -1.79297,-0.79688 -0.94922,-0.17578 -3.2461,-0.6914 -2.28515,-0.51563 -3.49218,-1.80469 -1.19532,-1.30078 -1.19532,-3.31641 0,-2.40234 2.05079,-3.90234 2.05078,-1.51172 5.27343,-1.51172 3.28125,0 6.16407,1.19531 v 3.57422 h -0.38672 q -2.46094,-1.99219 -5.64844,-1.99219 -1.51172,0 -2.49609,0.5625 -0.97266,0.5625 -0.97266,1.53516 0,0.83203 0.55078,1.32422 0.5625,0.49219 1.91016,0.80859 1.34765,0.2461 3,0.65625 1.66406,0.39844 2.47265,0.90235 0.82032,0.5039 1.30078,1.10156 0.49219,0.58594 0.72657,1.3125 0.24609,0.72656 0.24609,1.60547 0,2.57812 -2.10937,4.14844 -2.09766,1.57031 -5.56641,1.57031 -3.375,0 -6.62109,-1.38281 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110800" />
+      <path
+         d="m 333.91602,521.32031 q -1.44141,0.35156 -3.08204,0.35156 -2.42578,0 -3.55078,-1.03125 -1.125,-1.04296 -1.125,-3.36328 v -7.0664 h -1.78125 v -2.37891 h 1.79297 v -3.80859 h 3.58594 v 3.80859 h 4.16016 v 2.37891 h -4.16016 v 5.58984 q 0,2.15625 0.55078,2.8125 0.55078,0.65625 1.85156,0.65625 0.83203,0 1.65235,-0.41016 h 0.10547 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110802" />
+      <path
+         d="m 347.63867,521.40234 h -3.57422 v -1.76953 q -1.65234,1.41797 -2.68359,1.76953 -1.01953,0.36328 -2.17969,0.36328 -1.78125,0 -2.95312,-1.14843 -1.17188,-1.16016 -1.17188,-2.97657 0,-2.29687 1.72266,-3.48046 1.73437,-1.1836 7.30078,-1.47657 v -0.36328 q 0,-1.27734 -0.87891,-1.85156 -0.8789,-0.57422 -2.90625,-0.57422 -1.38281,0 -3.96093,1.05469 h -0.12891 v -2.84766 q 2.71875,-0.65625 4.92187,-0.65625 3.4336,0 4.95704,1.11328 1.53515,1.10157 1.53515,3.51563 z m -3.57422,-3.30468 v -3.42188 q -3.53906,0.29297 -4.42968,0.91406 -0.89063,0.60938 -0.89063,1.69922 0,1.16016 0.62109,1.61719 0.6211,0.45703 1.94532,0.45703 1.39453,0 2.7539,-1.26562 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110804" />
+      <path
+         d="m 359.25195,521.32031 q -1.4414,0.35156 -3.08203,0.35156 -2.42578,0 -3.55078,-1.03125 -1.125,-1.04296 -1.125,-3.36328 v -7.0664 h -1.78125 v -2.37891 h 1.79297 v -3.80859 h 3.58594 v 3.80859 h 4.16015 v 2.37891 h -4.16015 v 5.58984 q 0,2.15625 0.55078,2.8125 0.55078,0.65625 1.85156,0.65625 0.83203,0 1.65234,-0.41016 h 0.10547 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110806" />
+      <path
+         d="m 365.19336,506.13281 h -3.85547 v -3.17578 h 3.85547 z m -0.12891,15.26953 h -3.59765 v -13.57031 h 3.59765 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110808" />
+      <path
+         d="m 374.7207,521.82422 q -3.30468,0 -5.13281,-1.89844 -1.82812,-1.91016 -1.82812,-5.29687 0,-3.39844 1.83984,-5.3086 1.85156,-1.91015 5.12109,-1.91015 3.29297,0 5.1211,1.91015 1.83984,1.91016 1.83984,5.3086 0,3.38671 -1.83984,5.29687 -1.82813,1.89844 -5.1211,1.89844 z m 0,-11.90625 q -3.19922,0 -3.19922,4.74609 0,4.65235 3.2461,4.65235 3.15234,0 3.15234,-4.65235 0,-4.74609 -3.19922,-4.74609 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110810" />
+      <path
+         d="m 397.08008,521.40234 h -3.6211 v -6.76172 q 0,-2.83593 -0.63281,-3.51562 -0.62109,-0.69141 -2.02734,-0.69141 -1.17188,0 -2.82422,1.04297 v 9.92578 h -3.59766 v -13.57031 h 3.59766 v 1.89844 q 1.6875,-1.38281 2.69531,-1.82813 1.01953,-0.44531 2.1211,-0.44531 4.28906,0 4.28906,5.02734 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110812" />
+      <path
+         d="m 408.7168,515.09766 h -8.53125 v -3.02344 h 8.53125 z"
+         style="font-weight:bold;font-family:Meiryo;-inkscape-font-specification:'Meiryo Bold'"
+         id="path110814" />
+      <path
+         d="m 412.16211,521.40234 v -17.66015 h 5.51953 q 3.75,0 5.84766,0.96093 2.09765,0.96094 3.30468,2.95313 1.21875,1.99219 1.21875,4.93359 0,2.66016 -1.26562,4.78125 -1.25391,2.10938 -3.36328,3.07032 -2.10938,0.96093 -5.69531,0.96093 z m 3.86719,-14.88281 V 518.625 h 1.89843 q 6.08204,0 6.08204,-6.07031 0,-6.03516 -6.08204,-6.03516 z"
+         style="fill:#ffffff"
+         id="path110816" />
+      <path
+         d="m 443.42773,521.40234 h -12.30468 v -17.66015 h 12.30468 v 2.92968 h -8.46093 v 3.77344 h 7.86328 v 2.91797 h -7.86328 v 5.10938 h 8.46093 z"
+         style="fill:#ffffff"
+         id="path110818" />
+    </g>
+  </g>
+</svg>
diff --git a/retrodeck-retroarch.cfg b/retrodeck-retroarch.cfg
index 666dfccf..b533d7ec 100644
--- a/retrodeck-retroarch.cfg
+++ b/retrodeck-retroarch.cfg
@@ -1356,7 +1356,7 @@ input_player1_a = "x"
 input_player1_a_axis = "nul"
 input_player1_a_btn = "nul"
 input_player1_a_mbtn = "nul"
-input_player1_analog_dpad_mode = "0"
+input_player1_analog_dpad_mode = "1"
 input_player1_b = "z"
 input_player1_b_axis = "nul"
 input_player1_b_btn = "nul"
diff --git a/retrodeck.sh b/retrodeck.sh
index 980df628..33a6fc4d 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -3,15 +3,12 @@
 # if we got the .lock file it means that it's not a first run
 if [ ! -f ~/retrodeck/.lock ]
 then
-    #mkdir -p /tmp/retrodeck_logs/
-    #ln -s /tmp/retrodeck_logs/ ~/retrodeck/logs/
-    #touch ~/retrodeck/logs/retrodeck.log
-    #echo "RetroDECK: .lock file not found, initializing."
     mkdir -p ~/retrodeck/.emulationstation
     mkdir -p ~/retrodeck/saves
     mkdir -p ~/retrodeck/states
     mkdir -p ~/retrodeck/screenshots
-    mkdir -p /var/config/retroarch/
+    mkdir -p /var/config/retroarch/system
+    ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system/ ~/retrodeck/bios
     rm -rf ~/retrodeck/.emulationstation/es_settings.xml
     rm -rf ~/retrodeck/.emulationstation/es_input.xml
     cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_settings.xml