diff --git a/ordernumber.script.php b/ordernumber.script.php
index caa5f2011d8fb1bda1a373b947752db5cfa26079..5a27f138e9acbe8bdc48832004d9b8b572ec2f6e 100644
--- a/ordernumber.script.php
+++ b/ordernumber.script.php
@@ -60,7 +60,7 @@ class plgVmShopperOrdernumberInstallerScript
     public function install(JAdapterInstance $adapter)
     {
         // enabling plugin
-        $db =& JFactory::getDBO();
+        $db = JFactory::getDBO();
         $db->setQuery('update #__extensions set enabled = 1 where type = "plugin" and element = "ordernumber" and folder = "vmshopper"');
         $db->query();
         
diff --git a/plugins/template/Makefile b/plugins/template/Makefile
index 07f453fbe73c76d9a108b0a63a3b8d75042925a4..361f0ba28a0f227bc3c2eeac304056b4fc112131 100644
--- a/plugins/template/Makefile
+++ b/plugins/template/Makefile
@@ -1,19 +1,20 @@
 BASE=YOUR_PLUGIN_NAME
-PLUGINTYPE=vmshipmentrules
-ZIPBASE=opentools_vmshipmentrules
+PLUGINTYPE=vmshopper
+ZIPBASE=opentools_vmshopper
 VERSION=1.0
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 
 TRANSLATIONS=$(call wildcard,language/en*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
 INDEXFILES=language/index.html $(call wildcard,language/**/index.html)
+FIELDS=$(call wildcard,fields/*)
 ZIPFILE=plg_$(ZIPBASE)_$(BASE)_v$(VERSION).zip
 
 all: zip
 
 zip: $(PLUGINFILES) $(TRANSLATIONS) $(ADVANCEDFILES) $(INDEXFILES)
 	@echo "Packing all files into distribution file $(ZIPFILE):"
-	@zip -r $(ZIPFILE) $(PLUGINFILES) $(TRANSLATIONS) $(INDEXFILES)
+	@zip -r $(ZIPFILE) $(PLUGINFILES) $(TRANSLATIONS) $(INDEXFILES) $(FIELDS)
 
 clean:
 	rm -f $(ZIPFILE)
diff --git a/plugins/template/YOUR_PLUGIN_NAME.php b/plugins/template/YOUR_PLUGIN_NAME.php
index 8f4479362e2e9c7818d205240cfc563510dce50a..2286201fe9d8e751f529dd8b5d80fe141f61a7cc 100644
--- a/plugins/template/YOUR_PLUGIN_NAME.php
+++ b/plugins/template/YOUR_PLUGIN_NAME.php
@@ -5,7 +5,6 @@ defined ('_JEXEC') or die('Restricted access');
 /**
  * Plugin providing Custom variables for the VM Ordernumber plugin
  *
- * @subpackage Plugins - VmShipmentRules
  * @copyright Copyright (C) 2014 Reinhold Kainhofer, office@open-tools.net
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
  * VirtueMart is free software. This version may have been modified pursuant
@@ -17,13 +16,14 @@ defined ('_JEXEC') or die('Restricted access');
  * http://open-tools.net/
  *
  */
-if (!class_exists ('VmPlugin')) {
-	require(JPATH_VM_PLUGINS . DS . 'vmplugin.php');
-}
+if (!class_exists('vmShopperPlugin')) 
+    require(JPATH_VM_PLUGINS . DS . 'vmshopperplugin.php');
 
-/** Extension plugin for the Odernumber plugin for VirtueMart
+/** Extension plugin for the Ordernumber plugin for VirtueMart
  */
-class plgVmShopperYOUR_PLUGIN_NAME extends VmPlugin {
+class plgVmShopperYOUR_PLUGIN_NAME extends VmShopperPlugin {
+    // Unfortunately, this dummy function needs to be implementd, because it's abstract in the parent class!
+    public function plgVmOnUpdateOrderBEShopper($_orderID) {}
 	/**  Trigger to add variables to be used in the number formats
 	  *  You can add new variables to the $cartvals array or modify existing ones. They will be directly 
 	  *  available in all formats. This trigger will be called whenever the ordernumber plugin creates a 
diff --git a/plugins/template/YOUR_PLUGIN_NAME.script.php b/plugins/template/YOUR_PLUGIN_NAME.script.php
index c8f161286ab145e51059235c9269c121245e5601..e861c4d9bb3839a96252d54f3cc56a8506808dfd 100644
--- a/plugins/template/YOUR_PLUGIN_NAME.script.php
+++ b/plugins/template/YOUR_PLUGIN_NAME.script.php
@@ -49,7 +49,7 @@ class plgVmShopperYOUR_PLUGIN_NAMEInstallerScript
     public function install(JAdapterInstance $adapter)
     {
         // enabling plugin upon installation
-        $db =& JFactory::getDBO();
+        $db = JFactory::getDBO();
         $db->setQuery('update #__extensions set enabled = 1 where type = "plugin" and element = "YOUR_PLUGIN_NAME" and folder = "vmshopper"');
         $db->query();
         
diff --git a/plugins/template/YOUR_PLUGIN_NAME.xml b/plugins/template/YOUR_PLUGIN_NAME.xml
index e857e9ce49c6f9b2305df641dab620f63327dadb..06828b4b217ee189a7171d556c65741694f831f4 100644
--- a/plugins/template/YOUR_PLUGIN_NAME.xml
+++ b/plugins/template/YOUR_PLUGIN_NAME.xml
@@ -18,10 +18,7 @@
     </languages>
     <scriptfile>YOUR_PLUGIN_NAME.script.php</scriptfile>
 
-    <!-- VM 3.x support (fields rather than params): -->
-    <vmconfig></vmconfig>
-
-    <!-- VM 2.0 support (params rather than fields): -->
-    <params></params>
+    <!-- Joomla 2.x and 3.x support (fields rather than params): -->
+    <config></config>
 
 </extension>