diff --git a/packages/games/emulators/PPSSPPSDL/sources/handheld/controls.ini b/packages/games/emulators/PPSSPPSDL/sources/handheld/controls.ini
index e550ff3aa..1b1a27425 100644
--- a/packages/games/emulators/PPSSPPSDL/sources/handheld/controls.ini
+++ b/packages/games/emulators/PPSSPPSDL/sources/handheld/controls.ini
@@ -19,5 +19,5 @@ Analog limiter = 1-60
RapidFire = 1-59
Fast-forward = 1-61
SpeedToggle = 1-68
-Pause = 1-111,10-106,10-107
+Pause = 1-111,10-107
Rewind = 1-67
diff --git a/packages/jelos/sources/asound/handheld/asound.conf b/packages/jelos/config/asound.conf
similarity index 83%
rename from packages/jelos/sources/asound/handheld/asound.conf
rename to packages/jelos/config/asound.conf
index 6078b59e1..6422d2a57 100644
--- a/packages/jelos/sources/asound/handheld/asound.conf
+++ b/packages/jelos/config/asound.conf
@@ -10,8 +10,8 @@ pcm.dmixer {
pcm "hw:0,0"
period_time 0
period_size 1024
- buffer_size 4096
- rate 44100
+ buffer_size 8192
+ rate 176400
}
bindings {
0 0
diff --git a/packages/jelos/sources/asound/asound.conf.bluealsa b/packages/jelos/config/asound.conf.bluealsa
similarity index 100%
rename from packages/jelos/sources/asound/asound.conf.bluealsa
rename to packages/jelos/config/asound.conf.bluealsa
diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk
index f98635e61..e72a7388e 100644
--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@@ -136,13 +136,6 @@ EOF
### Fix and migrate to autostart package
enable_service jelos-autostart.service
- if [ -d "${PKG_DIR}/sources/asound/${DEVICE}" ]
- then
- cp ${PKG_DIR}/sources/asound/${DEVICE}/* ${INSTALL}/usr/config/
- fi
-
- cp ${PKG_DIR}/sources/asound/asound.conf.bluealsa ${INSTALL}/usr/config/
-
sed -i "s#@DEVICENAME@#${DEVICE}#g" ${INSTALL}/usr/config/system/configs/system.cfg
if [[ "${DEVICE}" =~ handheld ]]
diff --git a/packages/jelos/sources/scripts/jelos-info b/packages/jelos/sources/scripts/jelos-info
index b1e4e2bd3..71596bf17 100755
--- a/packages/jelos/sources/scripts/jelos-info
+++ b/packages/jelos/sources/scripts/jelos-info
@@ -102,7 +102,7 @@ then
fi
if [ "${DEVICE_HAS_FAN}" = "true" ]
then
- FANSPEED=$(cat ${DEVICE_PWM_FAN})
+ FANSPEED=$(cat ${DEVICE_PWM_FAN} 2>/dev/null)
if [ "${FANSPEED}" = "0" ]
then
FANSPEED="OFF"
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 21bfe0599..7a3edb4a0 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -193,7 +193,7 @@ post_makeinstall_target() {
sed -e "s,^.*SystemMaxUse=.*$,SystemMaxUse=10M,g" -i ${INSTALL}/etc/systemd/journald.conf
# tune logind.conf
- sed -e "s,^.*HandleLidSwitch=.*$,HandleLidSwitch=ignore,g" -i $INSTALL/etc/systemd/logind.conf
+ sed -e "s,^.*HandleLidSwitch=.*$,HandleLidSwitch=suspend,g" -i $INSTALL/etc/systemd/logind.conf
sed -e "s,^.*HandlePowerKey=.*$,HandlePowerKey=suspend,g" -i $INSTALL/etc/systemd/logind.conf
# replace systemd-machine-id-setup with ours
diff --git a/packages/ui/emulationstation/config/common/es_input.cfg b/packages/ui/emulationstation/config/common/es_input.cfg
index 25515db0e..9b6e00002 100644
--- a/packages/ui/emulationstation/config/common/es_input.cfg
+++ b/packages/ui/emulationstation/config/common/es_input.cfg
@@ -1,19 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1083,4 +1069,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/emulationstation/config/common/es_settings.cfg b/packages/ui/emulationstation/config/common/es_settings.cfg
index 9c1293a63..1a6424128 100644
--- a/packages/ui/emulationstation/config/common/es_settings.cfg
+++ b/packages/ui/emulationstation/config/common/es_settings.cfg
@@ -11,6 +11,7 @@
+