diff --git a/FunKey/package/clock/clock.mk b/FunKey/package/clock/clock.mk
index d7acf23..58df6bb 100644
--- a/FunKey/package/clock/clock.mk
+++ b/FunKey/package/clock/clock.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLOCK_VERSION = v1.0-funkey-s
+CLOCK_VERSION = HEAD
 CLOCK_SITE_METHOD = git
 CLOCK_SITE = https://github.com/DrUm78/clock_sdl_app.git
 CLOCK_LICENSE = GPL-2.1+
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
index b625705..89940a2 100644
--- a/FunKey/package/commander/commander.mk
+++ b/FunKey/package/commander/commander.mk
@@ -3,7 +3,7 @@
 # commander
 #
 #############################################################
-COMMANDER_VERSION = commander-FunKey-1.1.2
+COMMANDER_VERSION = HEAD
 COMMANDER_SITE_METHOD = git
 COMMANDER_SITE = https://github.com/DrUm78/commander.git
 COMMANDER_LICENSE = GPL-2.0
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
index 1a5649d..5ae0c66 100644
--- a/FunKey/package/gmenu2x/gmenu2x.mk
+++ b/FunKey/package/gmenu2x/gmenu2x.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMENU2X_VERSION = v1.0.5-funkey-s
+GMENU2X_VERSION = HEAD
 GMENU2X_SITE_METHOD = git
 GMENU2X_SITE = https://github.com/DrUm78/gmenu2x.git
 GMENU2X_LICENSE = GPL-2.0
diff --git a/FunKey/package/picoarch/picoarch.mk b/FunKey/package/picoarch/picoarch.mk
index 016dd55..10e07a2 100644
--- a/FunKey/package/picoarch/picoarch.mk
+++ b/FunKey/package/picoarch/picoarch.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PICOARCH_VERSION = v1.0-funkey-s
+PICOARCH_VERSION = HEAD
 PICOARCH_SITE_METHOD = git
-PICOARCH_SITE = https://github.com/DrUm78/picoarch.git
-PICOARCH_LICENSE = MAME
+PICOARCH_SITE = https://git.crowdedwood.com/picoarch
+PICOARCH_LICENSE = GPL-2+, LGPL-2.1+, MAME
 PICOARCH_LICENSE_FILES = LICENSE
 
 PICOARCH_DEPENDENCIES = sdl sdl_image sdl_ttf
diff --git a/FunKey/package/st-sdl/st-sdl.mk b/FunKey/package/st-sdl/st-sdl.mk
index 151071a..0ac23ed 100644
--- a/FunKey/package/st-sdl/st-sdl.mk
+++ b/FunKey/package/st-sdl/st-sdl.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ST_SDL_VERSION = v1.0-funkey-s
+ST_SDL_VERSION = HEAD
 ST_SDL_SITE_METHOD = git
 ST_SDL_SITE = https://github.com/DrUm78/st-sdl.git
-ST_SDL_LICENSE = GPL-2.1+
+ST_SDL_LICENSE = MIT/X11
 ST_SDL_LICENSE_FILES = LICENSE
 
 ST_SDL_DEPENDENCIES = sdl