diff --git a/Makefile b/Makefile
index 42aa07cabe3bca5400d30159b898ca614053f692..af8f7c7fc4882a5ccb667716ee104e28e4cd01ae 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ VERSION=1.0
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 
-TRANSLATIONS=$(call wildcard,*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
+TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) language/index.html $(call wildcard,language/*/index.html)
 INDEXFILES=$(BASE)/index.html
 TMPLFILES=$(call wildcard,$(BASE)/tmpl/*.php) $(BASE)/index.html $(BASE)/tmpl/index.html
-ASSETS=$(call wildcard,assets/*.png) $(call wildcard,assets/*.css) 
+ASSETS=$(call wildcard,$(BASE)/assets/*.png) $(call wildcard,$(BASE)/assets/*.css) 
 # assets/index.html
 ZIPFILE=plg_$(PLUGINTYPE)_$(BASE)_v$(VERSION).zip
 
diff --git a/acy_subscribe_buyer.php b/acy_subscribe_buyer.php
index 493ccab1da9da4722e8a22640f695e86ff505a98..d2b412cc0a23a4edd6028bb255cd98f8360a19fe 100644
--- a/acy_subscribe_buyer.php
+++ b/acy_subscribe_buyer.php
@@ -16,18 +16,19 @@ defined('_JEXEC') or 	die( 'Direct Access to ' . basename( __FILE__ ) . ' is not
  */
 if (!class_exists('vmCustomPlugin')) require(JPATH_VM_PLUGINS . DS . 'vmcustomplugin.php');
 if(!include_once(rtrim(JPATH_ADMINISTRATOR,DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'components'.DIRECTORY_SEPARATOR.'com_acymailing'.DIRECTORY_SEPARATOR.'helpers'.DIRECTORY_SEPARATOR.'helper.php')){
-	echo 'This plugin requires the AcyMailing Component to be installed';
-	return;
-};
+	JFactory::getApplication()->enqueueMessage(JText::_('VMCUSTOM_ACYBUYER_ACYMAILING_NEEDED'), 'error');
+} else {
 
 class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 
 	function __construct(& $subject, $config) {
 		parent::__construct($subject, $config);
 		$varsToPush = array(
+			'subscribe_buyers'=>array(-1, 'int'),
+			'subscribe_buyers_default'=>array(1, 'int'),
+			'allow_subscribe'=>array(-1, 'int'),
+			'allow_subscribe_default'=>array(0, 'int'),
 			'lists'=>array(array(), 'array'),
-			'subscribe_buyers'=>array(1, 'int'),
-			'allow_subscribe'=>array(1, 'int'),
 		);
 		$this->setConfigParameterable('custom_params',$varsToPush);
 	}
@@ -41,40 +42,29 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 	}
 
 	function getAcyMailinglists() {
-		$q ="SELECT `listid`, `name` FROM `#__acymailing_list` ORDER BY `name` DESC ";
-		$db =& JFactory::getDBO();	
-		$db->setQuery($q);
-		return $db->loadAssocList('listid', 'name');
+		$listClass = acymailing_get('class.list');
+		$allLists = $listClass->getLists();
+		return (array)$allLists;
 	}
 	function getAcyListname($listid) {
-		$q ="SELECT `name` FROM `#__acymailing_list` WHERE `listid`=".(int)$listid;
-		$db =& JFactory::getDBO();	
-		$db->setQuery($q);
-		return $db->loadResult();
+		$listClass = acymailing_get('class.list');
+		$list = $listClass->get($listid);
+		return ($list?$list->name:'');
 	}
 	
-	function getAcyUidFromUser ($userid) {
-		if (!($userid>0)) return null;
-		$q = "SELECT `subid` FROM `#__acymailing_subscriber` WHERE `userid`='".(int)$userid."'";
-		$db = &JFactory::getDBO();
-		$db->setQuery($q);
-		return $db->loadResult();
-	}
-	function getAcyUidFromEmail ($email) {
-		if (empty($email)) return null;
-		$db = &JFactory::getDBO();
-		$q = "SELECT `subid` FROM `#__acymailing_subscriber` WHERE `email` COLLATE utf8_general_ci = '".$db->escape($email)."'";
-		$db->setQuery($q);
-		return $db->loadResult();
+	function getAcyUid ($userIDorMail) {
+		$subscriberClass = acymailing_get('class.subscriber');
+		return $subscriberClass->subid ($userIDorMail);
 	}
 	/** Returns all listid, to which the AcyMailing user is subscribed */
-	function getUserSubscriptions ($uid) {
-		if (!($uid>0)) return array();
-		$db = &JFactory::getDBO();
-		$q = "SELECT `listid` FROM `#__acymailing_listsub` WHERE `subid` = '".(int)$uid."' AND `status`='1'";
-		$db->setQuery($q);
-		$subscribed = $db->loadColumn();
-		return $subscribed;
+	function getUserSubscriptions ($subid) {
+		if (!($subid>0)) return array();
+		$listsubClass = acymailing_get('class.listsub');
+		$subscriptions = array();
+		foreach ($listsubClass->getSubscription($subid) as $l) {
+			if ($l->status == 1) $subscriptions[] = $l->listid;
+		}
+		return $subscriptions;
 	}
 	/** Creates a new AcyMailing user for the given name/email/uid */
 	function addAcyUser ($name, $email, $uid) {
@@ -83,34 +73,23 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 			$q = "SELECT `id`, `name`, `email` FROM `#__users` WHERE `id`=".(int)$uid;
 			$db->setQuery($q);
 			$userinfo = $db->loadObject();
-			if (empty($email)) 
-				$email = $userinfo->email;
-			if (empty($name))
-				$name = $userinfo->name;
-		}
-		$q = "INSERT IGNORE INTO `#__acymailing_subscriber` (`email`, `userid`, `name`, `created`, `confirmed`, `enabled`, `accept`, `html`) 
-		      VALUES ('".$db->escape($email)."', ".(int)$uid.", '".$db->escape($name)."', ".time().", 1, 1, 1, 1)";
-		$db->setQuery($q);
-		$db->query();
-		$err = $db->getErrorMsg();
-		if (!empty($err)) {
-			JFactory::getApplication()->enqueueMessage(JText::sprintf('VMCUSTOM_ACYBUYER_SQL_ERROR', $err), 'error');
-			print("<pre>SQL error: sql=$q, <br/>error: ".$err."</pre>");
-			return 0;
+			if (empty($email)) $email = $userinfo->email;
+			if (empty($name))  $name = $userinfo->name;
 		}
-		return $db->insertid();
+		$myUser = array ('email' => $email, 'name' => $name, 'confirmed' => 1, 'enabled' => 1, 'accept' => 1, 'html' => 1);
+		$subscriberClass = acymailing_get('class.subscriber');
+		$subid = $subscriberClass->save((object)$myUser);
+		return $subid;
 	}
 	/** Adds the acy user to all the given lists (the subscriber has already been created). If the user has unsubscribed, he will not be subscribed again! */
 	function subscribeUser ($acyuid, $lists) {
-		$db = &JFactory::getDBO();
+		if (empty($lists)) return;
+		$subscriberClass = acymailing_get('class.subscriber');
+		$newSubscription=array();
 		foreach ($lists as $l) {
-			$q = "INSERT IGNORE INTO `#__acymailing_listsub` 
-			      (`listid`, `subid`, `subdate`, `status`)
-			      VALUES
-			      (".(int)$l.", ".(int)$acyuid.", ".time().", 1)";
-			$db->setQuery($q);
-			$db->query();
+			$newSubscription[$l] = array ('status'=>1);
 		}
+		$subscriberClass->saveSubscription($acyuid, $newSubscription);
 	}
 
 	/**
@@ -119,19 +98,36 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 	 */
 	function plgVmOnProductEdit($field, $product_id, &$row,&$retValue) {
 		if ($field->custom_element != $this->_name) return '';
-		
 		$this->parseCustomParams($field);
 		$html = '';
 		$html .='<fieldset>
 			<legend>'. JText::_('VMCUSTOM_ACYBUYER') .'</legend>
 			<table class="admintable">
 			';
+		$subscribe_modes = array(
+			'0' => array('id'=>'0', 'name'=>'VMCUSTOM_ACYBUYER_ALLOW_NONE'),
+			'1' => array('id'=>'1', 'name'=>'VMCUSTOM_ACYBUYER_ALLOW_REGISTERED'),
+			'2' => array('id'=>'2', 'name'=>'VMCUSTOM_ACYBUYER_ALLOW_ANONYMOUS'),
+		);
+		$autosubscribe_modes = array(
+			'1' => array('id'=>'1', 'name'=>'VMCUSTOM_ACYBUYER_AUTO_YES'),
+			'0' => array('id'=>'0', 'name'=>'VMCUSTOM_ACYBUYER_AUTO_NO'),
+		);
 		
 		$lists = $this->getAcyMailinglists();
 		if ($lists) {
 			$html .= VmHTML::row ('select','VMCUSTOM_ACYBUYER_LIST', 'custom_param['.$row.'][lists][]', $lists, $field->lists, ' multiple', 'listid', 'name', '');
-			$html .= VmHTML::row ('checkbox','VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE', 'custom_param['.$row.'][subscribe_buyers]', $field->subscribe_buyers);
-			$html .= VmHTML::row ('checkbox','VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE', 'custom_param['.$row.'][allow_subscribe]', $field->allow_subscribe);
+			
+			$html .= VmHTML::row('select', 'VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE', 'custom_param['.$row.'][subscribe_buyers]', 
+				array_merge(
+					array(array('id'=>'-1', 'name'=>JText::sprintf('VMCUSTOM_ACYBUYER_AUTO_DEFAULT', JText::_($autosubscribe_modes[$field->subscribe_buyers_default]['name'])))),
+					$autosubscribe_modes),
+				$field->allow_subscribe,'','id', 'name', false);
+			$html .= VmHTML::row('select', 'VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE', 'custom_param['.$row.'][allow_subscribe]', 
+				array_merge(
+					array(array('id'=>'-1', 'name'=>JText::sprintf('VMCUSTOM_ACYBUYER_ALLOW_DEFAULT', JText::_($subscribe_modes[$field->allow_subscribe_default]['name'])))),
+					$subscribe_modes),
+				$field->allow_subscribe,'','id', 'name', false);
 		} else {
 			// No lists found, no need to display any other option
 			$html .= '<tr><td>'.JText::_('VMCUSTOM_ACYBUYER_NO_LISTS').'</td></tr>';
@@ -162,8 +158,10 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 		$this->parseCustomParams($field);
 		$user = JFactory::getUser();
 		$uid = $user->get('id');
-		if ($uid>0) {
-			$acyuid = $this->getAcyUidFromUser($uid);
+		$allow = ($field->allow_subscribe>=0)?($field->allow_subscribe):($field->allow_subscribe_default);
+		
+		if ($uid>0 && $allow>=1) {
+			$acyuid = $this->getAcyUid($uid);
 			$allsubscriptions = $this->getUserSubscriptions($acyuid);
 			$uinfo = array(
 				'id' => $uid,
@@ -174,7 +172,7 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 			);
 			$this->addAcyStuff();
 			$html .= $this->renderByLayout('button_subscribe', array(acymailing_getModuleFormName(), $uinfo, $field->lists, $this->getThisURL(), $field));
-		} elseif ($field->allow_subscribe) {
+		} elseif ($allow>=2) {
 			$this->addAcyStuff();
 			$html .= $this->renderByLayout('button_subscribe', array(acymailing_getModuleFormName(), array(), $field->lists, $this->getThisURL(), $field));
 		} else {
@@ -225,13 +223,10 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 	}
 
 	public function getVmPluginCreateTableSQL() {
-// 		return $this->createTableSQL('Downloads for Sale tracking');
 		return false;
 	}
 
 	function getTableSQLFields() {
-// 		$SQLfields = array();
-// 		return $SQLfields;
 		return null;
 	}
 	/**
@@ -247,16 +242,17 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 		$uid = $order['details']['BT']->virtuemart_user_id;
 		$email = $order['details']['BT']->email;
 		$name = $order['details']['BT']->first_name . " " . $order['details']['BT']->last_name;
-		$acyuid = $this->getAcyUidFromEmail($email);
+		$acyuid = $this->getAcyUid($email);
 		if (!($acyuid>0)&&($uid>0)) {
-			$acyuid = $this->getAcyUidFromUser($uid);
+			$acyuid = $this->getAcyUid($uid);
 		}
-		$acyuid = $this->getAcyUidFromUser($uid);
 		$customModel = VmModel::getModel('customfields');
 		foreach ($order['items'] as $item) {
 			$customs = $customModel->getproductCustomslist ($item->virtuemart_product_id);
 			foreach ($customs as $field) {
 				if ($field->custom_element != $this->_name) continue;
+print("<pre>Field : ".print_r($field,1)."<br>. this: ".print_r($this,1)."</pre>");
+				$subscribe = ($field->subscribe_buyers>=0)?($field->subscribe_buyers):($field->subscribe_buyers_default);
 				if (!$field->subscribe_buyers) continue;
 				// Add the user to the lists:
 				if(!($acyuid>0)) {
@@ -275,4 +271,5 @@ class plgVmCustomAcy_subscribe_Buyer extends vmCustomPlugin {
 	}
 }
 
+} // end if acymailing can be loaded
 // No closing tag
\ No newline at end of file
diff --git a/acy_subscribe_buyer.xml b/acy_subscribe_buyer.xml
index 7597a465ccbfc4e1c45ad176e91f0ee8bfb38120..8fdf6881a4dabfbb9eabfad881283fa773442293 100644
--- a/acy_subscribe_buyer.xml
+++ b/acy_subscribe_buyer.xml
@@ -11,15 +11,27 @@
     <files>
         <filename plugin="acy_subscribe_buyer">acy_subscribe_buyer.php</filename>
         <filename>acy_subscribe_buyer.script.php</filename>
+        <folder>acy_subscribe_buyer</folder>
         <filename>index.html</filename>
+	<folder>language</folder>
     </files>
-    <languages>
-        <language tag="en-GB">en-GB.plg_vmcustom_acy_subscribe_buyer.ini</language>
-        <language tag="de-DE">de-DE.plg_vmcustom_acy_subscribe_buyer.ini</language>
-        <language tag="en-GB">en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini</language>
-        <language tag="de-DE">de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini</language>
+    <languages folder="language">
+	<language tag="en-GB">en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.ini</language>
+	<language tag="de-DE">de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.ini</language>
+	<language tag="en-GB">en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini</language>
+	<language tag="de-DE">de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini</language>
     </languages>
     <scriptfile>acy_subscribe_buyer.script.php</scriptfile>
     <params addpath="/administrator/components/com_virtuemart/elements">
+        <param type="vmjpluginwarning" />
+        <param name="subscribe_buyers_default" type="radio" default="1" label="VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE" description="VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE_DESC" >
+            <option value="0">COM_VIRTUEMART_NO</option>
+            <option value="1">COM_VIRTUEMART_YES</option>
+        </param>
+        <param name="allow_subscribe_default" type="list" default="0" label="VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE" description="VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE_DESC" >
+            <option value="0">VMCUSTOM_ACYBUYER_ALLOW_NONE</option>
+            <option value="1">VMCUSTOM_ACYBUYER_ALLOW_REGISTERED</option>
+            <option value="2">VMCUSTOM_ACYBUYER_ALLOW_ANONYMOUS</option>
+        </param>
     </params>
 </install>
diff --git a/images/acy_subscribe_buyer_-_icon.png b/images/acy_subscribe_buyer_-_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..00dded815a2ac875cd5bff473aa70cb3d244f564
Binary files /dev/null and b/images/acy_subscribe_buyer_-_icon.png differ
diff --git a/images/acy_subscribe_buyer_-_icon.xcf b/images/acy_subscribe_buyer_-_icon.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..dd155967e808e0a23db6fcafb8bd6cba5f8800c6
Binary files /dev/null and b/images/acy_subscribe_buyer_-_icon.xcf differ
diff --git a/images/email_256.png b/images/email_256.png
new file mode 100644
index 0000000000000000000000000000000000000000..89eebd13a6ec66d16aa1a2709900d03fef7c14c2
Binary files /dev/null and b/images/email_256.png differ
diff --git a/images/scy_subscribe_buyer_-_CustomField_product.png b/images/scy_subscribe_buyer_-_CustomField_product.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f5fe457ef0e393298a9f57669ab968e67b505f4
Binary files /dev/null and b/images/scy_subscribe_buyer_-_CustomField_product.png differ
diff --git a/images/scy_subscribe_buyer_-_CustomField_setup.png b/images/scy_subscribe_buyer_-_CustomField_setup.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f693723c6b3259030ee8420e323ef9aafc761d7
Binary files /dev/null and b/images/scy_subscribe_buyer_-_CustomField_setup.png differ
diff --git a/images/scy_subscribe_buyer_-_Productpage.png b/images/scy_subscribe_buyer_-_Productpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..581a1f587940dd840b66afcc29071e3432e759cd
Binary files /dev/null and b/images/scy_subscribe_buyer_-_Productpage.png differ
diff --git a/images/scy_subscribe_buyer_-_Productpage2.png b/images/scy_subscribe_buyer_-_Productpage2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e35e69a016fb163bbc3bec46add47765ef26e07
Binary files /dev/null and b/images/scy_subscribe_buyer_-_Productpage2.png differ
diff --git a/de-DE.plg_vmcustom_acy_subscribe_buyer.ini b/language/de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.ini
similarity index 69%
rename from de-DE.plg_vmcustom_acy_subscribe_buyer.ini
rename to language/de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.ini
index 362b07ad9816a1ce76b13f3b2e0e75143a11bfb7..af13cdaebe798103f583268dd3542774cf588967 100644
--- a/de-DE.plg_vmcustom_acy_subscribe_buyer.ini
+++ b/language/de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.ini
@@ -11,8 +11,19 @@ VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE_DESC="Trägt jeden Käufer des Produkts automat
 VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE="Manuelle Eintragung erlauben"
 VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE_DESC="Zeigt auf der Produktseite die Möglichkeit, die AcyMailing Listen des jeweiligen Produktes zu abonnieren oder abzubestellen. Für registrierte Benutzer wird dabei die Mail-Adresse des Joomla Kontos benutzt, anonyme Benutzer können die Adresse eingeben."
 
+VMCUSTOM_ACYBUYER_ALLOW_DEFAULT="Benutze globale Einstellung (%s)"
+VMCUSTOM_ACYBUYER_ALLOW_NONE="Nicht erlaubt"
+VMCUSTOM_ACYBUYER_ALLOW_REGISTERED="Nur für registrierte Benutzer"
+VMCUSTOM_ACYBUYER_ALLOW_ANONYMOUS="Für anonyme und registrierte Benutzer"
+
+VMCUSTOM_ACYBUYER_AUTO_DEFAULT="Benutze globale Einstellung (%s)"
+VMCUSTOM_ACYBUYER_AUTO_YES="Ja"
+VMCUSTOM_ACYBUYER_AUTO_NO="Nein"
+
 VMCUSTOM_ACYBUYER_NO_LISTS="Es sind keine AcyMailing Listen verfügbar"
 VMCUSTOM_ACYBUYER_LIST="AcyMailing Listen:"
 
 VMCUSTOM_ACYBUYER_ADDED_USER="Benutzer '%s' (%s) zur Liste '%s' hinzugefügt."
-VMCUSTOM_ACYBUYER_SQL_ERROR="SQL Fehler! Bitte <a href='mailto:reinhold@kainhofer.com'>kontaktieren Sie den Autor</a> und geben Sie folgende Fehlermeldung an:<br/>%s"
\ No newline at end of file
+VMCUSTOM_ACYBUYER_SQL_ERROR="SQL Fehler! Bitte <a href='mailto:reinhold@kainhofer.com'>kontaktieren Sie den Autor</a> und geben Sie folgende Fehlermeldung an:<br/>%s"
+
+VMCUSTOM_ACYBUYER_ACYMAILING_NEEDED="Das Plugin 'VM Käufer zu AcyMailing Listen hinzufügen' benötigt, dass die AcyMailing Komponente installiert ist."
diff --git a/de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini b/language/de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini
similarity index 100%
rename from de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini
rename to language/de-DE/de-DE.plg_vmcustom_acy_subscribe_buyer.sys.ini
diff --git a/language/de-DE/index.html b/language/de-DE/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/en-GB.plg_vmcustom_acy_subscribe_buyer.ini b/language/en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.ini
similarity index 68%
rename from en-GB.plg_vmcustom_acy_subscribe_buyer.ini
rename to language/en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.ini
index f640671ec5ae2c0a97dc25aa016e5c8b7aae5478..0a88d84cb48ca6eea1b7bea0c4c1a4d50ac70e2e 100644
--- a/en-GB.plg_vmcustom_acy_subscribe_buyer.ini
+++ b/language/en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.ini
@@ -11,8 +11,19 @@ VMCUSTOM_ACYBUYER_AUTO_SUBSCRIBE_DESC="Automatically add users to the mailing li
 VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE="Allow manual subscription"
 VMCUSTOM_ACYBUYER_ALLOW_SUBSCRIBE_DESC="Allow users to subscribe to a product without buying it. For registered users, the Joomla/VirtueMart users's email is automatically used for registered users, anonymous users will be asked for the name and email."
 
+VMCUSTOM_ACYBUYER_ALLOW_DEFAULT="Use global setting (%s)"
+VMCUSTOM_ACYBUYER_ALLOW_NONE="Not allowed"
+VMCUSTOM_ACYBUYER_ALLOW_REGISTERED="For registered users"
+VMCUSTOM_ACYBUYER_ALLOW_ANONYMOUS="For anonymous and registered users"
+
+VMCUSTOM_ACYBUYER_AUTO_YES="Yes"
+VMCUSTOM_ACYBUYER_AUTO_NO="No"
+VMCUSTOM_ACYBUYER_AUTO_DEFAULT="Use global setting (%s)"
+
 VMCUSTOM_ACYBUYER_NO_LISTS="No AcyMailing lists are available"
 VMCUSTOM_ACYBUYER_LIST="AcyMailing lists:"
 
 VMCUSTOM_ACYBUYER_ADDED_USER="User '%s' (%s) added to mailing list %s."
-VMCUSTOM_ACYBUYER_SQL_ERROR="SQL error, please <a href='mailto:reinhold@kainhofer.com'>contact the author</a> with the following information:<br/>%s"
\ No newline at end of file
+VMCUSTOM_ACYBUYER_SQL_ERROR="SQL error, please <a href='mailto:reinhold@kainhofer.com'>contact the author</a> with the following information:<br/>%s"
+
+VMCUSTOM_ACYBUYER_ACYMAILING_NEEDED="The 'VM Subscribe Buyers to AcyMailing' plugin requires the AcyMailing Component to be installed"
diff --git a/en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini b/language/en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini
similarity index 100%
rename from en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini
rename to language/en-GB/en-GB.plg_vmcustom_acy_subscribe_buyer.sys.ini
diff --git a/language/en-GB/index.html b/language/en-GB/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/language/index.html b/language/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/releases/plg_vmcustom_acy_subscribe_buyer_v1.0.zip b/releases/plg_vmcustom_acy_subscribe_buyer_v1.0.zip
index eacb7ee7c7a86ec072b575b47a2de18f60bf1336..2e4f93e332edaa3752abf47d7dd15290331676c3 100644
Binary files a/releases/plg_vmcustom_acy_subscribe_buyer_v1.0.zip and b/releases/plg_vmcustom_acy_subscribe_buyer_v1.0.zip differ