diff --git a/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb b/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb
deleted file mode 100644
index 91e446c9f1..0000000000
--- a/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb
+++ /dev/null
@@ -1,29 +0,0 @@
-evdev:input:b0003v2252p1069*
- KEYBOARD_KEY_7002e=volumeup
- KEYBOARD_KEY_7002d=volumedown
- KEYBOARD_KEY_7000c=kpleftparen
- KEYBOARD_KEY_70006=kprightparen
-
-evdev:input:b0003v2017p1690*
- KEYBOARD_KEY_7002e=volumeup
- KEYBOARD_KEY_7002d=volumedown
- KEYBOARD_KEY_7000c=kpleftparen
- KEYBOARD_KEY_70006=kprightparen
-
-evdev:input:b0003v2017p1689*
- KEYBOARD_KEY_7002e=volumeup
- KEYBOARD_KEY_7002d=volumedown
- KEYBOARD_KEY_7000c=kpleftparen
- KEYBOARD_KEY_70006=kprightparen
-
-evdev:input:b0003v2017p1688*
- KEYBOARD_KEY_7004a=esc
- KEYBOARD_KEY_c0060=kpleftparen
- KEYBOARD_KEY_10084=kprightparen
- KEYBOARD_KEY_7002e=volumeup
- KEYBOARD_KEY_7002d=volumedown
-
-evdev:input:b0003v2252p1037*
- KEYBOARD_KEY_7004a=esc
- KEYBOARD_KEY_c0060=kpleftparen
- KEYBOARD_KEY_10084=kprightparen
diff --git a/packages/sysutils/systemd/config/system.d/nfs.mount.sample b/packages/sysutils/systemd/config/system.d/nfs.mount.sample
index 20ad18b65f..475878109c 100644
--- a/packages/sysutils/systemd/config/system.d/nfs.mount.sample
+++ b/packages/sysutils/systemd/config/system.d/nfs.mount.sample
@@ -30,7 +30,7 @@ Where=/storage/movies2
 # Any options you usually use with the "-o" parameter in the mount command
 Options=
 
-# filesystem type
+# filesystem type (for NFSv4 use Type=nfs4)
 Type=nfs
 
 
@@ -47,4 +47,3 @@ WantedBy=multi-user.target
 # This means, if we want mount to "/storage/movies2" (see above "Where=/storage/movies2")
 # then this file must be renamed to 'storage-movies2.mount' and can be enabled via ssh with the
 # command 'systemctl enable storage-movies2.mount'
-
diff --git a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
index 2480cd5dd8..a857bda9b1 100644
--- a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
+++ b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
@@ -1,12 +1,99 @@
-# o2.cz bluetooth remote
-evdev:input:b0005v0217p0000e0110*
- KEYBOARD_KEY_c0041=enter		# OK button
+# alfawise z1 remote
+evdev:input:b0005v2B54p1603e*
+ KEYBOARD_KEY_c0041=enter
+
+# auvipal g9f
+evdev:input:b0005v045Ep0041*
+ KEYBOARD_KEY_c0041=enter
+ KEYBOARD_KEY_70071=l
+ KEYBOARD_KEY_70070=g
+ KEYBOARD_KEY_7006f=x
+ KEYBOARD_KEY_7006e=i
+
+# buzztv bt-300/bt-400 smart remote
+evdev:input:b0005v0957p1001*
+ KEYBOARD_KEY_c0041=enter
+ KEYBOARD_KEY_c0040=c
+ KEYBOARD_KEY_70040=z
+ KEYBOARD_KEY_70041=esc
+ KEYBOARD_KEY_70042=t
+ KEYBOARD_KEY_70043=e
+ KEYBOARD_KEY_70044=o
+ KEYBOARD_KEY_70045=volumeup
+ KEYBOARD_KEY_70069=volumedown
+
+# g7bts remote
+evdev:input:b0005v045Ep0041e0300*
+ KEYBOARD_KEY_c0041=enter
+
+# g20bts remote
+evdev:input:b0005v2B54p1600e0000*
+ KEYBOARD_KEY_c0041=enter
+
+# justboom smart remote
+evdev:input:b0003v2252p0120*
+ KEYBOARD_KEY_c0041=enter
+ KEYBOARD_KEY_c0040=c
+
+# nvidia shield remotes
+evdev:input:b0005v0955p7213*
+ KEYBOARD_KEY_c0041=enter
+
+evdev:input:b0005v0955p7217*
+ KEYBOARD_KEY_c0041=enter
+
+# o2.cz khamsin bluetooth remote
+evdev:input:b0005v0217p0000e0110*
+ KEYBOARD_KEY_c0041=enter
+ KEYBOARD_KEY_c0040=c
+
+# osmcrf25 remotes
+evdev:input:b0003v2252p1069*
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+ KEYBOARD_KEY_7000c=kpleftparen
+ KEYBOARD_KEY_70006=kprightparen
+
+evdev:input:b0003v2017p1690*
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+ KEYBOARD_KEY_7000c=kpleftparen
+ KEYBOARD_KEY_70006=kprightparen
 
-# osmcrf25 remote
 evdev:input:b0003v2017p1689*
- KEYBOARD_KEY_7002e=f10 # volume up
- KEYBOARD_KEY_7002d=f9 # volume down
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+ KEYBOARD_KEY_7000c=kpleftparen
+ KEYBOARD_KEY_70006=kprightparen
+
+evdev:input:b0003v2017p1688*
+ KEYBOARD_KEY_7004a=esc
+ KEYBOARD_KEY_c0060=kpleftparen
+ KEYBOARD_KEY_10084=kprightparen
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+
+evdev:input:b0003v2252p1037*
+ KEYBOARD_KEY_7004a=esc
+ KEYBOARD_KEY_c0060=kpleftparen
+ KEYBOARD_KEY_10084=kprightparen
+
+# ugoos ur01-ble remote
+evdev:input:b0005v005Dp0001*
+ KEYBOARD_KEY_c0041=enter
+
+# wechip g20 remote
+evdev:input:b0003v4842p0001*
+ KEYBOARD_KEY_c0041=enter
 
 # xaomi remote
 evdev:input:b0005v2717p32B9e4A4C*
  KEYBOARD_KEY_c0041=enter
+
+# yyykq remote
+evdev:input:b0005v0416p0300*
+ KEYBOARD_KEY_c0041=enter
+
+# zidoo v10
+evdev:input:b0005v2B54p1600*
+ KEYBOARD_KEY_c0041=enter