diff --git a/Makefile b/Makefile
index 7398fdb80d796921437023f3d51a56099820f648..ab4452a560e8e52cebae70d4d65830cb085b17ef 100644
--- a/Makefile
+++ b/Makefile
@@ -25,12 +25,8 @@
COMPONENT = DisplayManager
TARGET = Display
ROM_SOURCE = GetAll.s
-
-#RESOURCEEXTRA = resources_templates
-RESOURCEEXTRA = resources_templrate
-
-resources_templrate ::
- ${CP} LocalRes:TemplRate ${RESFSDIR}.Templates ${CPFLAGS}
+INSTRES_FILES = Templates
+INSTRES_VERSION = Messages
include StdTools
include AAsmModule
diff --git a/Resources/Germany/Messages b/Resources/Germany/Messages
index e8d2f9ce2632ba2eb713002f28d7ddcfc0901745..3395c956cb40bfb1a6ecc6e331828ad97d79140f 100644
Binary files a/Resources/Germany/Messages and b/Resources/Germany/Messages differ
diff --git a/Resources/UK/TemplRate,fec b/Resources/UK/TemplRate,fec
deleted file mode 100644
index 1fd4e53df5afdea1ac72e8edca484c32f96adfe7..0000000000000000000000000000000000000000
Binary files a/Resources/UK/TemplRate,fec and /dev/null differ
diff --git a/Resources/UK/Templates,fec b/Resources/UK/Templates,fec
index 680edb255481ac1eb1eae51100eba194e7104a62..1fd4e53df5afdea1ac72e8edca484c32f96adfe7 100644
Binary files a/Resources/UK/Templates,fec and b/Resources/UK/Templates,fec differ
diff --git a/s/Window b/s/Window
index 63e814f80cafb91e02d8e508a0f5b3a085a7b06a..642cfaf13652c5c01f3a2c237f4e26fdbae77411 100644
--- a/s/Window
+++ b/s/Window
@@ -130,23 +130,10 @@ patch_info_version
LDR r2, [r1, #w_icons+i_size*ic_info_version+i_data+0]
LDR r3, [r1, #w_icons+i_size*ic_info_version+i_data+8]
ADR r1, Version_tag
- [ :DEF: use_messages_version
BL MsgTrans_Lookup
EXIT
-Version_tag DCB "Version",0
- |
-10 LDRB lr, [r1], #1
- STRB lr, [r2], #1
- TEQ lr, #0
- SUBNES r3, r3, #1
- BNE %BT10
-
- MOV lr, #0
- STRB lr, [r2, #-1]
- EXIT
-Version_tag DCB "$Module_MajorVersion ($Module_ApplicationDate)", 0
- ]
+Version_tag DCB "_Version",0
ALIGN