diff --git a/README.md b/README.md
index a5e85d4..0e8bf78 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-WooCommerce Payment Methods 0.2.1
+WooCommerce Payment Methods 0.3.0
 =================================
 
 Easily display your accepted payment methods
diff --git a/assets/css/payment-methods.css b/assets/css/payment-methods.css
index 71514ac..8651487 100644
--- a/assets/css/payment-methods.css
+++ b/assets/css/payment-methods.css
@@ -2,10 +2,10 @@
  * vendocrat Payment Methods styles
  *
  * @package		vendocrat
- * @subpackage	Payment Methods/Assets
+ * @subpackage	Payment Methods
  *
  * @since		2014-09-08
- * @version		2014-09-22
+ * @version		2014-10-21
  *
  * @author		Poellmann Alexander Manfred <alex@vendocr.at>
  * @copyright	Copyright 2014 vendocrat. All Rights Reserved.
@@ -61,6 +61,7 @@
 #payment ul.payment_methods .payment_method_paypal label img,
 #payment ul.payment_methods .payment_method_stripe label img,
 #payment ul.payment_methods .payment_method_wirecard label img,
+#payment ul.payment_methods .payment_method_wirecard_checkout_page label img,
 #payment ul.payment_methods .payment_method_ClickAndBuy label img,
 #payment ul.payment_methods .payment_method_sofortgateway label img,
 #payment ul.payment_methods .payment_method_cash_on_delivery label img,
@@ -68,17 +69,22 @@
 #payment ul.payment_methods .payment_method_coinbase label img {
 	display:none;}
 
-#payment ul.payment_methods .payment_method_bacs label:before,
-#payment ul.payment_methods .payment_method_cheque label:before,
-#payment ul.payment_methods .payment_method_mijireh_checkout label:before,
-#payment ul.payment_methods .payment_method_paypal label:before,
-#payment ul.payment_methods .payment_method_stripe label:before,
-#payment ul.payment_methods .payment_method_wirecard label:before,
-#payment ul.payment_methods .payment_method_ClickAndBuy label:before,
-#payment ul.payment_methods .payment_method_sofortgateway label:before,
-#payment ul.payment_methods .payment_method_cash_on_delivery label:before,
-#payment ul.payment_methods .payment_method_bitpay label:before,
-#payment ul.payment_methods .payment_method_coinbase label:before {
+#payment ul.payment_methods .payment_method_bacs > label:before,
+#payment ul.payment_methods .payment_method_cheque > label:before,
+#payment ul.payment_methods .payment_method_mijireh_checkout > label:before,
+#payment ul.payment_methods .payment_method_ccard > label:before,
+#payment ul.payment_methods .payment_method_paypal > label:before,
+#payment ul.payment_methods .payment_method_stripe > label:before,
+#payment ul.payment_methods .payment_method_wirecard > label:before,
+#payment ul.payment_methods .payment_method_wirecard > .payment_method_select > label:before,
+#payment ul.payment_methods .payment_method_wirecard_checkout_page > label:before,
+#payment ul.payment_methods .payment_method_pbx > label:before,
+#payment ul.payment_methods .payment_method_ClickAndBuy > label:before,
+#payment ul.payment_methods .payment_method_sofortgateway > label:before,
+#payment ul.payment_methods .payment_method_sofortueberweisung > label:before,
+#payment ul.payment_methods .payment_method_cash_on_delivery > label:before,
+#payment ul.payment_methods .payment_method_bitpay > label:before,
+#payment ul.payment_methods .payment_method_coinbase > label:before {
 	display:inline;
 	margin-right:10px;padding:2px 6px;
 	vertical-align:middle;
@@ -97,35 +103,42 @@
 	-webkit-font-smoothing:antialiased;
 	-moz-osx-font-smoothing:grayscale;}
 
-	#payment ul.payment_methods .payment_method_bacs label:before {
+	#payment ul.payment_methods .payment_method_bacs > label:before {
 		content:'\f005';}
 
-	#payment ul.payment_methods .payment_method_cheque label:before {
+	#payment ul.payment_methods .payment_method_cheque > label:before {
 		content:'\f00a';}
 
-	#payment ul.payment_methods .payment_method_mijireh_checkout label:before {
+	#payment ul.payment_methods .payment_method_mijireh_checkout > label:before,
+	#payment ul.payment_methods .payment_method_ccard > label:before {
 		content:'\f012';}
 
-	#payment ul.payment_methods .payment_method_paypal label:before {
+	#payment ul.payment_methods .payment_method_paypal > label:before {
 		content:'\f033';}
 
-	#payment ul.payment_methods .payment_method_stripe label:before {
+	#payment ul.payment_methods .payment_method_stripe > label:before {
 		content:'\f03e';}
 
-	#payment ul.payment_methods .payment_method_wirecard label:before {
+	#payment ul.payment_methods .payment_method_wirecard > label:before,
+	#payment ul.payment_methods .payment_method_wirecard > .payment_method_select > label:before,
+	#payment ul.payment_methods .payment_method_wirecard_checkout_page > label:before {
 		content:'\f049';}
 
-	#payment ul.payment_methods .payment_method_ClickAndBuy label:before {
+	#payment ul.payment_methods .payment_method_pbx > label:before {
+		content:'\f031';}
+
+	#payment ul.payment_methods .payment_method_ClickAndBuy > label:before {
 		content:'\f011';}
 
-	#payment ul.payment_methods .payment_method_sofortgateway label:before {
-		content:'\f03e';}
+	#payment ul.payment_methods .payment_method_sofortgateway > label:before,
+	#payment ul.payment_methods .payment_method_sofortueberweisung > label:before {
+		content:'\f03c';}
 
-	#payment ul.payment_methods .payment_method_cash_on_delivery label:before {
+	#payment ul.payment_methods .payment_method_cash_on_delivery > label:before {
 		content:'\f00d';}
 
-	#payment ul.payment_methods .payment_method_bitpay label:before,
-	#payment ul.payment_methods .payment_method_coinbase label:before {
+	#payment ul.payment_methods .payment_method_bitpay > label:before,
+	#payment ul.payment_methods .payment_method_coinbase > label:before {
 		content:'\f006';}
 
 /*
diff --git a/payment-methods.php b/classes/class-wc-payment-methods.php
similarity index 57%
rename from payment-methods.php
rename to classes/class-wc-payment-methods.php
index dbee6e8..c1eb01b 100644
--- a/payment-methods.php
+++ b/classes/class-wc-payment-methods.php
@@ -1,25 +1,34 @@
 <?php
 /**
-/* Plugin Name: WooCommerce Payment Methods
- * Plugin URI:  http://vendocr.at/
- * Description: <strong>Easily display your accepted payment methods from WooCommerce.</strong> Handcrafted with &hearts; by <a href='http://vendocr.at/'>vendocrat</a> in Vienna.
- * Version:     0.2.2
- * Author:      vendocrat
- * Author URI:  http://vendocr.at/
- * License:     GNU General Public License v3.0
- * License URI: http://www.gnu.org/licenses/gpl-3.0.html
+ * Payment Methods
+ *
+ * @package		vendocrat
+ * @subpackage	Payment Methods
+ *
+ * @since		2014-09-08
+ * @version		2014-10-21
+ *
+ * @author		Poellmann Alexander Manfred <alex@vendocr.at>
+ * @copyright	Copyright 2014 vendocrat. All Rights Reserved.
+ * @link		http://vendocr.at/
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
-if ( ! in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) )
-	return;
+if ( ! class_exists( 'vendocrat_WC_Payment_Methods' ) ) :
 
-if ( ! class_exists( 'vendocrat_Woo_Payment_Methods' ) ) :
+class vendocrat_WC_Payment_Methods {
 
-class vendocrat_Woo_Payment_Methods {
+	/* File var */
+	private $file;
 
-	public $payment_methods;
+	/* Basic vars */
+	public $version;
+	public $plugin_url;
+	public $plugin_dir;
+
+	/* Payment methods */
+	public $available_methods;
 
 	/**
 	 * Constructor
@@ -27,21 +36,77 @@ class vendocrat_Woo_Payment_Methods {
 	 * @since 2014-08-15
 	 * @version 2014-09-22
 	 **************************************************/
-	function __construct() {
-		define( 'PAYMENT_METHODS_DIR', plugin_dir_path( __FILE__ ) );
-		define( 'PAYMENT_METHODS_URI', plugin_dir_url( __FILE__ ) );
+	function __construct( $file ) {
+		// setup dir/uri
+		$this->file = $file;
+		$this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
+		$this->plugin_dir = trailingslashit( dirname( $file ) );
 
-		define( 'PAYMENT_METHODS_CSS_URI', trailingslashit( PAYMENT_METHODS_URI . 'assets/css' ) );
-		define( 'PAYMENT_METHODS_IMG_URI', trailingslashit( PAYMENT_METHODS_URI . 'assets/img' ) );
+		// definitions
+		$this->defines();
 
+		// load functions and classes
 		$this->load_functions();
 		$this->load_classes();
 
 		// load text domain
-		add_action( 'plugins_loaded', array( &$this, 'load_plugin_textdomain' ) );
+		$this->load_plugin_textdomain();
+	//	add_action( 'plugins_loaded', array( &$this, 'load_plugin_textdomain' ) );
 
-		// wirt payment methods array
-		add_action( 'plugins_loaded', array( &$this, 'payment_methods' ) );
+		$this->available_methods = array(
+			'amazon'			=> 'Amazon',
+			'american-express'	=> 'American Express',
+			'atm'				=> 'ATM',
+			'bank-transfer'		=> __( 'Bank Transfer', 'woocommerce-payment-methods' ),
+			'bankomat'			=> 'Bankomat',
+			'bitcoin'			=> 'Bitcoin',
+			'braintree'			=> 'Braintree',
+			'carta-si'			=> 'Carta Si',
+			'cash'				=> __( 'Cash', 'woocommerce-payment-methods' ),
+			'cash-on-delivery'	=> __( 'Cash on Delivery', 'woocommerce-payment-methods' ),
+			'cb'				=> 'CB',
+			'cirrus'			=> 'Cirrus',
+			'cheque'			=> __( 'Pay with Cheque', 'woocommerce-payment-methods' ),
+			'clickandbuy'		=> 'ClickAndBuy',
+			'credit-card'		=> __( 'Credit Card', 'woocommerce-payment-methods' ),
+			'diners'			=> 'Diners Club',
+			'discover'			=> 'Discover',
+			'ec'				=> 'EC (Electronic Cash)',
+			'eps'				=> 'Eps',
+			'fattura'			=> __( 'Invoice', 'woocommerce-payment-methods' ),
+			'facture'			=> __( 'Invoice', 'woocommerce-payment-methods' ),
+			'flattr'			=> 'Flattr',
+			'giropay'			=> 'Giropay',
+			'gittip'			=> 'Gittip',
+			'google-wallet'		=> 'Google Wallet',
+			'ideal'				=> 'Ideal',
+			'invoice'			=> __( 'Invoice', 'woocommerce-payment-methods' ),
+			'jcb'				=> 'JCB',
+			'maestro'			=> 'Maestro',
+			'mastercard'		=> 'MasterCard',
+			'mastercard-securecode' => 'MasterCard Securecode',
+			'ogone'				=> 'Ogone',
+			'paybox'			=> 'Paybox',
+			'paylife'			=> 'Paylife',
+			'paypal'			=> 'PayPal',
+			'paysafecard'		=> 'paysafecard',
+			'postepay'			=> 'postepay',
+			'quick'				=> 'Quick',
+			'invoice'			=> __( 'Invoice', 'woocommerce-payment-methods' ),
+			'ripple'			=> 'Ripple',
+			'skrill'			=> 'Skrill',
+			'sofort'			=> 'SofortÜberweisung',
+			'square'			=> 'Square',
+			'stripe'			=> 'Stripe',
+			'truste'			=> 'Truste',
+			'unionpay'			=> 'Unionpay',
+			'verified-by-visa'	=> 'Verified By Visa',
+			'verisign'			=> 'Verisign',
+			'visa'				=> 'Visa',
+			'visa-electron'		=> 'Visa Electron',
+			'western-union'		=> 'Western Union',
+			'wirecard'			=> 'Wirecard',
+		);
 
 		// scripts and styles
 		if ( ! is_admin() ) :
@@ -57,19 +122,25 @@ class vendocrat_Woo_Payment_Methods {
 	}
 
 	/**
-	 * Load theme textdomain
+	 * Definitions
 	 *
 	 * @return void
-	 * 
-	 * @since 2014-09-08
-	 * @version 2014-09-08
+	 *
+	 * @since 2014-09-22
+	 * @version 2014-09-22
 	 **************************************************/
-	static function load_plugin_textdomain() {
-		load_plugin_textdomain( 'payment-methods', false, basename( dirname( __FILE__ ) ) . '/languages/' );
+	function defines() {
+		// Plugin
+		define( 'WC_PAYMENT_METHODS_DIR', $this->plugin_dir );
+		define( 'WC_PAYMENT_METHODS_URI', $this->plugin_url );
+
+		// Assets
+		define( 'WC_PAYMENT_METHODS_CSS_URI', trailingslashit( WC_PAYMENT_METHODS_URI . 'assets/css' ) );
+		define( 'WC_PAYMENT_METHODS_IMG_URI', trailingslashit( WC_PAYMENT_METHODS_URI . 'assets/img' ) );
 	}
 
 	/**
-	 * Override some WooCommerce plugin functionality
+	 * Load functions
 	 *
 	 * @return void
 	 *
@@ -79,7 +150,7 @@ class vendocrat_Woo_Payment_Methods {
 	function load_functions() {}
 
 	/**
-	 * Override some WooCommerce plugin functionality
+	 * Load classes
 	 *
 	 * @return void
 	 *
@@ -88,6 +159,33 @@ class vendocrat_Woo_Payment_Methods {
 	 **************************************************/
 	function load_classes() {}
 
+	/**
+	 * Load theme textdomain
+	 *
+	 * @return void
+	 *
+	 * @since 2014-09-08
+	 * @version 2014-09-08
+	 **************************************************/
+/*
+	static function load_plugin_textdomain() {
+		load_plugin_textdomain( 'payment-methods', false, basename( $this->plugin_dir ) .'/languages/' );
+	}
+*/
+	public function load_plugin_textdomain() {
+		$locale = apply_filters( 'plugin_locale', get_locale(), 'woocommerce-payment-methods' );
+		$dir    = trailingslashit( WP_LANG_DIR );
+
+		/**
+		 * Frontend/global Locale. Looks in:
+		 * - WP_LANG_DIR/woocommerce-payment-methods/woocommerce-payment-methods-LOCALE.mo
+		 * - woocommerce-payment-methods/languages/woocommerce-payment-methods-LOCALE.mo (which if not found falls back to:)
+		 * - WP_LANG_DIR/plugins/woocommerce-payment-methods-LOCALE.mo
+		 */
+		load_textdomain( 'woocommerce-payment-methods', $dir .'woocommerce-payment-methods/woocommerce-payment-methods-'. $locale .'.mo' );
+		load_plugin_textdomain( 'woocommerce-payment-methods', false, plugin_basename( $this->plugin_dir ) .'/languages/' );
+	}
+
 	/**
 	 * Enqueue Styles
 	 *
@@ -98,11 +196,11 @@ class vendocrat_Woo_Payment_Methods {
 	 **************************************************/
 	function enqueue_styles() {
 		if ( ! wp_style_is( 'vendocrat-paymentfont', 'registered' ) ) {
-			wp_register_style( 'vendocrat-paymentfont', PAYMENT_METHODS_CSS_URI .'paymentfont.min.css', array(), false, 'all' );
+			wp_register_style( 'vendocrat-paymentfont', WC_PAYMENT_METHODS_CSS_URI .'paymentfont.min.css', array(), false, 'all' );
 		}
 		wp_enqueue_style( 'vendocrat-paymentfont' );
 
-		wp_register_style( 'payment-methods', PAYMENT_METHODS_CSS_URI .'payment-methods.css', array(), false, 'all' );
+		wp_register_style( 'payment-methods', WC_PAYMENT_METHODS_CSS_URI .'payment-methods.css', array(), false, 'all' );
 		wp_enqueue_style( 'payment-methods' );
 	}
 
@@ -125,74 +223,8 @@ class vendocrat_Woo_Payment_Methods {
 	 * @version 2014-09-08
 	 **************************************************/
 	function register_widgets() {
-		require_once PAYMENT_METHODS_DIR .'classes/class-widget-payment-methods.php';
-		register_widget( 'vendocrat_Widget_Payment_Methods' );
-	}
-
-
-	/**
-	 * Payment Methods array
-	 *
-	 * @return void
-	 *
-	 * @since 2014-09-21
-	 * @version 2014-09-22
-	 **************************************************/
-	function payment_methods() {
-		$this->payment_methods = array(
-			'amazon'			=> 'Amazon',
-			'american-express'	=> 'American Express',
-			'atm'				=> 'ATM',
-			'bank-transfer'		=> __( 'Bank Transfer', 'payment-methods' ),
-			'bankomat'			=> 'Bankomat',
-			'bitcoin'			=> 'Bitcoin',
-			'braintree'			=> 'Braintree',
-			'carta-si'			=> 'Carta Si',
-			'cash'				=> __( 'Cash', 'payment-methods' ),
-			'cash-on-delivery'	=> __( 'Cash on Delivery', 'payment-methods' ),
-			'cb'				=> 'CB',
-			'cirrus'			=> 'Cirrus',
-		//	'cheque'			=> __( 'Pay with Cheque', 'payment-methods' ),
-			'clickandbuy'		=> 'ClickAndBuy',
-			'credit-card'		=> 'Credit Card',
-			'diners'			=> 'Diners Club',
-			'discover'			=> 'Discover',
-			'ec'				=> 'EC (Electronic Cash)',
-			'eps'				=> 'Eps',
-			'fattura'			=> __( 'Invoice', 'payment-methods' ),
-			'facture'			=> __( 'Invoice', 'payment-methods' ),
-			'flattr'			=> 'Flattr',
-			'giropay'			=> 'Giropay',
-			'gittip'			=> 'Gittip',
-			'google-wallet'		=> 'Google Wallet',
-			'ideal'				=> 'Ideal',
-			'invoice'			=> __( 'Invoice', 'payment-methods' ),
-			'jcb'				=> 'JCB',
-			'maestro'			=> 'Maestro',
-			'mastercard'		=> 'Mastercard',
-			'mastercard-securecode' => 'Mastercard Securecode',
-			'ogone'				=> 'Ogone',
-			'paybox'			=> 'PayBox',
-			'paylife'			=> 'Paylife',
-			'paypal'			=> 'PayPal',
-			'paysafecard'		=> 'paysafecard',
-			'postepay'			=> 'postepay',
-			'quick'				=> 'Quick',
-			'invoice'			=> __( 'Invoice', 'payment-methods' ),
-			'ripple'			=> 'Ripple',
-			'skrill'			=> 'Skrill',
-			'sofort'			=> 'SofortÜberweisung',
-			'square'			=> 'Square',
-			'stripe'			=> 'Stripe',
-			'truste'			=> 'Truste',
-			'unionpay'			=> 'Unionpay',
-			'verified-by-visa'	=> 'Verified By Visa',
-			'verisign'			=> 'Verisign',
-			'visa'				=> 'Visa',
-			'visa-electron'		=> 'Visa Electron',
-			'western-union'		=> 'Western Union',
-			'wirecard'			=> 'Wirecard',
-		);
+		require_once WC_PAYMENT_METHODS_DIR .'classes/class-widget-wc-payment-methods.php';
+		register_widget( 'vendocrat_Widget_WC_Payment_Methods' );
 	}
 
 	/**
@@ -248,11 +280,11 @@ class vendocrat_Woo_Payment_Methods {
 				$icon = '';
 
 				// continue if we have no corresponding icon
-				if ( ! array_key_exists ( $slug, $this->payment_methods ) )
+				if ( ! array_key_exists ( $slug, $this->available_methods ) )
 					continue;
 
 				// retrieve title
-				$title = $this->payment_methods[$slug];
+				$title = $this->available_methods[$slug];
 
 				// build icon class
 				$iclass = 'pf pf-'. $slug .' '. $slug;
@@ -307,6 +339,7 @@ class vendocrat_Woo_Payment_Methods {
 						break;
 
 					case 'paypal' :
+						$methods.= ' credit-card';
 						$methods.= ' paypal';
 						$methods.= ' visa';
 						$methods.= ' mastercard';
@@ -327,20 +360,88 @@ class vendocrat_Woo_Payment_Methods {
 						break;
 
 					case 'wirecard' :
-						$methods.= ' wirecard';
-						$methods.= ' paypal';
-						$methods.= ' visa';
-						$methods.= ' mastercard';
-						$methods.= ' american-express';
-						$methods.= ' discover';
-						$methods.= ' diners';
-						$methods.= ' jcb';
-						$methods.= ' maestro';
-						$methods.= ' quick';
-						$methods.= ' paybox';
-						$methods.= ' paysafecard';
-						$methods.= ' bank-transfer';
-						$methods.= ' invoice';
+						$options = get_option('woocommerce_wirecard_settings');
+
+						if ( is_array( $options['paymenttype_available'] ) ) {
+							$wirecard_gateways = $options['paymenttype_available'];
+						} else {
+							$wirecard_gateways = array();
+						}
+
+						if ( is_array( $options['subs_paymenttype_options'] ) ) {
+							$wirecard_gateways_subscription = $options['subs_paymenttype_options'];
+						} else {
+							$wirecard_gateways_subscription = array();
+						}
+							
+						$wirecard_gateways = array_merge( $wirecard_gateways, $wirecard_gateways_subscription );
+
+						if ( count($wirecard_gateways) > 0 ) {
+							foreach ( $wirecard_gateways as $wirecard_gateway ) {
+								$wirecard_gateway = strtolower( $wirecard_gateway );
+
+								switch ( $wirecard_gateway ) {
+									case 'select' :
+										break;
+
+									case 'ccard' :
+										$methods.= ' credit-card';
+										$methods.= ' visa';
+										$methods.= ' mastercard';
+										break;
+
+									case 'idl' :
+										$methods.= ' ideal';
+										break;
+
+									case 'paypal' :
+										$methods.= ' credit-card';
+										$methods.= ' paypal';
+										$methods.= ' visa';
+										$methods.= ' mastercard';
+										$methods.= ' american-express';
+										$methods.= ' discover';
+										$methods.= ' diners';
+										$methods.= ' jcb';
+										break;
+
+									case 'pbx' :
+										$methods.= ' paybox';
+										break;
+
+									case 'psc' :
+										$methods.= ' paysafecard';
+										break;
+
+									case 'skrilldirect' :
+									case 'skrillwallet' :
+										$methods.= ' skrill';
+										break;
+
+									case 'sofortueberweisung' :
+										$methods.= ' sofort';
+										$methods.= ' bank-transfer';
+										break;
+
+									case 'elv' :
+									case 'przelewy24' :
+									case 'moneta' :
+									case 'c2p' :
+									case 'bancontact_mistercash' :
+									case 'przelewy24' :
+									case 'installment' :
+									case 'poli' :
+									case 'ekonto' :
+									case 'instantbank' :
+									case 'mpass' :
+										break;
+
+									default :
+										$methods.= ' '. $wirecard_gateway;
+										break;
+								}
+							}
+						}
 						break;
 
 					case 'ClickAndBuy' :
@@ -399,19 +500,27 @@ class vendocrat_Woo_Payment_Methods {
 
 } // END Class
 
-global $vendocrat_woo_payment_methods;
-$vendocrat_woo_payment_methods = new vendocrat_Woo_Payment_Methods();
-
 /**
  * Output payment methods
  *
  * @since 2014-09-08
+ * @version 2014-10-23
+ **************************************************/
+function wc_payment_methods( $atts = array() ) {
+	global $vendocrat_wc_payment_methods;
+
+	echo $vendocrat_wc_payment_methods->get_payment_methods( $atts );
+}
+
+/**
+ * Output payment methods
+ *
+ * @deprecated 2014-10-23
+ * @since 2014-09-08
  * @version 2014-09-08
  **************************************************/
 function v_woo_payment_methods( $atts = array() ) {
-	global $vendocrat_woo_payment_methods;
-
-	echo $vendocrat_woo_payment_methods->get_payment_methods( $atts );
+	wc_payment_methods( $atts );
 }
 
 endif;
diff --git a/classes/class-widget-payment-methods.php b/classes/class-widget-wc-payment-methods.php
similarity index 76%
rename from classes/class-widget-payment-methods.php
rename to classes/class-widget-wc-payment-methods.php
index bcab43e..d434b9e 100644
--- a/classes/class-widget-payment-methods.php
+++ b/classes/class-widget-wc-payment-methods.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * vendocrat Payment Methods widget
+ * Payment Methods widget
  *
  * @package		vendocrat
- * @subpackage	Payment Methods/Classes
+ * @subpackage	Payment Methods
  *
  * @since		2014-09-08
- * @version		2014-09-22
+ * @version		2014-10-21
  *
  * @author		Poellmann Alexander Manfred <alex@vendocr.at>
  * @copyright	Copyright 2014 vendocrat. All Rights Reserved.
@@ -15,7 +15,7 @@
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
-class vendocrat_Widget_Payment_Methods extends WP_Widget {
+class vendocrat_Widget_WC_Payment_Methods extends WP_Widget {
 
 	public $slug;
 	public $name;
@@ -30,9 +30,9 @@ class vendocrat_Widget_Payment_Methods extends WP_Widget {
 	 **************************************************/
 	function __construct() {
 		$this->slug  = 'vendocrat_payment_methods';
-		$this->name  = __( 'Payment Methods', 'payment-methods' );
-		$this->desc  = __( 'Easily display your accepted payment methods', 'payment-methods' );
-		$this->title = __( 'Accepted Payment Methods', 'payment-methods' );
+		$this->name  = __( 'Payment Methods', 'woocommerce-payment-methods' );
+		$this->desc  = __( 'Easily display your accepted payment methods', 'woocommerce-payment-methods' );
+		$this->title = __( 'Accepted Payment Methods', 'woocommerce-payment-methods' );
 		
 		parent::__construct(
 			$this->slug,
@@ -70,7 +70,7 @@ class vendocrat_Widget_Payment_Methods extends WP_Widget {
 			echo $before_title . $title . $after_title;
 		}
 
-		global $vendocrat_woo_payment_methods;
+		global $vendocrat_wc_payment_methods;
 
 		$atts = array(
 			'methods'   => $methods,
@@ -79,7 +79,7 @@ class vendocrat_Widget_Payment_Methods extends WP_Widget {
 			'placement' => $placement,
 			'xclass'    => $xclass,
 		);
-		echo $vendocrat_woo_payment_methods->get_payment_methods( $atts );
+		echo $vendocrat_wc_payment_methods->get_payment_methods( $atts );
 
 		echo $after_widget;
 	}
@@ -104,35 +104,35 @@ class vendocrat_Widget_Payment_Methods extends WP_Widget {
 		$instance = wp_parse_args( (array) $instance, $defaults );
 		?>
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title', 'payment-methods' ); ?>:</label>
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title', 'woocommerce-payment-methods' ); ?>:</label>
 			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'style' ); ?>"><?php _e( 'Style', 'payment-methods' ); ?>:</label>
+			<label for="<?php echo $this->get_field_id( 'style' ); ?>"><?php _e( 'Style', 'woocommerce-payment-methods' ); ?>:</label>
 			<select name="<?php echo $this->get_field_name( 'style' ); ?>" class="widefat" id="<?php echo $this->get_field_id( 'style' ); ?>">
-				<option value="default"<?php selected( $instance['style'], 'default' ); ?>><?php _e( 'Default', 'payment-methods' ); ?></option>
-				<option value="inverse"<?php selected( $instance['style'], 'inverse' ); ?>><?php _e( 'Inverse', 'payment-methods' ); ?></option>
-				<option value="o"<?php selected( $instance['style'], 'o' ); ?>><?php _e( 'Outline', 'payment-methods' ); ?></option>
+				<option value="default"<?php selected( $instance['style'], 'default' ); ?>><?php _e( 'Default', 'woocommerce-payment-methods' ); ?></option>
+				<option value="inverse"<?php selected( $instance['style'], 'inverse' ); ?>><?php _e( 'Inverse', 'woocommerce-payment-methods' ); ?></option>
+				<option value="o"<?php selected( $instance['style'], 'o' ); ?>><?php _e( 'Outline', 'woocommerce-payment-methods' ); ?></option>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'tooltip' ); ?>"><?php _e( 'Add Tooltip markup?', 'payment-methods' ); ?></label>
+			<label for="<?php echo $this->get_field_id( 'tooltip' ); ?>"><?php _e( 'Add Tooltip markup?', 'woocommerce-payment-methods' ); ?></label>
 			<select name="<?php echo $this->get_field_name( 'tooltip' ); ?>" class="widefat" id="<?php echo $this->get_field_id( 'tooltip' ); ?>">
-				<option value="false"<?php selected( $instance['tooltip'], 'false' ); ?>><?php _e( 'No', 'payment-methods' ); ?></option>
-				<option value="true"<?php selected( $instance['tooltip'], 'true' ); ?>><?php _e( 'Yes', 'payment-methods' ); ?></option>
+				<option value="false"<?php selected( $instance['tooltip'], 'false' ); ?>><?php _e( 'No', 'woocommerce-payment-methods' ); ?></option>
+				<option value="true"<?php selected( $instance['tooltip'], 'true' ); ?>><?php _e( 'Yes', 'woocommerce-payment-methods' ); ?></option>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'placement' ); ?>"><?php _e( 'Placement', 'payment-methods' ); ?>:</label>
+			<label for="<?php echo $this->get_field_id( 'placement' ); ?>"><?php _e( 'Placement', 'woocommerce-payment-methods' ); ?>:</label>
 			<select name="<?php echo $this->get_field_name( 'placement' ); ?>" class="widefat" id="<?php echo $this->get_field_id( 'placement' ); ?>">
-				<option value="top"<?php selected( $instance['placement'], 'top' ); ?>><?php _e( 'Top', 'payment-methods' ); ?></option>
-				<option value="right"<?php selected( $instance['placement'], 'right' ); ?>><?php _e( 'Right', 'payment-methods' ); ?></option>
-				<option value="bottom"<?php selected( $instance['placement'], 'bottom' ); ?>><?php _e( 'Bottom', 'payment-methods' ); ?></option>
-				<option value="left"<?php selected( $instance['placement'], 'left' ); ?>><?php _e( 'Left', 'payment-methods' ); ?></option>
+				<option value="top"<?php selected( $instance['placement'], 'top' ); ?>><?php _e( 'Top', 'woocommerce-payment-methods' ); ?></option>
+				<option value="right"<?php selected( $instance['placement'], 'right' ); ?>><?php _e( 'Right', 'woocommerce-payment-methods' ); ?></option>
+				<option value="bottom"<?php selected( $instance['placement'], 'bottom' ); ?>><?php _e( 'Bottom', 'woocommerce-payment-methods' ); ?></option>
+				<option value="left"<?php selected( $instance['placement'], 'left' ); ?>><?php _e( 'Left', 'woocommerce-payment-methods' ); ?></option>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id('xclass'); ?>"><?php _e( 'Extra classes', 'payment-methods' ); ?>:</label>
+			<label for="<?php echo $this->get_field_id('xclass'); ?>"><?php _e( 'Extra classes', 'woocommerce-payment-methods' ); ?>:</label>
 			<input class="widefat" id="<?php echo $this->get_field_id('xclass'); ?>" name="<?php echo $this->get_field_name('xclass'); ?>" type="text" value="<?php echo esc_attr( $instance['xclass'] ); ?>" />
 		</p>
 		<?php
diff --git a/languages/payment-methods-de_AT.mo b/languages/payment-methods-de_AT.mo
deleted file mode 100644
index c61d4e8..0000000
Binary files a/languages/payment-methods-de_AT.mo and /dev/null differ
diff --git a/languages/payment-methods-de_AT.po b/languages/payment-methods-de_AT.po
deleted file mode 100644
index 19bf2f2..0000000
--- a/languages/payment-methods-de_AT.po
+++ /dev/null
@@ -1,104 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:09+0100\n"
-"PO-Revision-Date: 2014-09-22 00:09+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr "Zahlungsmethoden"
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr "Spielend leicht alle akzeptierten Zahlungsmethoden anzeigen"
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr "Akzeptierte Zahlungsmethoden"
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr "Titel"
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr "Stil"
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr "Standard"
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr "Inverse"
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr "Kontur"
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr "Tooltip-Markup hinzufügen?"
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr "Nein"
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr "Ja"
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr "Platzierung"
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr "Oben"
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr "Rechts"
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr "Unten"
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr "Links"
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr "Zusätzliche Klassen"
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr "Bank-Überweisung"
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr "Bargeld"
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr "Nachname"
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr "Rechnung"
-
-#~ msgid "Pay with Cheque"
-#~ msgstr "Mit Scheck bezahlen"
diff --git a/languages/payment-methods-de_DE.mo b/languages/payment-methods-de_DE.mo
deleted file mode 100644
index 40bb946..0000000
Binary files a/languages/payment-methods-de_DE.mo and /dev/null differ
diff --git a/languages/payment-methods-de_DE.po b/languages/payment-methods-de_DE.po
deleted file mode 100644
index 0a35640..0000000
--- a/languages/payment-methods-de_DE.po
+++ /dev/null
@@ -1,104 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:08+0100\n"
-"PO-Revision-Date: 2014-09-22 00:09+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr "Zahlungsmethoden"
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr "Spielend leicht alle akzeptierten Zahlungsmethoden anzeigen"
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr "Akzeptierte Zahlungsmethoden"
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr "Titel"
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr "Stil"
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr "Standard"
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr "Inverse"
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr "Kontur"
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr "Tooltip-Markup hinzufügen?"
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr "Nein"
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr "Ja"
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr "Platzierung"
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr "Oben"
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr "Rechts"
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr "Unten"
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr "Links"
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr "Zusätzliche Klassen"
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr "Bank-Überweisung"
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr "Bargeld"
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr "Nachname"
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr "Rechnung"
-
-#~ msgid "Pay with Cheque"
-#~ msgstr "Mit Scheck bezahlen"
diff --git a/languages/payment-methods-en_GB.po b/languages/payment-methods-en_GB.po
deleted file mode 100644
index c06ed30..0000000
--- a/languages/payment-methods-en_GB.po
+++ /dev/null
@@ -1,101 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:09+0100\n"
-"PO-Revision-Date: 2014-09-22 00:09+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr ""
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr ""
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr ""
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr ""
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr ""
diff --git a/languages/payment-methods-en_US.mo b/languages/payment-methods-en_US.mo
deleted file mode 100644
index 8da48f7..0000000
Binary files a/languages/payment-methods-en_US.mo and /dev/null differ
diff --git a/languages/payment-methods-en_US.po b/languages/payment-methods-en_US.po
deleted file mode 100644
index 22b3266..0000000
--- a/languages/payment-methods-en_US.po
+++ /dev/null
@@ -1,101 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:10+0100\n"
-"PO-Revision-Date: 2014-09-22 00:10+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr ""
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr ""
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr ""
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr ""
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr ""
diff --git a/languages/payment-methods-it_IT.mo b/languages/payment-methods-it_IT.mo
deleted file mode 100644
index 44c5bd7..0000000
Binary files a/languages/payment-methods-it_IT.mo and /dev/null differ
diff --git a/languages/payment-methods-it_IT.po b/languages/payment-methods-it_IT.po
deleted file mode 100644
index 715dc8c..0000000
--- a/languages/payment-methods-it_IT.po
+++ /dev/null
@@ -1,104 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:10+0100\n"
-"PO-Revision-Date: 2014-09-22 00:10+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr "Metodi di pagamento"
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr "Mostra con facilità i tuoi metodi di pagamento accettati"
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr "Metodi di pagamento accettati"
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr "Titolo"
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr "Stile"
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr "Inverso"
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr "Contorno"
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr "Aggiungere Tooltip markup?"
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr "No"
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr "Si"
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr "Posizione"
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr "Sopra"
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr "Destra"
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr "Abbasso"
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr "Sinistra"
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr "Classi extra"
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr "Trasferimento bancario"
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr "Contanti"
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr "Pagamento con contrassegno"
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr "Fatture"
-
-#~ msgid "Pay with Cheque"
-#~ msgstr "Paga con assegno"
diff --git a/languages/payment-methods.mo b/languages/payment-methods.mo
deleted file mode 100644
index 238ee10..0000000
Binary files a/languages/payment-methods.mo and /dev/null differ
diff --git a/languages/payment-methods.pot b/languages/payment-methods.pot
deleted file mode 100644
index c06ed30..0000000
--- a/languages/payment-methods.pot
+++ /dev/null
@@ -1,101 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WooCommerce Payment Methods\n"
-"POT-Creation-Date: 2014-09-22 00:09+0100\n"
-"PO-Revision-Date: 2014-09-22 00:09+0100\n"
-"Last-Translator: \n"
-"Language-Team: vendocrat <hello@vendocr.at>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.7\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: ../classes/class-widget-payment-methods.php:33
-msgid "Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:34
-msgid "Easily display your accepted payment methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:35
-msgid "Accepted Payment Methods"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:104
-msgid "Title"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:108
-msgid "Style"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:110
-msgid "Default"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:111
-msgid "Inverse"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:112
-msgid "Outline"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:116
-msgid "Add Tooltip markup?"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:118
-msgid "No"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:119
-msgid "Yes"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:123
-msgid "Placement"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:125
-msgid "Top"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:126
-msgid "Right"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:127
-msgid "Bottom"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:128
-msgid "Left"
-msgstr ""
-
-#: ../classes/class-widget-payment-methods.php:132
-msgid "Extra classes"
-msgstr ""
-
-#: ../payment-methods.php:41
-msgid "Bank Transfer"
-msgstr ""
-
-#: ../payment-methods.php:46
-msgid "Cash"
-msgstr ""
-
-#: ../payment-methods.php:47
-msgid "Cash on Delivery"
-msgstr ""
-
-#: ../payment-methods.php:57 ../payment-methods.php:58
-#: ../payment-methods.php:64 ../payment-methods.php:76
-msgid "Invoice"
-msgstr ""
diff --git a/languages/woocommerce-payment-methods-de_AT.mo b/languages/woocommerce-payment-methods-de_AT.mo
new file mode 100644
index 0000000..58519d1
Binary files /dev/null and b/languages/woocommerce-payment-methods-de_AT.mo differ
diff --git a/languages/woocommerce-payment-methods-de_AT.po b/languages/woocommerce-payment-methods-de_AT.po
new file mode 100644
index 0000000..18682a8
--- /dev/null
+++ b/languages/woocommerce-payment-methods-de_AT.po
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WooCommerce Payment Methods\n"
+"POT-Creation-Date: 2014-10-23 18:11+0100\n"
+"PO-Revision-Date: 2014-10-23 18:11+0100\n"
+"Last-Translator: \n"
+"Language-Team: vendocrat <hello@vendocr.at>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../classes/class-wc-payment-methods.php:60
+msgid "Bank Transfer"
+msgstr "Bank-Überweisung"
+
+#: ../classes/class-wc-payment-methods.php:65
+msgid "Cash"
+msgstr "Bargeld"
+
+#: ../classes/class-wc-payment-methods.php:66
+msgid "Cash on Delivery"
+msgstr "Nachname"
+
+#: ../classes/class-wc-payment-methods.php:69
+msgid "Pay with Cheque"
+msgstr "Mit Scheck bezahlen"
+
+#: ../classes/class-wc-payment-methods.php:71
+msgid "Credit Card"
+msgstr "Kreditkarte"
+
+#: ../classes/class-wc-payment-methods.php:76
+#: ../classes/class-wc-payment-methods.php:77
+#: ../classes/class-wc-payment-methods.php:83
+#: ../classes/class-wc-payment-methods.php:95
+msgid "Invoice"
+msgstr "Rechnung"
+
+#: ../classes/class-widget-wc-payment-methods.php:33
+msgid "Payment Methods"
+msgstr "Zahlungsmethoden"
+
+#: ../classes/class-widget-wc-payment-methods.php:34
+msgid "Easily display your accepted payment methods"
+msgstr "Spielend leicht alle akzeptierten Zahlungsmethoden anzeigen"
+
+#: ../classes/class-widget-wc-payment-methods.php:35
+msgid "Accepted Payment Methods"
+msgstr "Akzeptierte Zahlungsmethoden"
+
+#: ../classes/class-widget-wc-payment-methods.php:107
+msgid "Title"
+msgstr "Titel"
+
+#: ../classes/class-widget-wc-payment-methods.php:111
+msgid "Style"
+msgstr "Stil"
+
+#: ../classes/class-widget-wc-payment-methods.php:113
+msgid "Default"
+msgstr "Standard"
+
+#: ../classes/class-widget-wc-payment-methods.php:114
+msgid "Inverse"
+msgstr "Inverse"
+
+#: ../classes/class-widget-wc-payment-methods.php:115
+msgid "Outline"
+msgstr "Kontur"
+
+#: ../classes/class-widget-wc-payment-methods.php:119
+msgid "Add Tooltip markup?"
+msgstr "Tooltip-Markup hinzufügen?"
+
+#: ../classes/class-widget-wc-payment-methods.php:121
+msgid "No"
+msgstr "Nein"
+
+#: ../classes/class-widget-wc-payment-methods.php:122
+msgid "Yes"
+msgstr "Ja"
+
+#: ../classes/class-widget-wc-payment-methods.php:126
+msgid "Placement"
+msgstr "Platzierung"
+
+#: ../classes/class-widget-wc-payment-methods.php:128
+msgid "Top"
+msgstr "Oben"
+
+#: ../classes/class-widget-wc-payment-methods.php:129
+msgid "Right"
+msgstr "Rechts"
+
+#: ../classes/class-widget-wc-payment-methods.php:130
+msgid "Bottom"
+msgstr "Unten"
+
+#: ../classes/class-widget-wc-payment-methods.php:131
+msgid "Left"
+msgstr "Links"
+
+#: ../classes/class-widget-wc-payment-methods.php:135
+msgid "Extra classes"
+msgstr "Zusätzliche Klassen"
diff --git a/languages/woocommerce-payment-methods-de_DE.mo b/languages/woocommerce-payment-methods-de_DE.mo
new file mode 100644
index 0000000..58519d1
Binary files /dev/null and b/languages/woocommerce-payment-methods-de_DE.mo differ
diff --git a/languages/woocommerce-payment-methods-de_DE.po b/languages/woocommerce-payment-methods-de_DE.po
new file mode 100644
index 0000000..18682a8
--- /dev/null
+++ b/languages/woocommerce-payment-methods-de_DE.po
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WooCommerce Payment Methods\n"
+"POT-Creation-Date: 2014-10-23 18:11+0100\n"
+"PO-Revision-Date: 2014-10-23 18:11+0100\n"
+"Last-Translator: \n"
+"Language-Team: vendocrat <hello@vendocr.at>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../classes/class-wc-payment-methods.php:60
+msgid "Bank Transfer"
+msgstr "Bank-Überweisung"
+
+#: ../classes/class-wc-payment-methods.php:65
+msgid "Cash"
+msgstr "Bargeld"
+
+#: ../classes/class-wc-payment-methods.php:66
+msgid "Cash on Delivery"
+msgstr "Nachname"
+
+#: ../classes/class-wc-payment-methods.php:69
+msgid "Pay with Cheque"
+msgstr "Mit Scheck bezahlen"
+
+#: ../classes/class-wc-payment-methods.php:71
+msgid "Credit Card"
+msgstr "Kreditkarte"
+
+#: ../classes/class-wc-payment-methods.php:76
+#: ../classes/class-wc-payment-methods.php:77
+#: ../classes/class-wc-payment-methods.php:83
+#: ../classes/class-wc-payment-methods.php:95
+msgid "Invoice"
+msgstr "Rechnung"
+
+#: ../classes/class-widget-wc-payment-methods.php:33
+msgid "Payment Methods"
+msgstr "Zahlungsmethoden"
+
+#: ../classes/class-widget-wc-payment-methods.php:34
+msgid "Easily display your accepted payment methods"
+msgstr "Spielend leicht alle akzeptierten Zahlungsmethoden anzeigen"
+
+#: ../classes/class-widget-wc-payment-methods.php:35
+msgid "Accepted Payment Methods"
+msgstr "Akzeptierte Zahlungsmethoden"
+
+#: ../classes/class-widget-wc-payment-methods.php:107
+msgid "Title"
+msgstr "Titel"
+
+#: ../classes/class-widget-wc-payment-methods.php:111
+msgid "Style"
+msgstr "Stil"
+
+#: ../classes/class-widget-wc-payment-methods.php:113
+msgid "Default"
+msgstr "Standard"
+
+#: ../classes/class-widget-wc-payment-methods.php:114
+msgid "Inverse"
+msgstr "Inverse"
+
+#: ../classes/class-widget-wc-payment-methods.php:115
+msgid "Outline"
+msgstr "Kontur"
+
+#: ../classes/class-widget-wc-payment-methods.php:119
+msgid "Add Tooltip markup?"
+msgstr "Tooltip-Markup hinzufügen?"
+
+#: ../classes/class-widget-wc-payment-methods.php:121
+msgid "No"
+msgstr "Nein"
+
+#: ../classes/class-widget-wc-payment-methods.php:122
+msgid "Yes"
+msgstr "Ja"
+
+#: ../classes/class-widget-wc-payment-methods.php:126
+msgid "Placement"
+msgstr "Platzierung"
+
+#: ../classes/class-widget-wc-payment-methods.php:128
+msgid "Top"
+msgstr "Oben"
+
+#: ../classes/class-widget-wc-payment-methods.php:129
+msgid "Right"
+msgstr "Rechts"
+
+#: ../classes/class-widget-wc-payment-methods.php:130
+msgid "Bottom"
+msgstr "Unten"
+
+#: ../classes/class-widget-wc-payment-methods.php:131
+msgid "Left"
+msgstr "Links"
+
+#: ../classes/class-widget-wc-payment-methods.php:135
+msgid "Extra classes"
+msgstr "Zusätzliche Klassen"
diff --git a/languages/woocommerce-payment-methods-it_IT.mo b/languages/woocommerce-payment-methods-it_IT.mo
new file mode 100644
index 0000000..cab7d9c
Binary files /dev/null and b/languages/woocommerce-payment-methods-it_IT.mo differ
diff --git a/languages/woocommerce-payment-methods-it_IT.po b/languages/woocommerce-payment-methods-it_IT.po
new file mode 100644
index 0000000..1483c01
--- /dev/null
+++ b/languages/woocommerce-payment-methods-it_IT.po
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WooCommerce Payment Methods\n"
+"POT-Creation-Date: 2014-10-23 18:12+0100\n"
+"PO-Revision-Date: 2014-10-23 18:12+0100\n"
+"Last-Translator: \n"
+"Language-Team: vendocrat <hello@vendocr.at>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../classes/class-wc-payment-methods.php:60
+msgid "Bank Transfer"
+msgstr "Trasferimento bancario"
+
+#: ../classes/class-wc-payment-methods.php:65
+msgid "Cash"
+msgstr "Contanti"
+
+#: ../classes/class-wc-payment-methods.php:66
+msgid "Cash on Delivery"
+msgstr "Pagamento con contrassegno"
+
+#: ../classes/class-wc-payment-methods.php:69
+msgid "Pay with Cheque"
+msgstr "Paga con assegno"
+
+#: ../classes/class-wc-payment-methods.php:71
+msgid "Credit Card"
+msgstr "Carta di credito"
+
+#: ../classes/class-wc-payment-methods.php:76
+#: ../classes/class-wc-payment-methods.php:77
+#: ../classes/class-wc-payment-methods.php:83
+#: ../classes/class-wc-payment-methods.php:95
+msgid "Invoice"
+msgstr "Fatture"
+
+#: ../classes/class-widget-wc-payment-methods.php:33
+msgid "Payment Methods"
+msgstr "Metodi di pagamento"
+
+#: ../classes/class-widget-wc-payment-methods.php:34
+msgid "Easily display your accepted payment methods"
+msgstr "Mostra con facilità i tuoi metodi di pagamento accettati"
+
+#: ../classes/class-widget-wc-payment-methods.php:35
+msgid "Accepted Payment Methods"
+msgstr "Metodi di pagamento accettati"
+
+#: ../classes/class-widget-wc-payment-methods.php:107
+msgid "Title"
+msgstr "Titolo"
+
+#: ../classes/class-widget-wc-payment-methods.php:111
+msgid "Style"
+msgstr "Stile"
+
+#: ../classes/class-widget-wc-payment-methods.php:113
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../classes/class-widget-wc-payment-methods.php:114
+msgid "Inverse"
+msgstr "Inverso"
+
+#: ../classes/class-widget-wc-payment-methods.php:115
+msgid "Outline"
+msgstr "Contorno"
+
+#: ../classes/class-widget-wc-payment-methods.php:119
+msgid "Add Tooltip markup?"
+msgstr "Aggiungere Tooltip markup?"
+
+#: ../classes/class-widget-wc-payment-methods.php:121
+msgid "No"
+msgstr "No"
+
+#: ../classes/class-widget-wc-payment-methods.php:122
+msgid "Yes"
+msgstr "Si"
+
+#: ../classes/class-widget-wc-payment-methods.php:126
+msgid "Placement"
+msgstr "Posizione"
+
+#: ../classes/class-widget-wc-payment-methods.php:128
+msgid "Top"
+msgstr "Sopra"
+
+#: ../classes/class-widget-wc-payment-methods.php:129
+msgid "Right"
+msgstr "Destra"
+
+#: ../classes/class-widget-wc-payment-methods.php:130
+msgid "Bottom"
+msgstr "Abbasso"
+
+#: ../classes/class-widget-wc-payment-methods.php:131
+msgid "Left"
+msgstr "Sinistra"
+
+#: ../classes/class-widget-wc-payment-methods.php:135
+msgid "Extra classes"
+msgstr "Classi extra"
diff --git a/languages/payment-methods-en_GB.mo b/languages/woocommerce-payment-methods.mo
similarity index 83%
rename from languages/payment-methods-en_GB.mo
rename to languages/woocommerce-payment-methods.mo
index 238ee10..d518eb3 100644
Binary files a/languages/payment-methods-en_GB.mo and b/languages/woocommerce-payment-methods.mo differ
diff --git a/languages/woocommerce-payment-methods.pot b/languages/woocommerce-payment-methods.pot
new file mode 100644
index 0000000..1b28f12
--- /dev/null
+++ b/languages/woocommerce-payment-methods.pot
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WooCommerce Payment Methods\n"
+"POT-Creation-Date: 2014-10-23 18:11+0100\n"
+"PO-Revision-Date: 2014-10-23 18:11+0100\n"
+"Last-Translator: \n"
+"Language-Team: vendocrat <hello@vendocr.at>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../classes/class-wc-payment-methods.php:60
+msgid "Bank Transfer"
+msgstr ""
+
+#: ../classes/class-wc-payment-methods.php:65
+msgid "Cash"
+msgstr ""
+
+#: ../classes/class-wc-payment-methods.php:66
+msgid "Cash on Delivery"
+msgstr ""
+
+#: ../classes/class-wc-payment-methods.php:69
+msgid "Pay with Cheque"
+msgstr ""
+
+#: ../classes/class-wc-payment-methods.php:71
+msgid "Credit Card"
+msgstr ""
+
+#: ../classes/class-wc-payment-methods.php:76
+#: ../classes/class-wc-payment-methods.php:77
+#: ../classes/class-wc-payment-methods.php:83
+#: ../classes/class-wc-payment-methods.php:95
+msgid "Invoice"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:33
+msgid "Payment Methods"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:34
+msgid "Easily display your accepted payment methods"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:35
+msgid "Accepted Payment Methods"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:107
+msgid "Title"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:111
+msgid "Style"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:113
+msgid "Default"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:114
+msgid "Inverse"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:115
+msgid "Outline"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:119
+msgid "Add Tooltip markup?"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:121
+msgid "No"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:122
+msgid "Yes"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:126
+msgid "Placement"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:128
+msgid "Top"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:129
+msgid "Right"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:130
+msgid "Bottom"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:131
+msgid "Left"
+msgstr ""
+
+#: ../classes/class-widget-wc-payment-methods.php:135
+msgid "Extra classes"
+msgstr ""
diff --git a/readme.txt b/readme.txt
index 6f78513..7f3559c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link:       http://vendocr.at/donate/
 Tags:              woocommerce, credit card, logo, payment
 Requires at least: 3.5
 Tested up to:      4.1
-Stable tag:        0.2.1
+Stable tag:        0.3.0
 License:           GNU General Public License v3.0
 License URI:       http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -24,7 +24,7 @@ This plugin uses the webfont [PaymentFont](https://github.com/vendocrat/PaymentF
 
 **Contributions**
 
-Contributions are warmly welcome via [GitHub](https://github.com/vendocrat/).
+Contributions are warmly welcome via [GitHub](https://github.com/vendocrat/WooCommerce-Payment-Methods).
 
 **Translations**
 
@@ -34,13 +34,13 @@ Translations included:
 *   German
 *   Italian
 
-Please contact us via [Twitter](https://twitter.com/vendocrat) or hit us on [GitHub](https://github.com/vendocrat/), if you have a translation you want to contribute!
+Please contact us via [Twitter](https://twitter.com/vendocrat) or hit us on [GitHub](https://github.com/vendocrat/WooCommerce-Payment-Methods), if you have a translation you want to contribute!
 
 == Installation ==
 
 1. Upload 'woocommerce-payment-methods' to the '/wp-content/plugins/' directory
 2. Activate the plugin through the 'Plugins' menu in WordPress
-3. Display your accepted methods via: Shortcode [v_woo_payment_methods], Widget or template tag '<?php v_woo_payment_methods(); ?>.
+3. Display your accepted methods via: Shortcode [wc_payment_methods], Widget or template tag '<?php wc_payment_methods(); ?>.
 4. Done!
 
 == Frequently Asked Questions ==
@@ -73,4 +73,7 @@ Now using PaymentFont to display brand icons. Fixed textdomain issue plus some m
 Fixed typo.
 
 = 0.2.2 =
-Added CSS to replace payment provider images on WooCommerce Checkout with PaymentFont icons (see screenshots).
\ No newline at end of file
+Added CSS to replace payment provider images on WooCommerce Checkout with PaymentFont icons (see screenshots).
+
+= 0.3.0 =
+Improved payment gateway function. Partial rewrite to fit our internal plugin standard. Improved l10n handling.
\ No newline at end of file
diff --git a/woocommerce-payment-methods.php b/woocommerce-payment-methods.php
new file mode 100644
index 0000000..892b6d5
--- /dev/null
+++ b/woocommerce-payment-methods.php
@@ -0,0 +1,27 @@
+<?php
+/* Plugin Name: WooCommerce Payment Methods
+ * Plugin URI:  http://vendocr.at/
+ * Description: <strong>Easily display your accepted payment methods from WooCommerce.</strong> Handcrafted with &hearts; by <a href='http://vendocr.at/'>vendocrat</a> in Vienna.
+ * Version:     0.3.0
+ * Author:      vendocrat
+ * Author URI:  http://vendocr.at/
+ * License:     vendocrat Split License
+ * License URI: http://vendocr.at/legal/licenses
+ */
+
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+// check dependencies
+if ( ! in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) )
+	return;
+
+// require classes
+require_once( 'classes/class-wc-payment-methods.php' );
+
+global $vendocrat_wc_payment_methods;
+$vendocrat_wc_payment_methods = new vendocrat_WC_Payment_Methods( __FILE__ );
+$vendocrat_wc_payment_methods->version = '0.1.0';
+
+/*
+ * E fatto!
+ */
\ No newline at end of file