diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_doc.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_doc.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk
diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_make.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_make.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make.mk
diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_make_call.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_call.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_make_call.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_call.mk
diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_make_check.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_check.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_make_check.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_check.mk
diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_make_xml.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_make_xml.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk
diff --git a/lib/make/काबा　सिस्टम　विस्तार/mb_xxx.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_xxx.mk
similarity index 100%
rename from lib/make/काबा　सिस्टम　विस्तार/mb_xxx.mk
rename to lib/make/सिस्टमₚᵣₐᵧToੴ/mb_xxx.mk
diff --git a/lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk
similarity index 100%
rename from lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk
rename to lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk
diff --git a/lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk
similarity index 100%
rename from lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk
rename to lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk
diff --git a/lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk
similarity index 100%
rename from lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk
rename to lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk
diff --git a/lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk
similarity index 100%
rename from lib/make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk
rename to lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk
diff --git a/lib/make/i18n/mb_i18n.mk b/lib/make/　i18n/mb_i18n.mk
similarity index 100%
rename from lib/make/i18n/mb_i18n.mk
rename to lib/make/　i18n/mb_i18n.mk
diff --git a/lib/make/i18n/mb_i18n_BASIC.mk b/lib/make/　i18n/mb_i18n_BASIC.mk
similarity index 100%
rename from lib/make/i18n/mb_i18n_BASIC.mk
rename to lib/make/　i18n/mb_i18n_BASIC.mk
diff --git a/lib/make/i18n/mb_i18n_iu.mk b/lib/make/　i18n/mb_i18n_iu.mk
similarity index 100%
rename from lib/make/i18n/mb_i18n_iu.mk
rename to lib/make/　i18n/mb_i18n_iu.mk
diff --git a/lib/make/i18n/mb_i18n_ja.mk b/lib/make/　i18n/mb_i18n_ja.mk
similarity index 100%
rename from lib/make/i18n/mb_i18n_ja.mk
rename to lib/make/　i18n/mb_i18n_ja.mk
diff --git a/lib/make/天房　系統　擴展/mb_autoexec.mk b/lib/make/天房系統擴展/mb_autoexec.mk
similarity index 100%
rename from lib/make/天房　系統　擴展/mb_autoexec.mk
rename to lib/make/天房系統擴展/mb_autoexec.mk
diff --git a/lib/make/天房　系統　擴展/mb_msxhub.mk b/lib/make/天房系統擴展/mb_msxhub.mk
similarity index 100%
rename from lib/make/天房　系統　擴展/mb_msxhub.mk
rename to lib/make/天房系統擴展/mb_msxhub.mk
diff --git a/lib/make/天房　系統　擴展/mb_msxpipe.mk b/lib/make/天房系統擴展/mb_msxpipe.mk
similarity index 100%
rename from lib/make/天房　系統　擴展/mb_msxpipe.mk
rename to lib/make/天房系統擴展/mb_msxpipe.mk
diff --git a/lib/make/天房　系統　擴展/mb_msxrom.mk b/lib/make/天房系統擴展/mb_msxrom.mk
similarity index 100%
rename from lib/make/天房　系統　擴展/mb_msxrom.mk
rename to lib/make/天房系統擴展/mb_msxrom.mk
diff --git a/lib/make/天房　系統　擴展/mb_openmsx.mk b/lib/make/天房系統擴展/mb_openmsx.mk
similarity index 100%
rename from lib/make/天房　系統　擴展/mb_openmsx.mk
rename to lib/make/天房系統擴展/mb_openmsx.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_0module.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_0module.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_assert.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_clone.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_clone.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_help.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_help.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_m80.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_m80.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_proj.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
diff --git a/lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_sdcc.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
similarity index 100%
rename from lib/make/𓃬　𓍄　𓋹𓀭/mb_flow_sdcc.mk
rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk
index 40f4613..d52d824 100644
--- a/lib/msxbuild.mk
+++ b/lib/msxbuild.mk
@@ -31,42 +31,42 @@ endef
 
 # Include full library grouped in functional blocks
 MB_@INCLUDE_CHAIN := @@include-parent
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_xxx.mk))
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_doc.mk))
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_make_call.mk))
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_make_check.mk))
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_make_xml.mk))
-$(eval $(call __mb_include,make/काबा　सिस्टम　विस्तार/mb_make.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_xxx.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_call.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_check.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk))
+$(eval $(call __mb_include,make/सिस्टमₚᵣₐᵧToੴ/mb_make.mk))
 @@include-libs:: $(MB_@INCLUDE_CHAIN) 
 MB_@INCLUDE_CHAIN := @@include-parent
-$(eval $(call __mb_include,make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk))
-$(eval $(call __mb_include,make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk))
-$(eval $(call __mb_include,make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk))
-$(eval $(call __mb_include,make/ᒥᑎᑲ　ᐱᓕᕆᔾᔪᓯᖅ　ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk))
+$(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk))
+$(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk))
+$(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk))
+$(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk))
 @@include-libs:: $(MB_@INCLUDE_CHAIN)
 MB_@INCLUDE_CHAIN := @@include-parent
-$(eval $(call __mb_include,make/天房　系統　擴展/mb_msxrom.mk))
-$(eval $(call __mb_include,make/天房　系統　擴展/mb_msxhub.mk))
-$(eval $(call __mb_include,make/天房　系統　擴展/mb_msxpipe.mk))
-$(eval $(call __mb_include,make/天房　系統　擴展/mb_openmsx.mk))
-$(eval $(call __mb_include,make/天房　系統　擴展/mb_autoexec.mk))
+$(eval $(call __mb_include,make/天房系統擴展/mb_msxrom.mk))
+$(eval $(call __mb_include,make/天房系統擴展/mb_msxhub.mk))
+$(eval $(call __mb_include,make/天房系統擴展/mb_msxpipe.mk))
+$(eval $(call __mb_include,make/天房系統擴展/mb_openmsx.mk))
+$(eval $(call __mb_include,make/天房系統擴展/mb_autoexec.mk))
 @@include-libs:: $(MB_@INCLUDE_CHAIN)
 MB_@INCLUDE_CHAIN := @@include-parent
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_0module.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_help.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_proj.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_assert.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_m80.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_sdcc.mk))
-$(eval $(call __mb_include,make/𓃬　𓍄　𓋹𓀭/mb_flow_clone.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_help.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk))
+$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk))
 @@include-libs:: $(MB_@INCLUDE_CHAIN)
 MB_@INCLUDE_CHAIN :=
 $(eval $(call __mb_include,make/mb_env.mk))
 $(eval $(call __mb_include,make/mb_flight.mk))
-$(eval $(call __mb_include,make/i18n/mb_i18n.mk))
+$(eval $(call __mb_include,make/　i18n/mb_i18n.mk))
 ifneq ("$(MB_I18N)", "off")
-$(if $(MB_I18N),$(if $(wildcard $(MB_@BASEPATH)make/i18n/mb_i18n_$(MB_I18N).mk),,$(error Unsupported i18n language code: $(MB_I18N))))
-$(if $(MB_I18N),$(eval include $(MB_@BASEPATH)make/i18n/mb_i18n_$(MB_I18N).mk))
+$(if $(MB_I18N),$(if $(wildcard $(MB_@BASEPATH)make/　i18n/mb_i18n_$(MB_I18N).mk),,$(error Unsupported i18n language code: $(MB_I18N))))
+$(if $(MB_I18N),$(eval include $(MB_@BASEPATH)make/　i18n/mb_i18n_$(MB_I18N).mk))
 endif
 @include:: $(MB_@INCLUDE_CHAIN)
 MB_@INCLUDE_CHAIN :=