diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index 3e7dc79..572edc6 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -42,6 +42,23 @@ binUIHeader.bmp	UIHeader.bmp
 	copy /y $** $@ > NUL
 
 
+######################################################################
+# Component
+
+All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Component	ComponentId	Directory_	Attributes	Condition	KeyPath
+s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
+Component	Component
+compwxstd.mo.sl_SI	{A5FEEA94-08CA-4E12-993F-A115601EF258}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.sl_SI
+compLocalizationRepositoryPath	{0E96110A-C38D-4600-9AE2-B8B59AF53A00}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLocalizationRepositoryPath
+compLanguage	{B78359AC-9484-402C-8384-3A4595B39389}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLanguage
+<<NOKEEP
+
+
 ######################################################################
 # Control
 
@@ -117,6 +134,8 @@ ZRCOLABINDIR	ZRCOLADIR	.:X64~1.DEB|x64.Debug
 !ELSEIF "$(PLAT)" == "x64"   && "$(CFG)" == "Release"
 ZRCOLABINDIR	ZRCOLADIR	.:X64~1.REL|x64.Release
 !ENDIF
+ZRCOLALOCDIR	ZRCOLADIR	locale
+ZRCOLALOCSLSIDIR	ZRCOLALOCDIR	sl_SI
 <<NOKEEP
 
 "En.$(PLAT).$(CFG).Directory-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
@@ -141,6 +160,21 @@ ZRCOLADIR	PROGRAMFILESDIR	ZRCola:.
 	rcxgettext.exe idtp $@ $**
 
 
+######################################################################
+# File
+
+All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
+File	File
+filewxstd.mo.sl_SI	compwxstd.mo.sl_SI	wxstd.mo	0		0	0	1
+<<NOKEEP
+
+
 ######################################################################
 # InstallExecuteSequence
 
@@ -207,6 +241,44 @@ SecureCustomProperties	OLDPRODUCTFOUND;NEWPRODUCTFOUND
 <<NOKEEP
 
 
+######################################################################
+# Registry
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Registry-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Registry-2.idt"
+
+"$(LANG).$(PLAT).$(CFG).Registry-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Registry	Root	Key	Name	Value	Component_
+s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
+Registry	Registry
+regLocalizationRepositoryPath	2	SOFTWARE\Amebis\ZRCola	LocalizationRepositoryPath	[ZRCOLALOCDIR]	compLocalizationRepositoryPath
+<<NOKEEP
+
+"En.$(PLAT).$(CFG).Registry-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Registry	Root	Key	Name	Value	Component_
+s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
+1252	Registry	Registry
+regLanguage	1	SOFTWARE\Amebis\ZRCola	Language	#58	compLanguage
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
 ######################################################################
 # Build MSM module!
 ######################################################################
diff --git a/MSI/include/MSIBuildCfg.mak b/MSI/include/MSIBuildCfg.mak
index 5a469ef..aac2aed 100644
Binary files a/MSI/include/MSIBuildCfg.mak and b/MSI/include/MSIBuildCfg.mak differ
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index fdad9f1..7548ebf 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -74,6 +74,7 @@ compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		file
 !IF "$(PLAT)" == "x64"
 compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
 !ENDIF
+compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 <<NOKEEP
 
 
@@ -115,9 +116,15 @@ All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt"
 Feature_	Component_
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 FeatureComponents	Feature_	Component_
+featZRCola	compZRCola.exe.$(PLAT)
+featZRCola	compZRCola.mo.sl_SI
 featZRCola	complibZRCola.dll.$(PLAT)
 featZRCola	complibZRColaUI.dll.$(PLAT)
-featZRCola	compZRCola.exe.$(PLAT)
+featZRCola	compwxExtend.dll.$(PLAT)
+featZRCola	compwxExtend.mo.sl_SI
+featZRCola	compwxstd.mo.sl_SI
+featZRCola	compLocalizationRepositoryPath
+featZRCola	compLanguage
 <<NOKEEP
 
 
@@ -133,6 +140,7 @@ File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
 File	File
 fileZRCola.exe.$(PLAT)	compZRCola.exe.$(PLAT)	ZRCola.exe	0		0	1536	1
+fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		0	0	1
 <<NOKEEP