diff --git a/.gitignore b/.gitignore
index b25c15b81fae06e1c55946ac6270bfdb293870e8..0d67f1fe407a15192b75255343e7aa4f93bc89f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *~
+language/de-DE/de-DE.plg_system_vmAutoParentCategories.ini
+language/en-GB/en-GB.plg_system_vmAutoParentCategories.ini
diff --git a/Makefile b/Makefile
index 2ecb9f0d733a9680a5dca37e3a400b9f5efc27f9..c7e41f50689b812d8072deb4efc86555d26d94a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,23 @@
 BASE=vmAutoParentCategories
 PLUGINTYPE=system
-VERSION=1.1
+VERSION=1.2
 
 PLUGINFILES=$(BASE).php $(BASE).xml index.html
-# TRANSDIR=../../../administrator/language/
-# TRANSLATIONS=$(call wildcard,$(TRANSDIR)/*/*.plg_$(PLUGINTYPE)_$(BASE).sys.ini)
-TRANSLATIONS=$(call wildcard,*.plg_$(PLUGINTYPE)_$(BASE).*ini)
+
+SYSTRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*sys.ini)
+NONSYSTRANSLATIONS=${SYSTRANSLATIONS:%.sys.ini=%.ini}
+TRANSLATIONS=$(SYSTRANSLATIONS) $(NONSYSTRANSLATIONS) $(call wildcard,language/*/index.html) language/index.html
 ZIPFILE=plg_$(PLUGINTYPE)_$(BASE)_v$(VERSION).zip
 
-zip: $(PLUGINFILES) $(TRANSLATIONS)
+all: zip
+
+$(NONSYSTRANSLATIONS): %.ini: %.sys.ini
+	cp $< $@
+
+zip: $(PLUGINFILES) $(TRANSLATIONS) $(SYSTRANSLATIONS) $(NONSYSTRANSLATIONS)
 	@echo "Packing all files into distribution file $(ZIPFILE):"
 	@zip -r $(ZIPFILE) $(PLUGINFILES) 
-	@zip -r --junk-paths $(ZIPFILE) $(TRANSLATIONS)
+	@zip -r $(ZIPFILE) $(TRANSLATIONS)
 
 clean:
 	rm -f $(ZIPFILE)
diff --git a/de-DE.plg_system_vmAutoParentCategories.sys.ini b/language/de-DE/de-DE.plg_system_vmAutoParentCategories.sys.ini
similarity index 83%
rename from de-DE.plg_system_vmAutoParentCategories.sys.ini
rename to language/de-DE/de-DE.plg_system_vmAutoParentCategories.sys.ini
index c4f937d65507424f9e65cc1a191bea0ea092d7d7..262b91a3296f76c0a4bbfae5601a25b0623559b4 100644
--- a/de-DE.plg_system_vmAutoParentCategories.sys.ini
+++ b/language/de-DE/de-DE.plg_system_vmAutoParentCategories.sys.ini
@@ -3,7 +3,7 @@
 ; @Website : http://kainhofer.com
 ; @license - http://www.gnu.org/licenses/gpl.html GNU/GPL 
 
-VMAUTOCATEGORIES_DESCRIPTION="<h2>Virtuemart 2 automatische Produktkategorien Plugin</h2><p style='font-weight: normal'>Dieses Plugin kann den VirtueMart Produkten automatische alle übergeordneten Kategorien des Produkts zuweisen, oder all übergeordneten Kategorien entfernen. Ebenso können bei Produktvarianten die Kategorien des übergeordneten Produkts zugeordnet, oder alle Kategorien entfernt werden.</p><p style='font-weight: normal'>Um das Plugin manuell auszuführen, <a href="_QQ_"?vmAutoParentCategories=run"_QQ_">klicken Sie hier</a> (dazu muss das Plugin aber auch aktiviert sein!).</p>"
+VMAUTOCATEGORIES_DESCRIPTION="<h2>Virtuemart 2 automatische Produktkategorien Plugin</h2><p style='font-weight: normal'>Dieses Plugin kann den VirtueMart Produkten automatische alle übergeordneten Kategorien des Produkts zuweisen, oder all übergeordneten Kategorien entfernen. Ebenso können bei Produktvarianten die Kategorien des übergeordneten Produkts zugeordnet, oder alle Kategorien entfernt werden.</p><p style='font-weight: normal'>Um das Plugin manuell auszuführen, <a href='?vmAutoParentCategories=run'>klicken Sie hier</a> (dazu muss das Plugin aber auch aktiviert sein!).</p>"
 
 VMAUTOCATEGORIES_RUN="Führe Plugin aus:"
 VMAUTOCATEGORIES_RUN_DESC="Wählen Sie aus, wann das Plugin ausgeführt wird und die Kategorien der VirtueMart Produkte modifiziert."
@@ -42,8 +42,8 @@ VMAUTOCATEGORIES_PROGRESS_NOTAPPLIED="Änderungen aufgrund der Plugin-Einstellun
 
 VMAUTOCATEGORIES_DEBUG_LOADCATS="%s Kategorien geladen."
 VMAUTOCATEGORIES_DEBUG_LOADPRODUCTS="%s Produkte geladen."
-VMAUTOCATEGORIES_DEBUG_ARTICLE_MODIFIED="Produkt "_QQ_"%s"_QQ_" (SKU %s) modifiziert: %d Kategorien hinzugefügt, %d Kategorien entfernt."
-VMAUTOCATEGORIES_DEBUG_ARTICLE_NOT_MODIFIED="Produkt "_QQ_"%s"_QQ_" (SKU %s) nicht modifiziert."
-VMAUTOCATEGORIES_DEBUG_CHILD_MODIFIED="Produktvariante "_QQ_"%s"_QQ_" (SKU %s) modifiziert: %d Kategorien hinzugefügt, %d Kategorien entfernt."
-VMAUTOCATEGORIES_DEBUG_CHILD_NOT_MODIFIED="Produktvariante "_QQ_"%s"_QQ_" (SKU %s) nicht modifiziert."
+VMAUTOCATEGORIES_DEBUG_ARTICLE_MODIFIED="Produkt '%s' (SKU %s) modifiziert: %d Kategorien hinzugefügt, %d Kategorien entfernt."
+VMAUTOCATEGORIES_DEBUG_ARTICLE_NOT_MODIFIED="Produkt '%s' (SKU %s) nicht modifiziert."
+VMAUTOCATEGORIES_DEBUG_CHILD_MODIFIED="Produktvariante '%s' (SKU %s) modifiziert: %d Kategorien hinzugefügt, %d Kategorien entfernt."
+VMAUTOCATEGORIES_DEBUG_CHILD_NOT_MODIFIED="Produktvariante '%s' (SKU %s) nicht modifiziert."
 VMAUTOCATEGORIES_DEBUG_CATEGORYMODIFICATIONS="    Hinzugefügte Kategorien: %s. Entfernte Kategorien: %s."
diff --git a/language/de-DE/index.html b/language/de-DE/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa6d84e8055f58f12115ac3e90a0ddb2216227ae
--- /dev/null
+++ b/language/de-DE/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/en-GB.plg_system_vmAutoParentCategories.sys.ini b/language/en-GB/en-GB.plg_system_vmAutoParentCategories.sys.ini
similarity index 83%
rename from en-GB.plg_system_vmAutoParentCategories.sys.ini
rename to language/en-GB/en-GB.plg_system_vmAutoParentCategories.sys.ini
index 32bb6af5ba6ab00c6a43e551f8ca21c00faa4a81..65acacd80a45de07d889166a4bdac4820de092ad 100644
--- a/en-GB.plg_system_vmAutoParentCategories.sys.ini
+++ b/language/en-GB/en-GB.plg_system_vmAutoParentCategories.sys.ini
@@ -3,7 +3,7 @@
 ; @Website : http://kainhofer.com
 ; @license - http://www.gnu.org/licenses/gpl.html GNU/GPL 
 
-VMAUTOCATEGORIES_DESCRIPTION="<h2>Virtuemart 2 Auto Product Categories plugin</h2><p style='font-weight: normal'>Automatically add VirtueMart products to all parent categories of the categories assigned to it, or remove all parent categories. Additionally, child products can also be adjusted with their parents' categories, or removed from all categories.</p><p style='font-weight: normal'>To call the plugin explicitly, <a href="_QQ_"?vmAutoParentCategories=run"_QQ_">click here</a> (will only work if the plugin is enabled!).</p>"
+VMAUTOCATEGORIES_DESCRIPTION="<h2>Virtuemart 2 Auto Product Categories plugin</h2><p style='font-weight: normal'>Automatically add VirtueMart products to all parent categories of the categories assigned to it, or remove all parent categories. Additionally, child products can also be adjusted with their parents' categories, or removed from all categories.</p><p style='font-weight: normal'>To call the plugin explicitly, <a href='?vmAutoParentCategories=run'>click here</a> (will only work if the plugin is enabled!).</p>"
 
 VMAUTOCATEGORIES_RUN="Run plugin on:"
 VMAUTOCATEGORIES_RUN_DESC="Select when the plugin shall be run and automatically modify the VirtueMart categories of your products."
@@ -42,8 +42,8 @@ VMAUTOCATEGORIES_PROGRESS_NOTAPPLIED="Changes not applied due to configuration s
 
 VMAUTOCATEGORIES_DEBUG_LOADCATS="Loaded %s categories."
 VMAUTOCATEGORIES_DEBUG_LOADPRODUCTS="Loaded %s products."
-VMAUTOCATEGORIES_DEBUG_ARTICLE_MODIFIED="Product "_QQ_"%s"_QQ_" (SKU %s) modified: added %d categories, removed %d categories."
-VMAUTOCATEGORIES_DEBUG_ARTICLE_NOT_MODIFIED="Product "_QQ_"%s"_QQ_" (SKU %s) was not modified."
-VMAUTOCATEGORIES_DEBUG_CHILD_MODIFIED="Child product "_QQ_"%s"_QQ_" (SKU %s) modified: added %d categories, removed %d categories."
-VMAUTOCATEGORIES_DEBUG_CHILD_NOT_MODIFIED="Child product "_QQ_"%s"_QQ_" (SKU %s) not modified."
+VMAUTOCATEGORIES_DEBUG_ARTICLE_MODIFIED="Product '%s' (SKU %s) modified: added %d categories, removed %d categories."
+VMAUTOCATEGORIES_DEBUG_ARTICLE_NOT_MODIFIED="Product '%s' (SKU %s) was not modified."
+VMAUTOCATEGORIES_DEBUG_CHILD_MODIFIED="Child product '%s' (SKU %s) modified: added %d categories, removed %d categories."
+VMAUTOCATEGORIES_DEBUG_CHILD_NOT_MODIFIED="Child product '%s' (SKU %s) not modified."
 VMAUTOCATEGORIES_DEBUG_CATEGORYMODIFICATIONS="    Hinzugefügte Kategorien: %s. Entfernte Kategorien: %s."
diff --git a/language/en-GB/index.html b/language/en-GB/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa6d84e8055f58f12115ac3e90a0ddb2216227ae
--- /dev/null
+++ b/language/en-GB/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/language/index.html b/language/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa6d84e8055f58f12115ac3e90a0ddb2216227ae
--- /dev/null
+++ b/language/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/releases/plg_system_vmAutoParentCategories_v1.2.zip b/releases/plg_system_vmAutoParentCategories_v1.2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..10c475669d2ce15df7247d803094d88d3cc0c593
Binary files /dev/null and b/releases/plg_system_vmAutoParentCategories_v1.2.zip differ
diff --git a/vmAutoParentCategories.xml b/vmAutoParentCategories.xml
index 9105823c17c49e65c1757eccb0763bc2d845a79a..74f51059571b77ce2a13a77057aeab3e5f673c33 100644
--- a/vmAutoParentCategories.xml
+++ b/vmAutoParentCategories.xml
@@ -12,21 +12,22 @@
 
 	<files>
 		<filename plugin="vmAutoParentCategories">vmAutoParentCategories.php</filename>
-		<filename plugin="vmAutoParentCategories">index.html</filename>
+		<filename>index.html</filename>
+		<folder>language</folder>
 	</files> 
-	<languages>
-	   <language tag="en-GB">en-GB.plg_system_vmAutoParentCategories.sys.ini</language>
-	   <language tag="de-DE">de-DE.plg_system_vmAutoParentCategories.sys.ini</language>
+	<languages folder="language">
+	   <language tag="en-GB">en-GB/en-GB.plg_system_vmAutoParentCategories.ini</language>
+	   <language tag="en-GB">en-GB/en-GB.plg_system_vmAutoParentCategories.sys.ini</language>
+	   <language tag="de-DE">de-DE/de-DE.plg_system_vmAutoParentCategories.ini</language>
+	   <language tag="de-DE">de-DE/de-DE.plg_system_vmAutoParentCategories.sys.ini</language>
 	</languages>
-
+<!-- 	Joomla 2.5 -->
 	<config>
 		<fields name="params">
 		
 			<fieldset name="basic">
 				<field name="run_trigger" type="list" default="never" label="VMAUTOCATEGORIES_RUN" description ="VMAUTOCATEGORIES_RUN_DESC" >
 					<option value="never">VMAUTOCATEGORIES_RUN_NEVER</option>
-<!-- 					<option value="backend-login">VMAUTOCATEGORIES_RUN_BACKEND_LOGIN</option> -->
-<!-- 					<option value="frontend-login">VMAUTOCATEGORIES_RUN_FRONTEND_LOGIN</option> -->
 					<option value="virtuemart_startpage">VMAUTOCATEGORIES_RUN_VM_STARTPAGE</option>
 					<option value="virtuemart_products">VMAUTOCATEGORIES_RUN_VM_PRODUCTPAGE</option>
 				</field>
@@ -55,6 +56,38 @@
 			</fieldset>
 		</fields>
 	</config>
+	
+<!-- 	Joomla 1.5 -->
+	<params>
+		<param name="run_trigger" type="list" default="never" label="VMAUTOCATEGORIES_RUN" description ="VMAUTOCATEGORIES_RUN_DESC" >
+			<option value="never">VMAUTOCATEGORIES_RUN_NEVER</option>
+			<option value="virtuemart_startpage">VMAUTOCATEGORIES_RUN_VM_STARTPAGE</option>
+			<option value="virtuemart_products">VMAUTOCATEGORIES_RUN_VM_PRODUCTPAGE</option>
+		</param>
+		<param name="normal_products" type="list" default="nothing" label="VMAUTOCATEGORIES_NORMAL_PRODUCTS" description ="VMAUTOCATEGORIES_NORMAL_PRODUCTS_DESC" >
+			<option value="nothing">VMAUTOCATEGORIES_DO_NOTHING</option>
+			<option value="add_parents">VMAUTOCATEGORIES_ADD_PARENTS</option>
+			<option value="add_two_leaves">VMAUTOCATEGORIES_ADD_ONE_PARENT</option>
+			<option value="remove_except_leaf">VMAUTOCATEGORIES_REMOVE_EXCEPT_LEAF</option>
+		</param>
+		<param name="child_products"  type="list" default="nothing" label="VMAUTOCATEGORIES_CHILD_PRODUCTS" description ="VMAUTOCATEGORIES_CHILD_PRODUCTS_DESC" >
+			<option value="nothing">VMAUTOCATEGORIES_DO_NOTHING</option>
+			<option value="copy_parent">VMAUTOCATEGORIES_COPY_CATEGORIES_FROM_PARENT</option>
+			<option value="remove_all">VMAUTOCATEGORIES_REMOVE_ALL</option>
+			<option value="add_parents">VMAUTOCATEGORIES_ADD_PARENTS</option>
+			<option value="add_two_leaves">VMAUTOCATEGORIES_ADD_ONE_PARENT</option>
+			<option value="remove_except_leaf">VMAUTOCATEGORIES_REMOVE_EXCEPT_LEAF</option>
+		</param>
+		<param name="debug"  type="list" default="report_changes" label="VMAUTOCATEGORIES_DEBUG" description ="VMAUTOCATEGORIES_DEBUG_DESC" >
+			<option value="no_output">VMAUTOCATEGORIES_DBG_NO_OUTPUT</option>
+			<option value="report_changes">VMAUTOCATEGORIES_DBG_REPORT_CHANGES</option>
+			<option value="report_always">VMAUTOCATEGORIES_DBG_REPORT_ALWAYS</option>
+			<option value="report_no_change">VMAUTOCATEGORIES_DBG_REPORT_NO_CHANGES</option>
+			<option value="debug">VMAUTOCATEGORIES_DBG_DEBUG</option>
+			<option value="debug_no_changes">VMAUTOCATEGORIES_DBG_DEBUG_NO_CHANGES</option>
+		</param>
+	</params>
+
 </install>