diff --git a/lib/make/mb_assert.mk b/lib/make/mb_assert.mk
index 9657706..c7e6b10 100644
--- a/lib/make/mb_assert.mk
+++ b/lib/make/mb_assert.mk
@@ -1,10 +1,9 @@
 
-
 define mb_assert_flow_grep_binary
 $(1)/@assert-$(2): $(1)/@build
 	grep -q -U $(4) $(1)/$(3)
 	$$(call mb_make_call,mb_make_echo_assert,Assert succesfully @assert-$(2))
-MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.")
+MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.")
 MB_PROJ_PHASE_TEST_DEPS += $(1)/@assert-$(2)
 .PHONY: $(1)/@assert-$(2)
 endef
@@ -13,12 +12,12 @@ MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_assert_
 #$$(call mb_delete,$(1)/$(3).out)
 define mb_assert_flow_bdos_grep
 $(1)-test-$(2)/@assert: $(1)/@build
-	$$(call mb_mkdir,$(1)-test-$(2))
-	$$(call mb_copy,$(1)/$(3).com,$(1)-test-$(2))
-	$$(call mb_msxpipe_safe_test,$(1)-test-$(2),$(3) > $(3).out)
+	$$(call mb_make_call,mb_os_dir_create,$(1)-test-$(2))
+	$$(call mb_make_call,mb_os_file_copy,$(1)/$(3).com,$(1)-test-$(2))
+	$$(call mb_make_call,mb_msxpipe_safe_test,$(1)-test-$(2),$(3) > $(3).out)
 	grep -q $(4) $(1)-test-$(2)/$(3).out
 	$$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(1)-test-$(2)/@assert)
-MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)-test-$(2)/@assert,"Asserts that $(3) output matches.")
+MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)-test-$(2)/@assert,"Asserts that $(3) output matches.")
 MB_PROJ_PHASE_TEST_DEPS += $(1)-test-$(2)/@assert
 .PHONY: $(1)-test-$(2)/@assert
 endef
diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk
index a068f12..73d59d0 100644
--- a/lib/make/mb_autoexec.mk
+++ b/lib/make/mb_autoexec.mk
@@ -1,5 +1,4 @@
 
-
 MB_AUTOEXEC_SHOW_VERSION ?= off
 MB_DOC_FIRE_VARIABLE += $(call mb_make_call,mb_doc_variable,MB_AUTOEXEC_SHOW_VERSION,"Print OS version on boot.")
 
@@ -77,107 +76,107 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_c
 
 
 define mb_autoexec_append_echo
-	$(call mb_autoexec_append_cmd,$(1),echo $(subst >,>,$(2)))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),echo $(subst >,>,$(2)))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_echo,"Appends an echo message.","<dir> <message>")
 
 
 define mb_autoexec_append_rem
-	$(call mb_autoexec_append_cmd,$(1),rem $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),rem $(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_rem,"Appends an script remark.","<dir> <remark>")
 
 
 define mb_autoexec_append_show_gui
-	$(call mb_autoexec_append_cmd,$(1),omsxctl headless_show_gui)
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl headless_show_gui)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_show_gui,"Appends headless show gui command.","<dir>")
 
 
 define mb_autoexec_append_stop_fail
-	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after 0)
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl fail_after 0)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_stop_fail,"Appends stop automatic failure command.","<dir>")
 
 
 define mb_autoexec_append_exit
-	$(if $(filter on,$(MB_FLIGHT_SCREEN)),$(call mb_autoexec_append_save_screenshot,$(1)))
-	$(call mb_autoexec_append_cmd,$(1),omsxctl headless_exit)
+	$(if $(filter on,$(MB_FLIGHT_SCREEN)),$(call mb_make_call,mb_autoexec_append_save_screenshot,$(1)))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl headless_exit)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_exit,"Appends exit emulation command.","<dir>")
 
 
 define mb_autoexec_append_plug_porta
-	$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_porta $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_porta $(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_plug_porta,"Appends an plug device into joyporta action.","<dir> <plug-dev>")
 
 
 define mb_autoexec_append_plug_portb
-	$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_portb $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_portb $(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_plug_portb,"Appends an plug device into joyportb action.","<dir> <plug-dev>")
 
 
 define mb_autoexec_append_save_screenshot
-	$(call mb_autoexec_append_cmd,$(1),omsxctl night_flight_save_screenshot $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl night_flight_save_screenshot $(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_save_screenshot,"Appends save screenshot command.","<dir> [prefix]")
 
 
 define mb_autoexec_append_save_video
-	$(call mb_autoexec_append_cmd,$(1),omsxctl night_flight_save_video $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl night_flight_save_video $(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_save_video,"Appends save video command.","<dir> [prefix]")
 
 
 define mb_autoexec_append_safe_test
-	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds err_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE)))
-	$(call mb_autoexec_append_echo,$(1),mb::safe test $(2))
-	$(call mb_autoexec_append_cmd,$(1),$(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds err_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE)))
+	$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::safe test $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),$(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_safe_test,"Appends running a safe test.","<dir> <cmd> [timeout] [exit-code]")
 
 
 define mb_autoexec_append_safe_cmd
-	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds err_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE)))
-	$(call mb_autoexec_append_echo,$(1),mb::safe command $(2))
-	$(call mb_autoexec_append_cmd,$(1),$(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds err_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE)))
+	$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::safe command $(2))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),$(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_append_safe_cmd,"Appends running a safe command.","<dir> <cmd> [timeout] [exit-code]")
 
 
 define _mb_autoexec_write_preboot
-	$(call mb_autoexec_append_cmd,$(1),$(2)mbboot80)
-	$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_setcolor $(if $(3),$(3),$(MB_AUTOEXEC_COLOR_FG)) $(if $(4),$(4),$(MB_AUTOEXEC_COLOR_BG)))
-	$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds err_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_INIT)),$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_show_init))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver))
-	$(call mb_autoexec_append_cmd,$(1),PATH + A:\;)
-	$(if $(wildcard $(1)/utils),$(call mb_autoexec_append_cmd,$(1),PATH + A:\UTILS))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),$(2)mbboot80)
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_setcolor $(if $(3),$(3),$(MB_AUTOEXEC_COLOR_FG)) $(if $(4),$(4),$(MB_AUTOEXEC_COLOR_BG)))
+	$(callmb_make_call, mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds err_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_INIT)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_show_init))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_VERSION)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),ver))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),PATH + A:\;)
+	$(if $(wildcard $(1)/utils),$(call mb_make_call,mb_autoexec_append_cmd,$(1),PATH + A:\UTILS))
 endef
 
 
 define mb_autoexec_write_default
 	$(call mb_make_call,mb_make_echo_command,$(MB_AUTOEXEC_LOG_PREFIX)$@)
 	@echo -n "" > $(1)/autoexec.bat
-	$(if $(wildcard $(1)/utils),$(call _mb_autoexec_write_preboot,$(1),utils\,$(2),$(3)),$(call _mb_autoexec_write_preboot,$(1),,$(2),$(3)))
-	$(if $(MB_AUTOEXEC_STARTUP_NOTE),$(call mb_autoexec_append_echo,$(1),mb::note $(MB_AUTOEXEC_STARTUP_NOTE)))
-	$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1)))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_HOST)),$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_show_host))
+	$(if $(wildcard $(1)/utils),$(call mb_make_call,_mb_autoexec_write_preboot,$(1),utils\,$(2),$(3)),$(call mb_make_call,_mb_autoexec_write_preboot,$(1),,$(2),$(3)))
+	$(if $(MB_AUTOEXEC_STARTUP_NOTE),$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::note $(MB_AUTOEXEC_STARTUP_NOTE)))
+	$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_make_call,mb_autoexec_append_save_video,$(1)))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_HOST)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl boot_exec_show_host))
 	echo -n "$(subst $(MB_MAKE_SPACE)set,set,$(foreach var,$(MB_AUTOEXEC_EMBED_VARS),set MSX_$(var)=$($(var))\r\n))" >> $(1)/autoexec.bat
-	$(call mb_autoexec_append_cmd,$(1),set TIME=$(MB_AUTOEXEC_TIME_FORMAT))
-	$(call mb_autoexec_append_cmd,$(1),set DATE=$(MB_AUTOEXEC_DATE_FORMAT))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_PATH)),$(call mb_autoexec_append_cmd,$(1),echo mb::path %PATH%))
-	$(call mb_autoexec_append_cmd,$(1),set MB_SNAIL=$(notdir $@))
-	$(call mb_autoexec_append_cmd,$(1),set MB_USER=$($(MB_AUTOEXEC_EMBED_USER)))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_USER)),$(call mb_autoexec_append_echo,$(1),mb::user %MB_USER%))
-	$(call mb_autoexec_append_cmd,$(1),set MB_SLIME=$(1))
-	$(call mb_autoexec_append_cmd,$(1),set MB_TARGET=$@)
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_FOLDER)),$(call mb_autoexec_append_echo,$(1),mb::bath %MB_SLIME%))
-	$(if $(filter on,$(MB_AUTOEXEC_SHOW_TARGET)),$(call mb_autoexec_append_echo,$(1),mb::pipe %MB_TARGET%))
-	$(if $(filter on,$(MB_AUTOEXEC_PROMPT_SPACE)),$(call mb_autoexec_append_cmd,$(1),set PROMPT \"$(value MB_AUTOEXEC_PROMPT_FORMAT)$(MB_MAKE_SPACE)\"))
-	$(if $(filter on,$(MB_AUTOEXEC_PROMPT_SPACE)),,$(call mb_autoexec_append_cmd,$(1),,set PROMPT \"$(value MB_AUTOEXEC_PROMPT_FORMAT)\"))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set TIME=$(MB_AUTOEXEC_TIME_FORMAT))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set DATE=$(MB_AUTOEXEC_DATE_FORMAT))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_PATH)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),echo mb::path %PATH%))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set MB_SNAIL=$(notdir $@))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set MB_USER=$($(MB_AUTOEXEC_EMBED_USER)))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_USER)),$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::user %MB_USER%))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set MB_SLIME=$(1))
+	$(call mb_make_call,mb_autoexec_append_cmd,$(1),set MB_TARGET=$@)
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_FOLDER)),$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::bath %MB_SLIME%))
+	$(if $(filter on,$(MB_AUTOEXEC_SHOW_TARGET)),$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::pipe %MB_TARGET%))
+	$(if $(filter on,$(MB_AUTOEXEC_PROMPT_SPACE)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),set PROMPT \"$(value MB_AUTOEXEC_PROMPT_FORMAT)$(MB_MAKE_SPACE)\"))
+	$(if $(filter on,$(MB_AUTOEXEC_PROMPT_SPACE)),,$(call mb_make_call,mb_autoexec_append_cmd,$(1),,set PROMPT \"$(value MB_AUTOEXEC_PROMPT_FORMAT)\"))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_autoexec_write_default,"Write a default autoexec.bat file.","<dir> [fg-color] [bg-color]")
 
diff --git a/lib/make/mb_conv.mk b/lib/make/mb_conv.mk
index 1bd916e..dd1fec0 100644
--- a/lib/make/mb_conv.mk
+++ b/lib/make/mb_conv.mk
@@ -1,5 +1,4 @@
 
-
 define mb_conv_unix2dos
 	$(call mb_make_call,mb_make_echo_command,Convert to dos-EOL $(2))
 	unix2dos -q -n $(1) $(2)
diff --git a/lib/make/mb_doc.mk b/lib/make/mb_doc.mk
index dfa6599..29bf0b1 100644
--- a/lib/make/mb_doc.mk
+++ b/lib/make/mb_doc.mk
@@ -58,7 +58,7 @@ define _mb_doc_variable_txt
 	"* "$(2)=$(subst \\n,\\\n,$(subst >,?,$(4)))\\n$(if $(3),\\t$(3)\\n)\\n
 endef
 define _mb_doc_variable_xml
-	\\n\\t$(call mb_make_xml_open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb_make_xml_tag_value,$(MB_DOC_XML_TAG_VALUE),$(subst >,?,$(4)))\\n\\t\\t$(call mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_xml_close,variable)
+	\\n\\t$(call mb_make_call,mb_make_xml_open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb_make_call,mb_make_xml_tag_value,$(MB_DOC_XML_TAG_VALUE),$(subst >,?,$(4)))\\n\\t\\t$(call mb_make_call,mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_call,mb_make_xml_close,variable)
 endef
 define mb_doc_variable
 	$(call mb_make_call,_mb_doc_variable_$(MB_DOC_FORMAT),build,$(1),$(2),$($(1)))
@@ -82,7 +82,7 @@ define _mb_doc_function_txt
 	"* "$(2)$(if $(4), $(4))$(if $(3),\\n\\t$(3)\\n)\\n
 endef
 define _mb_doc_function_xml
-	\\n\\t$(call mb_make_xml_open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb_make_xml_tag_value,$(MB_DOC_XML_TAG_ARGS),$(4))\\n\\t\\t$(call mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_xml_close,function)
+	\\n\\t$(call mb_make_call,mb_make_xml_open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb_make_call,mb_make_xml_tag_value,$(MB_DOC_XML_TAG_ARGS),$(4))\\n\\t\\t$(call mb_make_call,mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_call,mb_make_xml_close,function)
 endef
 define mb_doc_function
 	$(call mb_make_call,_mb_doc_function_$(MB_DOC_FORMAT),build,$(1),$(2),$(3))
@@ -102,7 +102,7 @@ define _mb_doc_target_txt
 	"* "$(2)$(if $(3),\\n\\t$(3))\\n\\n
 endef
 define _mb_doc_target_xml
-	\\n\\t$(call mb_make_xml_open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(if $3,\\n\\t\\t$(call mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_xml_close,target),\\n\\t$(call mb_make_xml_close,target))
+	\\n\\t$(call mb_make_call,mb_make_xml_open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(if $3,\\n\\t\\t$(call mb_make_call,mb_make_xml_tag_value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb_make_call,mb_make_xml_close,target),\\n\\t$(call mb_make_call,mb_make_xml_close,target))
 endef
 define mb_doc_target
 	$(call mb_make_call,_mb_doc_target_$(MB_DOC_FORMAT),build,$(1),$(2))
@@ -257,4 +257,3 @@ MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@help-firemake,"Outpu
 endef
 MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_doc_flow_help,"Prints flow of fire help target.","[project-name]")
 
-
diff --git a/lib/make/mb_flight.mk b/lib/make/mb_flight.mk
index e70bc60..211837e 100644
--- a/lib/make/mb_flight.mk
+++ b/lib/make/mb_flight.mk
@@ -25,3 +25,4 @@ define mb_flight_video_merge
 	$(call mb_make_call,mb_make_echo_good,Flight video completed)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_flight_video_merge,"Merged all flight videos to one.","<dir>")
+
diff --git a/lib/make/mb_make.mk b/lib/make/mb_make.mk
index 3fb3eda..46dc946 100644
--- a/lib/make/mb_make.mk
+++ b/lib/make/mb_make.mk
@@ -1,5 +1,4 @@
 
-
 MB_MAKE_COMMA := ,
 MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_MAKE_COMMA,"Expanded special char; comma.")
 
diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk
index 23bdba9..2fb150d 100644
--- a/lib/make/mb_msxhub.mk
+++ b/lib/make/mb_msxhub.mk
@@ -8,15 +8,15 @@ MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_MSXHUB_
 
 define _mb_msxhub_file_fetch
 	@echo === Fetch msxhub file
-	$(if $(wildcard $(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))),,$(call mb_mkdir,$(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))))
+	$(if $(wildcard $(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))),,$(call mb_make_call,mb_os_dir_create,$(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))))
 	$(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1))),,wget -O $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)) $(1))
 endef
 
 
 # NOTE: with HDD import/export we get duplicate files after openMSX run, so force to lowercase.
 define mb_msxhub_file
-	$(if $(wildcard $(MB_MSXHUB_CACHE)/$(2)),,$(call _mb_msxhub_file_fetch,$(MB_MSXHUB_API)/$(2)))
-	$(if $(wildcard $(1)/$(call mb_make_lowercase,$(notdir $(2)))),,$(call mb_copy,$(MB_MSXHUB_CACHE)/$(2),$(1)/$(call mb_make_lowercase,$(notdir $(2)))))
+	$(if $(wildcard $(MB_MSXHUB_CACHE)/$(2)),,$(call mb_make_call,_mb_msxhub_file_fetch,$(MB_MSXHUB_API)/$(2)))
+	$(if $(wildcard $(1)/$(call mb_make_call,mb_make_lowercase,$(notdir $(2)))),,$(call mb_make_call,mb_os_file_copy,$(MB_MSXHUB_CACHE)/$(2),$(1)/$(call mb_make_call,mb_make_lowercase,$(notdir $(2)))))
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_file,"Installs msxsub packages from slug into dir.","<dir> <msxhub-slug>")
 
@@ -25,22 +25,22 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_
 # Operating System (minimal)
 #
 define mb_msxhub_get_msxdos1_boot
-	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
-	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_get_msxdos1_boot,"Installs msxdos1 boot files into dir.","<dir>")
 
 
 define mb_msxhub_get_msxdos2_boot
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_get_msxdos2_boot,"Installs msxdos2 boot files into dir.","<dir>")
 
 
 define mb_msxhub_get_nextor_boot
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_get_nextor_boot,"Installs nextor boot files into dir.","<dir>")
 
@@ -49,31 +49,31 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxhub_
 # Native OS utils
 #
 define mb_msxhub_get_msxdos2_utils
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/CHKDSK.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/DISKCOPY.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/FIXDISK.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/UNDEL.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XCOPY.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XDIR.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/KMODE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/CHKDSK.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/DISKCOPY.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/FIXDISK.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/UNDEL.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XCOPY.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XDIR.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/KMODE.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_msxdos2_utils,"Installs msxdos2 util files into dir.","<dir>")
 
 
 define mb_msxhub_get_nextor_utils
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DELALL.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DEVINFO.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRIVERS.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRVINFO.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/FASTOUT.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/LOCK.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MAPDRV.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/EMUFILE.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/RALLOC.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/Z80MODE.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NSYSVER.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXBOOT.COM)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/CONCLUS.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DELALL.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DEVINFO.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRIVERS.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRVINFO.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/FASTOUT.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/LOCK.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MAPDRV.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/EMUFILE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/RALLOC.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/Z80MODE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NSYSVER.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXBOOT.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/CONCLUS.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_nextor_utils,"Installs nextor util files into dir.","<dir>")
 
@@ -82,39 +82,39 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_nextor
 # Compilers
 #
 define mb_msxhub_get_macro80
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/CREF80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/L80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/LIB80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/M80.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/CREF80.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/L80.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/LIB80.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/M80.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_macro80,"Installs macro80 package into dir.","<dir>")
 
 
 define mb_msxhub_get_z80asmuk
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/BINTOASM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/DUMP.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRL.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRNTOSYM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/RSX.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSMPP.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/BINTOASM.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/DUMP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRL.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRNTOSYM.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/RSX.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSM.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSMPP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_z80asmuk,"Installs z80asmuk package into dir.","<dir>")
 
 
 define mb_msxhub_get_wbass2
-	$(call mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/zoekram.bin)
-	$(call mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/wbass2.bin)
-	$(call mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/wbass2.bas)
+	$(call mb_make_call,mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/zoekram.bin)
+	$(call mb_make_call,mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/wbass2.bin)
+	$(call mb_make_call,mb_msxhub_file,$(1),WBASS2/2.0-1/get/WBASS2/wbass2.bas)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_wbass2,"Installs wbass2 package into dir.","<dir>")
 
 
 define mb_msxhub_get_konpass
-	$(call mb_msxhub_file,$(1),KONPASS/1.3.0-1/get/KONPASS/KONPASS.COM)
-	$(call mb_msxhub_file,$(1),KONPASS/1.3.0-1/get/KONPASS/KONPASS.DAT)
+	$(call mb_make_call,mb_msxhub_file,$(1),KONPASS/1.3.0-1/get/KONPASS/KONPASS.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),KONPASS/1.3.0-1/get/KONPASS/KONPASS.DAT)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_konpass,"Installs konpass package into dir.","<dir>")
 
@@ -123,42 +123,42 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_konpas
 # Compressors
 #
 define mb_msxhub_get_pmarc
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMARC.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMCAT.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXE2.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXT.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSET.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSFX2.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMARC.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMCAT.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXE2.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXT.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSET.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSFX2.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_pmarc,"Installs pmarc package into dir.","<dir>")
 
 
 define mb_msxhub_get_lhpack
-	$(call mb_msxhub_file,$(1),LHPACK/1.00-1/get/LHPACK/lhpack.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),LHPACK/1.00-1/get/LHPACK/lhpack.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_lhpack,"Installs lhpack package into dir.","<dir>")
 
 
 define mb_msxhub_get_lhext
-	$(call mb_msxhub_file,$(1),LHEXT/1.34-2/get/LHEXT/lhext.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),LHEXT/1.34-2/get/LHEXT/lhext.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_lhext,"Installs lhext package into dir.","<dir>")
 
 
 define mb_msxhub_get_gunzip
-	$(call mb_msxhub_file,$(1),GUNZIP/1.1-1/get/GUNZIP/gunzip.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),GUNZIP/1.1-1/get/GUNZIP/gunzip.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_gunzip,"Installs gunzip package into dir.","<dir>")
 
 
 define mb_msxhub_get_tunzip
-	$(call mb_msxhub_file,$(1),TUNZIP/0.91-1/get/TUNZIP/tunzip.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),TUNZIP/0.91-1/get/TUNZIP/tunzip.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_tunzip,"Installs tunzip package into dir.","<dir>")
 
 
 define mb_msxhub_get_popcom
-	$(call mb_msxhub_file,$(1),POPCOM/1.00-2/get/POPCOM/popcom.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),POPCOM/1.00-2/get/POPCOM/popcom.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_popcom,"Installs popcom package into dir.","<dir>")
 
@@ -167,71 +167,71 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_popcom
 # Tools
 #
 define mb_msxhub_get_make
-	$(call mb_msxhub_file,$(1),MAKE/2.00-1/get/MAKE/MAKE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MAKE/2.00-1/get/MAKE/MAKE.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_make,"Installs make package into dir.","<dir>")
 
 
 define mb_msxhub_get_adir
-	$(call mb_msxhub_file,$(1),ADIR/1.3-1/get/ADIR/adir.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),ADIR/1.3-1/get/ADIR/adir.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_adir,"Installs adir package into dir.","<dir>")
 
 
 define mb_msxhub_get_turbo
-	$(call mb_msxhub_file,$(1),TURBO/2.1-1/get/TURBO/turbo.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),TURBO/2.1-1/get/TURBO/turbo.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_turbo,"Installs turbo package into dir.","<dir>")
 
 
 define mb_msxhub_get_baskom
-	$(call mb_msxhub_file,$(1),BASKOM/1.0-1/get/BASKOM/baskom.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),BASKOM/1.0-1/get/BASKOM/baskom.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_baskom,"Installs baskom package into dir.","<dir>")
 
 
 define mb_msxhub_get_binldr
-	$(call mb_msxhub_file,$(1),BINLDR/1.0.2-1/get/BINLDR/BINLDR.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),BINLDR/1.0.2-1/get/BINLDR/BINLDR.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_binldr,"Installs binldr package into dir.","<dir>")
 
 
 define mb_msxhub_get_dmphex
-	$(call mb_msxhub_file,$(1),DMPHEX/1.00-1/get/DMPHEX/dmphex.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),DMPHEX/1.00-1/get/DMPHEX/dmphex.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_dmphex,"Installs dmphex package into dir.","<dir>")
 
 
 define mb_msxhub_get_zd
-	$(call mb_msxhub_file,$(1),ZD/3.30-1/get/ZD/zd.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),ZD/3.30-1/get/ZD/zd.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_zd,"Installs zd package into dir.","<dir>")
 
 
 define mb_msxhub_get_msxdos2t
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/ADDAUX.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BEEP.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BIO.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BODY.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BSAVE.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/CAL.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/CALC.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/DUMP.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/EXPAND.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/GREP.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/HEAD.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/KEY.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/LIST.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/LS.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/MENU.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/MORE.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/PATCH.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/SLEEP.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/TAIL.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/TR.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/UNIQ.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/VIEW.COM)
-	$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/WC.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/ADDAUX.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BEEP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BIO.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BODY.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BSAVE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/CAL.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/CALC.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/DUMP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/EXPAND.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/GREP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/HEAD.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/KEY.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/LIST.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/LS.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/MENU.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/MORE.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/PATCH.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/SLEEP.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/TAIL.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/TR.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/UNIQ.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/VIEW.COM)
+	$(call mb_make_call,mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/WC.COM)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_msxdos2t,"Installs msxdos2t package into dir.","<dir>")
 
@@ -240,6 +240,7 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_msxdos
 # Graphics editors
 #
 define mb_msxhub_get_gfxage
-	$(call mb_msxhub_file,$(1),GFXAGE/0.99-1/get/GFXAGE/gfxage.com)
+	$(call mb_make_call,mb_msxhub_file,$(1),GFXAGE/0.99-1/get/GFXAGE/gfxage.com)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxhub_get_gfxage,"Installs gfxage package into dir.","<dir>")
+
diff --git a/lib/make/mb_msxpipe.mk b/lib/make/mb_msxpipe.mk
index 98efc78..46574ed 100644
--- a/lib/make/mb_msxpipe.mk
+++ b/lib/make/mb_msxpipe.mk
@@ -58,3 +58,4 @@ define mb_msxpipe_run_gui_mouse
 	$(call mb_make_call,_mb_msxpipe_run_gui,$(1),$(2),$(3),mouse)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_msxpipe_run_gui_mouse,"Runs openMSX forever with renderer and mouse and optionals.","<dir> [cmd] [machine]")
+
diff --git a/lib/make/mb_msxrom.mk b/lib/make/mb_msxrom.mk
index 21f5271..ee17b9a 100644
--- a/lib/make/mb_msxrom.mk
+++ b/lib/make/mb_msxrom.mk
@@ -9,179 +9,180 @@ MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_MSXROM_
 
 define _mb_msxrom_file_fetch
 	@echo === Fetch msxrom file
-	$(if $(wildcard $(dir $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1)))),,$(call mb_mkdir,$(dir $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1)))))
+	$(if $(wildcard $(dir $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1)))),,$(call mb_make_call,mb_os_dir_create,$(dir $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1)))))
 	$(if $(wildcard $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1))),,wget -O $(MB_MSXROM_CACHE)/$(subst $(MB_MSXROM_API)/,,$(1)) $(1))
 endef
 
 
 define mb_msxrom_file
-	$(if $(wildcard $(MB_MSXROM_CACHE)/$(2)),,$(call _mb_msxrom_file_fetch,$(MB_MSXROM_API)/$(2)))
-	$(if $(wildcard $(1)/$(notdir $(2))),,$(call mb_copy,$(MB_MSXROM_CACHE)/$(2),$(1)/$(notdir $(2))))
+	$(if $(wildcard $(MB_MSXROM_CACHE)/$(2)),,$(call mb_make_call,_mb_msxrom_file_fetch,$(MB_MSXROM_API)/$(2)))
+	$(if $(wildcard $(1)/$(notdir $(2))),,$(call mb_make_call,mb_os_file_copy,$(MB_MSXROM_CACHE)/$(2),$(1)/$(notdir $(2))))
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_file,"Installs msxroms from slug into an subdir.","<dir> <msxrom-slug>")
 
 
 define mb_msxrom_setup
-	$(if $(wildcard $(1)-omsx),,$(call mb_mkdir,$(1)-omsx))
-	$(if $(wildcard $(1)-omsx/share),,$(call mb_mkdir,$(1)-omsx/share))
-	$(if $(wildcard $(1)-omsx/share/systemroms),,$(call mb_mkdir,$(1)-omsx/share/systemroms))
-	$(if $(wildcard $(1)-omsx/share/systemroms/machines),,$(call mb_mkdir,$(1)-omsx/share/systemroms/machines))
-	$(if $(wildcard $(1)-omsx/share/systemroms/extensions),,$(call mb_mkdir,$(1)-omsx/share/systemroms/extensions))
+	$(if $(wildcard $(1)-omsx),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx))
+	$(if $(wildcard $(1)-omsx/share),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share))
+	$(if $(wildcard $(1)-omsx/share/systemroms),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share/systemroms))
+	$(if $(wildcard $(1)-omsx/share/systemroms/machines),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share/systemroms/machines))
+	$(if $(wildcard $(1)-omsx/share/systemroms/extensions),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share/systemroms/extensions))
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_setup,"Creates needed systemrom folders.","<dir>")
 
 
 define mb_msxrom_extension_ide
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/ide240.dat)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/ide240.dat)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_ide,"Installs sunrise IDE classic rom.","<dir>")
 
 
 define mb_msxrom_extension_ide_nextor
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/Nextor-2.1.1.SunriseIDE.ROM)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/Nextor-2.1.1.SunriseIDE.ROM)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_ide_nextor,"Installs sunrise IDE nextor rom.","<dir>")
 
 
 define mb_msxrom_extension_scsi_novaxis
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/novaxis.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/novaxis.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_scsi_novaxis,"Installs Gouda SCSI novaxis rom.","<dir>")
 
 
 define mb_msxrom_extension_msxdos22
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/msxdos22.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/msxdos22.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_msxdos22,"Installs msxdos 2.20 rom.","<dir>")
 
 
 define mb_msxrom_extension_rs232
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/rs232.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/rs232.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_rs232,"Installs rs232 rom.","<dir>")
 
 
 define mb_msxrom_extension_fmpac
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/fmpac.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/fmpac.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_fmpac,"Installs fmpac rom.","<dir>")
 
 
 define mb_msxrom_extension_fmpac_en
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/fmpac_en.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/fmpac_en.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_fmpac_en,"Installs fmpac english rom.","<dir>")
 
 
 define mb_msxrom_extension_moonsound
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/yrw801.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,extensions/yrw801.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_moonsound,"Installs moonsound rom.","<dir>")
 
 
 define mb_msxrom_extension_basickun
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,machines/sanyo/phc-70fd2_basickun.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,machines/sanyo/phc-70fd2_basickun.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_extension_basickun,"Installs basickun compiler rom.","<dir>")
 
 
 define mb_msxrom_machine_Canon_V-20
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/canon/v-20_basic-bios1.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/canon/v-20_basic-bios1.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Canon_V-20,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Mitsubishi_ML-F80
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-f80_basic-bios1.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-f80_basic-bios1.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Mitsubishi_ML-F80,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Mitsubishi_ML-FX1
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-fx1_basic-bios1.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-fx1_basic-bios1.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Mitsubishi_ML-FX1,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Mitsubishi_ML-G3_ES
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_basic-bios2.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_disk.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_msx2sub.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_rs232.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_basic-bios2.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_disk.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_msx2sub.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_rs232.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Mitsubishi_ML-G3_ES,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Philips_VG_8000
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8000_basic-bios1.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8000_basic-bios1.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Philips_VG_8000,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Philips_VG_8230
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_basic-bios2.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_disk.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_msx2sub.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_basic-bios2.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_disk.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8230_msx2sub.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Philips_VG_8230,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Philips_NMS_8250
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_basic-bios2.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_msx2sub.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_disk.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_basic-bios2.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_msx2sub.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/nms8250_disk.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Philips_NMS_8250,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Toshiba_HX-21
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/toshiba/HX21-IC2.BIN)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/toshiba/HX21-IC3.BIN)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/toshiba/HX21-IC2.BIN)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/toshiba/HX21-IC3.BIN)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Toshiba_HX-21,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Yamaha_AX200
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_basic-bios1.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_arabic.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_music.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_basic-bios1.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_arabic.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/ax200_music.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Yamaha_AX200,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Yamaha_YIS-503IIIR
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_basic-bios2.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_msx2sub.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_cpm.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_net_2.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_basic-bios2.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_msx2sub.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_cpm.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/yamaha/yis503iii_net_2.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Yamaha_YIS-503IIIR,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Panasonic_FS-A1WSX
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_basic-bios2p.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_disk.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_firmware.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_fmbasic.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_kanjibasic.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_kanjifont.rom)
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_msx2psub.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_basic-bios2p.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_disk.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_firmware.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_fmbasic.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_kanjibasic.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_kanjifont.rom)
+	$(call mb_make_call,mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/panasonic/fs-a1wsx_msx2psub.rom)
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Panasonic_FS-A1WSX,"Installs machine roms.","<dir>")
 
 
 define mb_msxrom_machine_Boosted_MSX2_EN
-	$(call mb_msxrom_machine_Philips_NMS_8250,$(1))
-	$(call mb_msxrom_extension_fmpac,$(1))
-	$(call mb_msxrom_extension_moonsound,$(1))
-	$(call mb_msxrom_extension_basickun,$(1))
+	$(call mb_make_call,mb_msxrom_machine_Philips_NMS_8250,$(1))
+	$(call mb_make_call,mb_msxrom_extension_fmpac,$(1))
+	$(call mb_make_call,mb_msxrom_extension_moonsound,$(1))
+	$(call mb_make_call,mb_msxrom_extension_basickun,$(1))
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Boosted_MSX2_EN,"Installs machine and extensions roms.","<dir>")
 
 
 define mb_msxrom_machine_Boosted_MSX2+_JP
-	$(call mb_msxrom_machine_Panasonic_FS-A1WSX,$(1))
-	$(call mb_msxrom_extension_moonsound,$(1))
-	$(call mb_msxrom_extension_basickun,$(1))
+	$(call mb_make_call,mb_msxrom_machine_Panasonic_FS-A1WSX,$(1))
+	$(call mb_make_call,mb_msxrom_extension_moonsound,$(1))
+	$(call mb_make_call,mb_msxrom_extension_basickun,$(1))
 endef
 MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_msxrom_machine_Boosted_MSX2+_JP,"Installs machine and extensions roms.","<dir>")
+
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 7580168..f223bfb 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -1,5 +1,4 @@
 
-
 MB_OPENMSX_BOOT_TIMEOUT ?= 25
 MB_DOC_FIRE_VARIABLE += $(call mb_make_call,mb_doc_variable,MB_OPENMSX_BOOT_TIMEOUT,"Timeout in seconds to guard for boot failures.")
 
@@ -42,19 +41,19 @@ MB_OPENMSX_STDERR_IGNORE ?= off
 
 
 define mb_openmsx_setup
-	$(if $(wildcard $(1)-omsx),,$(call mb_mkdir,$(1)-omsx))
-	$(if $(wildcard $(1)-omsx/stdio.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/stdio.xml,$(1)-omsx))
-	$(if $(wildcard $(1)-omsx/share),,$(call mb_mkdir,$(1)-omsx/share))
-	$(if $(wildcard $(1)-omsx/share/settings.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/settings.xml,$(1)-omsx/share))
-	$(if $(wildcard $(1)-omsx/share/scripts),,$(call mb_mkdir,$(1)-omsx/share/scripts))
-	$(if $(wildcard $(1)-omsx/share/scripts/boot_exec.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/boot_exec.tcl,$(1)-omsx/share/scripts))
-	$(if $(wildcard $(1)-omsx/share/scripts/fail_after.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/fail_after.tcl,$(1)-omsx/share/scripts))
-	$(if $(wildcard $(1)-omsx/share/scripts/fire_hdd.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/fire_hdd.tcl,$(1)-omsx/share/scripts))
-	$(if $(wildcard $(1)-omsx/share/scripts/headless.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/headless.tcl,$(1)-omsx/share/scripts))
-	$(if $(wildcard $(1)-omsx/share/scripts/night_flight.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/night_flight.tcl,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx))
+	$(if $(wildcard $(1)-omsx/stdio.xml),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/stdio.xml,$(1)-omsx))
+	$(if $(wildcard $(1)-omsx/share),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share))
+	$(if $(wildcard $(1)-omsx/share/settings.xml),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/settings.xml,$(1)-omsx/share))
+	$(if $(wildcard $(1)-omsx/share/scripts),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx/share/scripts/boot_exec.tcl),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/boot_exec.tcl,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx/share/scripts/fail_after.tcl),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/fail_after.tcl,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx/share/scripts/fire_hdd.tcl),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/fire_hdd.tcl,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx/share/scripts/headless.tcl),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/headless.tcl,$(1)-omsx/share/scripts))
+	$(if $(wildcard $(1)-omsx/share/scripts/night_flight.tcl),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/night_flight.tcl,$(1)-omsx/share/scripts))
 	$(if $(wildcard $(1)-omsx/share/scripts/omsxctl.tcl),,$(call mb_msxhub_file,$(1)-omsx/share/scripts,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl))
-	$(if $(wildcard $(1)-omsx/share/extensions),,$(call mb_mkdir,$(1)-omsx/share/extensions))
-	$(if $(wildcard $(1)-omsx/share/extensions/fire-hdd.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/extensions/fire-hdd.xml,$(1)-omsx/share/extensions))
+	$(if $(wildcard $(1)-omsx/share/extensions),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/share/extensions))
+	$(if $(wildcard $(1)-omsx/share/extensions/fire-hdd.xml),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/extensions/fire-hdd.xml,$(1)-omsx/share/extensions))
 	$(call mb_make_call,mb_msxrom_setup,$(1))
 	$(call mb_make_call,mb_msxrom_extension_ide_nextor,$(1))
 	$(call mb_make_call,mb_msxrom_machine_$(2),$(1))
@@ -64,7 +63,7 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_openmsx
 
 define _mb_openmsx_run
 	$(call mb_make_call,mb_make_echo_command,$(MB_OPENMSX_LOG_PREFIX)$@ on $(2))
-	$(if $(wildcard $(1)-omsx/persistent/fire-hdd/untitled1/sync),,$(call mb_make_call,mb_mkdir,$(1)-omsx/persistent/fire-hdd/untitled1/sync))
+	$(if $(wildcard $(1)-omsx/persistent/fire-hdd/untitled1/sync),,$(call mb_make_call,mb_os_dir_create,$(1)-omsx/persistent/fire-hdd/untitled1/sync))
 	BOOT_WATCHDOG=$(MB_OPENMSX_BOOT_TIMEOUT) \
 	FIRE_HDD_PATH="$(1)" \
 	FIRE_HDD_SIZE=$(MB_OPENMSX_HDD_SIZE) \
@@ -98,11 +97,11 @@ endef
 
 
 define _mb_openmsx_dosctl_bat
-	$(if $(wildcard $(1)/z80.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
-	$(if $(wildcard $(1)/reboot.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1)))
-	$(if $(wildcard $(1)/shutdown.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1)))
-	$(if $(wildcard $(1)/mbboot80.com),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/mbboot80.com,$(1)))
-	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com))
+	$(if $(wildcard $(1)/z80.bat),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
+	$(if $(wildcard $(1)/reboot.bat),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1)))
+	$(if $(wildcard $(1)/shutdown.bat),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1)))
+	$(if $(wildcard $(1)/mbboot80.com),,$(call mb_make_call,mb_os_file_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/mbboot80.com,$(1)))
+	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_make_call,mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com))
 endef
 
 
diff --git a/lib/make/mb_os.mk b/lib/make/mb_os.mk
index 9e82bc3..b6c053e 100644
--- a/lib/make/mb_os.mk
+++ b/lib/make/mb_os.mk
@@ -1,25 +1,25 @@
 
 # OS cmds
 ifeq ($(OS),Windows_NT)
-	MB_OS_RM = del /F /Q
-	MB_OS_RMDIR = RMDIR /S /Q
-	MB_OS_MKDIR = mkdir
-	MB_OS_COPY = copy
+	MB_OS_RM ?= del /F /Q
+	MB_OS_RMDIR ?= RMDIR /S /Q
+	MB_OS_MKDIR ?= mkdir
+	MB_OS_COPY ?= copy
 	MB_OS_ECHO ?= echo
-	MB_OS_STDOUT_IGNORE = >NUL
-	MB_OS_STDERR_IGNORE = 2>NUL || true
-	MB_OS_SEP = "\"
+	MB_OS_STDOUT_IGNORE ?= >NUL
+	MB_OS_STDERR_IGNORE ?= 2>NUL || true
+	MB_OS_SEP ?= "\"
 	MB_OS_CACHE ?= %LOCALAPPDATA%
 	MB_OS_COLORS ?= -1
 else
-	MB_OS_RM = rm -f
-	MB_OS_RMDIR = rm -rf
-	MB_OS_MKDIR = mkdir -p
-	MB_OS_COPY = cp
+	MB_OS_RM ?= rm -f
+	MB_OS_RMDIR ?= rm -rf
+	MB_OS_MKDIR ?= mkdir -p
+	MB_OS_COPY ?= cp
 	MB_OS_ECHO ?= /usr/bin/echo
-	MB_OS_STDOUT_IGNORE = >/dev/null
-	MB_OS_STDERR_IGNORE = 2>/dev/null
-	MB_OS_SEP = "/"
+	MB_OS_STDOUT_IGNORE ?= >/dev/null
+	MB_OS_STDERR_IGNORE ?= 2>/dev/null
+	MB_OS_SEP ?= "/"
 	MB_OS_CACHE ?= ~/.cache
 	MB_OS_COLORS ?= $(shell tput colors 2> /dev/null;test $$? -eq 0 || echo "-1")
 endif
@@ -36,3 +36,27 @@ MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_SEP,
 MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_CACHE,"Native OS application cache folder.")
 MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_COLORS,"Native OS terminal color count support.")
 
+
+define mb_os_dir_delete
+	$(MB_OS_RMDIR) $(1)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_os_dir_delete,"Removed the full folder.","<dir>")
+
+
+define mb_os_dir_create
+	$(MB_OS_MKDIR) $(1)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_os_dir_create,"Creates an folder.","<dir>")
+
+
+define mb_os_file_delete
+	$(MB_OS_RM) $(1)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_os_file_delete,"Deletes an file.","<file>")
+
+
+define mb_os_file_copy
+	$(MB_OS_COPY) $(1) $(2)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_os_file_copy,"Copy an file.","<in> <out>")
+
diff --git a/lib/make/mb_proj.mk b/lib/make/mb_proj.mk
index 629133b..b93e43c 100644
--- a/lib/make/mb_proj.mk
+++ b/lib/make/mb_proj.mk
@@ -1,5 +1,4 @@
 
-
 MB_PROJ_META_NAME ?= MSXBUILD
 MB_DOC_FIRE_VARIABLE += $(call mb_make_call,mb_doc_variable,MB_PROJ_META_NAME,"The project name.")
 
@@ -72,11 +71,11 @@ define _mb_proj_flow_step_done
 endef
 define _mb_proj_run_clean
 	$(foreach folder,$(1),$(if $(wildcard $(folder)),$(call mb_make_call,mb_make_echo_command,Removing folder $(folder));))
-	$(foreach folder,$(1),$(if $(wildcard $(folder)),$(call mb_make_call,mb_clean,$(folder))))
+	$(foreach folder,$(1),$(if $(wildcard $(folder)),$(call mb_make_call,mb_os_dir_delete,$(folder))))
 endef
 define _mb_proj_run_init
 	$(foreach folder,$(1),$(if $(wildcard $(folder)),,$(call mb_make_call,mb_make_echo_command,Creating folder $(folder));))
-	$(foreach folder,$(1),$(if $(wildcard $(folder)),,$(call mb_make_call,mb_mkdir,$(folder))))
+	$(foreach folder,$(1),$(if $(wildcard $(folder)),,$(call mb_make_call,mb_os_dir_create,$(folder))))
 endef
 
 
@@ -276,4 +275,3 @@ MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@package-qa-video,"Ru
 endef
 MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_proj_flow_flight_video,"Prints flow for adding video targets in project build cycle.","<path-bin>")
 
-
diff --git a/lib/make/mb_sdcc.mk b/lib/make/mb_sdcc.mk
index fab90c6..3ccdc89 100644
--- a/lib/make/mb_sdcc.mk
+++ b/lib/make/mb_sdcc.mk
@@ -1,5 +1,4 @@
 
-
 MB_SDCC_FLAG_CPU ?= -mz80
 MB_DOC_FIRE_VARIABLE += $(call mb_make_call,mb_doc_variable,MB_SDCC_FLAG_CPU,"The SDCC cpu target option.")
 
@@ -43,43 +42,43 @@ MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm,"Li
 
 
 define mb_sdcc_link_asm_0000
-	$(call mb_sdcc_link_asm,$(1),$(2),0x0000)rule
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0x0000)rule
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_0000,"Links asm to 0x0000.","<in> <out>")
 
 
 define mb_sdcc_link_asm_0100
-	$(call mb_sdcc_link_asm,$(1),$(2),0x0100)
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0x0100)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_0100,"Links asm to 0x0100.","<in> <out>")
 
 
 define mb_sdcc_link_asm_1000
-	$(call mb_sdcc_link_asm,$(1),$(2),0x1000)
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0x1000)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_1000,"Links asm to 0x1000.","<in> <out>")
 
 
 define mb_sdcc_link_asm_4000
-	$(call mb_sdcc_link_asm,$(1),$(2),0x4000)
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0x4000)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_4000,"Links asm to 0x4000.","<in> <out>")
 
 
 define mb_sdcc_link_asm_8000
-	$(call mb_sdcc_link_asm,$(1),$(2),0x8000)
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0x8000)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_8000,"Links asm to 0x8000.","<in> <out>")
 
 
 define mb_sdcc_link_asm_C000
-	$(call mb_sdcc_link_asm,$(1),$(2),0xC000)
+	$(call mb_make_call,mb_sdcc_link_asm,$(1),$(2),0xC000)
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_C000,"Links asm to 0xC000.","<in> <out>")
 
 
 define mb_sdcc_link_asm_bdos
-	$(call mb_sdcc_link_asm_0100,$(1),$(2))
+	$(call mb_make_call,mb_sdcc_link_asm_0100,$(1),$(2))
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_sdcc_link_asm_bdos,"Links asm to BDOS.","<in> <out>")
 
diff --git a/lib/make/mb_tool.mk b/lib/make/mb_tool.mk
index 1ca0cfb..5f58601 100644
--- a/lib/make/mb_tool.mk
+++ b/lib/make/mb_tool.mk
@@ -1,9 +1,8 @@
 
-
 define mb_tool_m80_flow_bdos_mono
 $(1): | @init
-	$$(call mb_make_call,mb_mkdir,$(1))
-	$$(call mb_make_call,mb_mkdir,$(1)/utils)
+	$$(call mb_make_call,mb_os_dir_create,$(1))
+	$$(call mb_make_call,mb_os_dir_create,$(1)/utils)
 	$$(call mb_make_call,mb_msxhub_get_macro80,$(1)/utils)
 	$$(call mb_make_call,mb_msxhub_get_z80asmuk,$(1)/utils)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(1))
@@ -49,25 +48,25 @@ MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_tool_m8
 
 define mb_tool_sdcc_flow_bdos_mono
 $(1): | @init
-	$$(call mb_make_call,mb_mkdir,$(1))
+	$$(call mb_make_call,mb_os_dir_create,$(1))
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(1))
 .PHONY: $(1)
 
 
 $(1)/$(3).rel: $(2)/$(3).asm | $(1)
-	$$(call mb_sdcc_compile_asm,$$<,$$@)
+	$$(call mb_make_call,mb_sdcc_compile_asm,$$<,$$@)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).rel)
 MB_PROJ_PHASE_COMPILE_DEPS += $(1)/$(3).rel
 
 
 $(1)/$(3).hex: $(1)/$(3).rel
-	$$(call mb_sdcc_link_asm_bdos,$$<,$$@)
+	$$(call mb_make_call,mb_sdcc_link_asm_bdos,$$<,$$@)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).hex)
 MB_PROJ_PHASE_LINK_DEPS += $(1)/$(3).hex
 
 
 $(1)/$(3).com: $(1)/$(3).hex
-	$$(call mb_sdcc_hex2bin,$$<,$$@)
+	$$(call mb_make_call,mb_sdcc_hex2bin,$$<,$$@)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).com)
 MB_PROJ_PHASE_BUILD_DEPS += $(1)/$(3).com
 
diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk
index fb46978..ccdb41a 100644
--- a/lib/make/msxbuild.mk
+++ b/lib/make/msxbuild.mk
@@ -34,28 +34,6 @@ MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,PATH_MSXBU
 MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,PATH_MSXBUILD_REAL,"Resolved real path of msxbuild.")
 
 
-define mb_clean
-	$(MB_OS_RMDIR) $(1)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_clean,"Removed the full folder.","<dir>")
-
-
-define mb_mkdir
-	$(MB_OS_MKDIR) $(1)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_mkdir,"Creates an folder.","<dir>")
-
-
-define mb_delete
-	$(MB_OS_RM) $(1)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_delete,"Deletes an file.","<file>")
-
-
-define mb_copy
-	$(MB_OS_COPY) $(1) $(2)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_copy,"Copy an file.","<in> <out>")
 
 
 define mb_create_dist
diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk
index f8b56c1..3255e24 100644
--- a/src/dist-qa-dos1/0module.mk
+++ b/src/dist-qa-dos1/0module.mk
@@ -6,27 +6,27 @@ DIST_QA_DOS1_DEPS    := $(call mb_make_call,mb_proj_module_local_deps,$(DIST_QA_
 
 
 $(DIST_QA_DOS1_BIN): | @init
-	$(call mb_mkdir,$(DIST_QA_DOS1_BIN))
-	$(call mb_msxhub_get_msxdos1_boot,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_msxhub_get_msxdos1_boot,$(DIST_QA_DOS1_BIN))
 
 
 $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 
 $(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS)
-	$(call mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN))
 MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.")
 .PHONY: $(DIST_QA_DOS1_BIN)/@run
 
 
 $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS)
-	$(call mb_autoexec_write_default,$(DIST_QA_DOS1_BIN))
-	$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1)
-	$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2)
-	$(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN))
-	$(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN))
-	$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS1_BIN)/@assert)
+	$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1)
+	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2)
+	$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN))
+	$(call mb_make_call,mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS1_BIN)/@assert)
 MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.")
 MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS1_BIN)/@assert
 .PHONY: $(DIST_QA_DOS1_BIN)/@assert
diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk
index 97df05e..bc9cd36 100644
--- a/src/dist-qa-dos2/0module.mk
+++ b/src/dist-qa-dos2/0module.mk
@@ -6,28 +6,28 @@ DIST_QA_DOS2_DEPS    := $(call mb_make_call,mb_proj_module_local_deps,$(DIST_QA_
 
 
 $(DIST_QA_DOS2_BIN): | @init
-	$(call mb_mkdir,$(DIST_QA_DOS2_BIN))
-	$(call mb_msxhub_get_msxdos2_boot,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_msxhub_get_msxdos2_boot,$(DIST_QA_DOS2_BIN))
 
 
 $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 
 $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS)
-	$(call mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN))
 MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.")
 .PHONY: $(DIST_QA_DOS2_BIN)/@run
 
 
 $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS)
-	$(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello1.out)
-	$(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello2.out)
-	$(call mb_autoexec_write_default,$(DIST_QA_DOS2_BIN))
-	$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out)
-	$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out)
-	$(call mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN))
-	$(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello1.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello2.out)
+	$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out)
+	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out)
+	$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN))
+	$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN))
 	grep -q "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out
 	grep -q "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out
 	$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS2_BIN)/@assert)
diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk
index b12affd..8b8807b 100644
--- a/src/dist-qa-msx1/0module.mk
+++ b/src/dist-qa-msx1/0module.mk
@@ -8,11 +8,11 @@ MB_DOC_FIRE_VARIABLE += $(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE
 
 
 $(DIST_QA_MSX1_BIN): | @init
-	$(call mb_make_call,mb_mkdir,$(DIST_QA_MSX1_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSX1_BIN))
 
 
 $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS)
-	$(call mb_make_call,mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 
 $(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS)
@@ -22,8 +22,8 @@ MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSX1_B
 
 
 $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS)
-	$(call mb_make_call,mb_delete,$(DIST_QA_MSX1_BIN)/ahello1.out)
-	$(call mb_make_call,mb_delete,$(DIST_QA_MSX1_BIN)/ahello2.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello2.out)
 	$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40)
 	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33)
 	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99)
diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk
index 8295902..a80d3f6 100644
--- a/src/dist-qa-msxhub/0module.mk
+++ b/src/dist-qa-msxhub/0module.mk
@@ -8,8 +8,8 @@ MB_DOC_FIRE_VARIABLE   += $(call mb_make_call,mb_doc_variable,DIST_QA_MSXHUB_MAC
 
 
 $(DIST_QA_MSXHUB_BIN): | @init
-	$(call mb_make_call,mb_mkdir,$(DIST_QA_MSXHUB_BIN))
-	$(call mb_make_call,mb_mkdir,$(DIST_QA_MSXHUB_BIN)/utils)
+	$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_msxdos2_utils,$(DIST_QA_MSXHUB_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils)
@@ -34,7 +34,7 @@ $(DIST_QA_MSXHUB_BIN): | @init
 
 
 $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS)
-	$(call mb_make_call,mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 
 $(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS)
@@ -44,9 +44,9 @@ MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSXHUB
 
 
 $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS)
-	$(call mb_make_call,mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out)
-	$(call mb_make_call,mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out)
-	$(call mb_make_call,mb_delete,$(DIST_QA_MSXHUB_BIN)/utils.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out)
+	$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/utils.out)
 	$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN))
 	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out)
 	$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out)
diff --git a/src/dist/0module.mk b/src/dist/0module.mk
index c0fdc28..ee7062c 100644
--- a/src/dist/0module.mk
+++ b/src/dist/0module.mk
@@ -6,23 +6,23 @@ DIST_OUT	:= $(PATH_BIN)/$(DIST_MOD).tar.gz
 DIST_DEPS	:= $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com $(DIST_BIN)/ahello2.com
 
 $(DIST_BIN): | @init
-	$(call mb_mkdir,$(DIST_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_BIN))
 
 $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN)
-	$(call mb_conv_unix2dos,$<,$@)
+	$(call mb_make_call,mb_conv_unix2dos,$<,$@)
 MB_PROJ_PHASE_PROCESS_DEPS += $(DIST_BIN)/readme.txt
 
 $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 $(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 
 $(DIST_BIN)/@prepare: | $(DIST_DEPS)
 MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_BIN)/@prepare,"Prepare folder with binaries for distribution.") 
 .PHONY: $(DIST_BIN)/@prepare
 
 $(DIST_OUT): | $(DIST_BIN)/@prepare
-	$(call mb_create_dist,$(DIST_BIN),$@)
+	$(call mb_make_call,mb_create_dist,$(DIST_BIN),$@)
 MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_OUT),"Build archive distribution artifact.")
 MB_PROJ_PHASE_PACKAGE_DEPS += $(DIST_OUT)
diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk
index 1cabfd0..353c5c7 100644
--- a/src/make-on-msx/0module.mk
+++ b/src/make-on-msx/0module.mk
@@ -4,8 +4,8 @@ MAKE_ON_MSX_BIN   := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(P
 
 
 $(MAKE_ON_MSX_BIN): | @init
-	$(call mb_make_call,mb_mkdir,$(MAKE_ON_MSX_BIN))
-	$(call mb_make_call,mb_mkdir,$(MAKE_ON_MSX_BIN)/utils)
+	$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_make,$(MAKE_ON_MSX_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_macro80,$(MAKE_ON_MSX_BIN)/utils)
 	$(call mb_make_call,mb_msxhub_get_z80asmuk,$(MAKE_ON_MSX_BIN)/utils)
diff --git a/src/mbboot80/0module.mk b/src/mbboot80/0module.mk
index 2afc5b1..d9be67c 100644
--- a/src/mbboot80/0module.mk
+++ b/src/mbboot80/0module.mk
@@ -9,7 +9,7 @@ $(call mb_make_call_eval,mb_assert_flow_bdos_grep,$(MBBOOT80_BIN),check-boot80,m
 
 
 $(MBBOOT80_BIN)/@release-local: | $(MBBOOT80_BIN)/@build
-	$(call mb_copy,$(MBBOOT80_BIN)/mbboot80.com,lib/emuctl/mbboot80.com)
+	$(call mb_make_call,mb_os_file_copy,$(MBBOOT80_BIN)/mbboot80.com,lib/emuctl/mbboot80.com)
 MB_DOC_HELP_TARGET += $(call mb_make_call,mb_doc_target,$(MBBOOT80_BIN)/@release-local,"Updates binary copy in lib/emuctl folder.")
 .PHONY: $(MBBOOT80_BIN)/@release-local