diff --git a/FunKey/Config.in b/FunKey/Config.in
index 73b49b4..2f702fc 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -19,3 +19,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/picoarch/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/clock/Config.in"
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/clock_funkey-s.opk b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/clock_funkey-s.opk
deleted file mode 100644
index bc9d952..0000000
Binary files a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/clock_funkey-s.opk and /dev/null differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/poweroff_funkey-s.opk b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/poweroff_funkey-s.opk
new file mode 100644
index 0000000..9b2b99e
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/poweroff_funkey-s.opk differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/reboot_funkey-s.opk b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/reboot_funkey-s.opk
new file mode 100644
index 0000000..bb16b8f
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/reboot_funkey-s.opk differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README
index 2bcc987..fc3313a 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README
@@ -1 +1 @@
-This is the folder where you can put all your roms and games for Libretro if you use RetroFE frontend (for GMenu2X users, you can put them wherever you want)
+This is the folder where you can put all your cores (.so files) for Libretro if you use RetroFE frontend (for GMenu2X users, you can put them wherever you want)
diff --git a/FunKey/package/clock/Config.in b/FunKey/package/clock/Config.in
new file mode 100644
index 0000000..89bca3a
--- /dev/null
+++ b/FunKey/package/clock/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_CLOCK
+	bool "clock"
+	default y
+	select BR2_PACKAGE_SDL
+	help
+	This is a simple app that sets the clock.
+
+
+	  https://github.com/gameblabla/clock_sdl_app
diff --git a/FunKey/package/clock/clock.mk b/FunKey/package/clock/clock.mk
new file mode 100644
index 0000000..d7acf23
--- /dev/null
+++ b/FunKey/package/clock/clock.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# clock sdl app
+#
+################################################################################
+
+CLOCK_VERSION = v1.0-funkey-s
+CLOCK_SITE_METHOD = git
+CLOCK_SITE = https://github.com/DrUm78/clock_sdl_app.git
+CLOCK_LICENSE = GPL-2.1+
+CLOCK_LICENSE_FILES = LICENSE
+
+CLOCK_DEPENDENCIES = sdl
+
+define CLOCK_BUILD_CMDS
+	(cd $(@D); \
+	sed -i -e 's|/opt/FunKey-sdk/usr/bin/arm-funkey-linux-musleabihf-gcc|../../host/usr/bin/arm-linux-gcc|g' Makefile.funkey; \
+	make -f Makefile.funkey \
+	)
+endef
+
+define CLOCK_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 $(@D)/clock $(TARGET_DIR)/usr/bin/
+endef
+
+define CLOCK_CREATE_OPK
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Settings
+	$(HOST_DIR)/usr/bin/mksquashfs $(CLOCK_PKGDIR)/opk $(TARGET_DIR)/usr/local/share/OPKs/Settings/clock_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+endef
+CLOCK_POST_INSTALL_TARGET_HOOKS += CLOCK_CREATE_OPK
+
+$(eval $(generic-package))
diff --git a/FunKey/package/clock/opk/clock.funkey-s.desktop b/FunKey/package/clock/opk/clock.funkey-s.desktop
new file mode 100644
index 0000000..65a3438
--- /dev/null
+++ b/FunKey/package/clock/opk/clock.funkey-s.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Clock
+Comment=Set time and date
+Exec=/usr/bin/clock
+Icon=clock
+Categories=settings
diff --git a/FunKey/package/clock/opk/clock.png b/FunKey/package/clock/opk/clock.png
new file mode 100644
index 0000000..cf0d4b4
Binary files /dev/null and b/FunKey/package/clock/opk/clock.png differ
diff --git a/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
index b5bb420..dae0ca5 100644
--- a/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
+++ b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
@@ -4,4 +4,5 @@ Comment=SDL Libretro frontend
 Exec=/usr/games/picoarch %f
 Icon=picoarch
 Categories=games
+SelectorDir=/mnt/Libretro/cores
 SelectorFilter=so