diff --git a/Makefile b/Makefile
index 60a698e..215c9fa 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ INC_LIBS         := $(call rwildcard, src, */0module.lib.mk)
 PATH_BIN         := bin
 PATH_SRC         := src
 BUILD_HELP       := "Use one of the following build targets;\\n\\t* clean"
-MB_OPENMSX_EXT   := -ext video9000
+MB_OPENMSX_EXTS  += -ext video9000
+MB_OPENMSX_JOYPORTA := mouse
 
 .PHONY: all
 all:
@@ -23,6 +24,6 @@ clean:
 	$(call mb_clean,$(PATH_BIN))
 
 -include Makelocal.mk
-include $(MB_PATH_MSXBUILD)/lib/make/msxbuild.mk
+include $(PATH_MSXBUILD)/lib/make/msxbuild.mk
 include $(INC_LIBS)
 include $(INC_MODS)
diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl
index 0da8c72..9c7ecb2 100644
--- a/Makelocal.mk.tpl
+++ b/Makelocal.mk.tpl
@@ -3,7 +3,8 @@
 #
 # Change to local installations if needed;
 
-#MB_PATH_SDCC       ?= /usr/bin
-#MB_PATH_HEX2BIN    ?= /usr/bin
-#MB_PATH_OPENMSX    ?= /opt/openMSX/bin/
-#MB_PATH_MSXBUILD	?= /opt/msxbuild
+#PATH_SDCC       ?= /usr/bin
+#PATH_HEX2BIN    ?= /usr/bin
+#PATH_OPENMSX    ?= /opt/openMSX/bin/
+#PATH_MSXBUILD	?= /opt/msxbuild
+#PATH_OMSXCTL    ?= ~/opt/omsxctl-1.0
diff --git a/readme.md b/README.md
similarity index 100%
rename from readme.md
rename to README.md
diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk
index 8e9ff6d..409f5ee 100644
--- a/src/dist-run/0module.mk
+++ b/src/dist-run/0module.mk
@@ -13,5 +13,5 @@ $(DIST_RUN_DEP): $(DIST_RUN_DEP_TAR) | $(DIST_RUN_BIN)
 	$(call mb_copy,$(PATH_BIN)/dist/*,$(DIST_RUN_BIN))
 
 $(DIST_RUN_NAME): $(DIST_RUN_DEP)
-	$(call mb_copy_autoexec_run,$(DIST_RUN_BIN),tara)
-	$(call mb_run_openmsx_dos2,$(DIST_RUN_BIN))
+	$(call mb_autoexec_open_gui_cmd,$(DIST_RUN_BIN),tara)
+	$(call mb_openmsx_dos2,$(DIST_RUN_BIN))