diff --git a/database/migrations/2018_03_30_115805_add_more_custom_fields.php b/database/migrations/2018_03_30_115805_add_more_custom_fields.php
index 4d071d1a3e1f..a79100fc7331 100644
--- a/database/migrations/2018_03_30_115805_add_more_custom_fields.php
+++ b/database/migrations/2018_03_30_115805_add_more_custom_fields.php
@@ -136,7 +136,6 @@ class AddMoreCustomFields extends Migration
             $table->string('ip')->nullable();
         });
 
-        DB::statement('UPDATE gateways SET provider = "Custom1" WHERE id = 62');
         DB::statement('UPDATE gateway_types SET alias = "custom1", name = "Custom 1" WHERE id = 6');
     }
 
diff --git a/database/seeds/GatewayTypesSeeder.php b/database/seeds/GatewayTypesSeeder.php
index 92624db71730..2e25ff351b15 100644
--- a/database/seeds/GatewayTypesSeeder.php
+++ b/database/seeds/GatewayTypesSeeder.php
@@ -14,18 +14,18 @@ class GatewayTypesSeeder extends Seeder
             ['alias' => 'paypal', 'name' => 'PayPal'],
             ['alias' => 'bitcoin', 'name' => 'Bitcoin'],
             ['alias' => 'dwolla', 'name' => 'Dwolla'],
-            ['alias' => 'custom1', 'name' => 'Custom 1'],
+            ['alias' => 'custom1', 'name' => 'Custom'],
             ['alias' => 'alipay', 'name' => 'Alipay'],
             ['alias' => 'sofort', 'name' => 'Sofort'],
             ['alias' => 'sepa', 'name' => 'SEPA'],
             ['alias' => 'gocardless', 'name' => 'GoCardless'],
             ['alias' => 'apple_pay', 'name' => 'Apple Pay'],
-            ['alias' => 'custom2', 'name' => 'Custom 2'],
-            ['alias' => 'custom3', 'name' => 'Custom 3'],
+            ['alias' => 'custom2', 'name' => 'Custom'],
+            ['alias' => 'custom3', 'name' => 'Custom'],
         ];
 
         foreach ($gateway_types as $gateway_type) {
-            $record = GatewayType::where('name', '=', $gateway_type['name'])->first();
+            $record = GatewayType::where('alias', '=', $gateway_type['alias'])->first();
             if (! $record) {
                 GatewayType::create($gateway_type);
             }
diff --git a/database/setup.sql b/database/setup.sql
index 6eaa0a6bd9ce..e9606377f975 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -1201,7 +1201,7 @@ CREATE TABLE `gateway_types` (
 
 LOCK TABLES `gateway_types` WRITE;
 /*!40000 ALTER TABLE `gateway_types` DISABLE KEYS */;
-INSERT INTO `gateway_types` VALUES (1,'credit_card','Credit Card'),(2,'bank_transfer','Bank Transfer'),(3,'paypal','PayPal'),(4,'bitcoin','Bitcoin'),(5,'dwolla','Dwolla'),(6,'custom1','Custom 1'),(7,'alipay','Alipay'),(8,'sofort','Sofort'),(9,'sepa','SEPA'),(10,'gocardless','GoCardless'),(11,'apple_pay','Apple Pay'),(12,'custom2','Custom 2'),(13,'custom3','Custom 3');
+INSERT INTO `gateway_types` VALUES (1,'credit_card','Credit Card'),(2,'bank_transfer','Bank Transfer'),(3,'paypal','PayPal'),(4,'bitcoin','Bitcoin'),(5,'dwolla','Dwolla'),(6,'custom1','Custom'),(7,'alipay','Alipay'),(8,'sofort','Sofort'),(9,'sepa','SEPA'),(10,'gocardless','GoCardless'),(11,'apple_pay','Apple Pay'),(12,'custom2','Custom'),(13,'custom3','Custom');
 /*!40000 ALTER TABLE `gateway_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1236,7 +1236,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2018-04-13 06:49:13','2018-04-13 06:49:13','Authorize.Net AIM','AuthorizeNet_AIM',1,1,5,0,NULL,0,0),(2,'2018-04-13 06:49:13','2018-04-13 06:49:13','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2018-04-13 06:49:13','2018-04-13 06:49:13','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2018-04-13 06:49:13','2018-04-13 06:49:13','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2018-04-13 06:49:13','2018-04-13 06:49:13','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2018-04-13 06:49:13','2018-04-13 06:49:13','GoCardless','GoCardless',1,2,10000,0,NULL,1,0),(7,'2018-04-13 06:49:13','2018-04-13 06:49:13','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2018-04-13 06:49:14','2018-04-13 06:49:14','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2018-04-13 06:49:14','2018-04-13 06:49:14','Mollie','Mollie',1,1,8,0,NULL,1,0),(10,'2018-04-13 06:49:14','2018-04-13 06:49:14','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2018-04-13 06:49:14','2018-04-13 06:49:14','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2018-04-13 06:49:14','2018-04-13 06:49:14','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2018-04-13 06:49:14','2018-04-13 06:49:14','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2018-04-13 06:49:14','2018-04-13 06:49:14','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2018-04-13 06:49:14','2018-04-13 06:49:14','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2018-04-13 06:49:14','2018-04-13 06:49:14','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2018-04-13 06:49:14','2018-04-13 06:49:14','PayPal Express','PayPal_Express',1,1,4,0,NULL,1,0),(18,'2018-04-13 06:49:14','2018-04-13 06:49:14','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2018-04-13 06:49:14','2018-04-13 06:49:14','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2018-04-13 06:49:14','2018-04-13 06:49:14','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2018-04-13 06:49:14','2018-04-13 06:49:14','SagePay Server','SagePay_Server',1,1,10000,0,NULL,1,0),(22,'2018-04-13 06:49:14','2018-04-13 06:49:14','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2018-04-13 06:49:14','2018-04-13 06:49:14','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2018-04-13 06:49:14','2018-04-13 06:49:14','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2018-04-13 06:49:14','2018-04-13 06:49:14','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2018-04-13 06:49:14','2018-04-13 06:49:14','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2018-04-13 06:49:14','2018-04-13 06:49:14','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2018-04-13 06:49:14','2018-04-13 06:49:14','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2018-04-13 06:49:14','2018-04-13 06:49:14','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2018-04-13 06:49:14','2018-04-13 06:49:14','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2018-04-13 06:49:14','2018-04-13 06:49:14','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2018-04-13 06:49:14','2018-04-13 06:49:14','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2018-04-13 06:49:14','2018-04-13 06:49:14','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2018-04-13 06:49:14','2018-04-13 06:49:14','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2018-04-13 06:49:14','2018-04-13 06:49:14','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2018-04-13 06:49:14','2018-04-13 06:49:14','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2018-04-13 06:49:14','2018-04-13 06:49:14','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2018-04-13 06:49:14','2018-04-13 06:49:14','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2018-04-13 06:49:14','2018-04-13 06:49:14','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2018-04-13 06:49:14','2018-04-13 06:49:14','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2018-04-13 06:49:14','2018-04-13 06:49:14','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2018-04-13 06:49:14','2018-04-13 06:49:14','BitPay','BitPay',1,1,7,0,NULL,1,0),(43,'2018-04-13 06:49:14','2018-04-13 06:49:14','Dwolla','Dwolla',1,1,6,0,NULL,1,0),(44,'2018-04-13 06:49:14','2018-04-13 06:49:14','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2018-04-13 06:49:14','2018-04-13 06:49:14','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2018-04-13 06:49:14','2018-04-13 06:49:14','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2018-04-13 06:49:14','2018-04-13 06:49:14','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2018-04-13 06:49:14','2018-04-13 06:49:14','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2018-04-13 06:49:14','2018-04-13 06:49:14','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2018-04-13 06:49:14','2018-04-13 06:49:14','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2018-04-13 06:49:14','2018-04-13 06:49:14','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2018-04-13 06:49:14','2018-04-13 06:49:14','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2018-04-13 06:49:14','2018-04-13 06:49:14','Multicards','Multicards',1,2,10000,0,NULL,0,0),(54,'2018-04-13 06:49:14','2018-04-13 06:49:14','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2018-04-13 06:49:14','2018-04-13 06:49:14','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2018-04-13 06:49:14','2018-04-13 06:49:14','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2018-04-13 06:49:14','2018-04-13 06:49:14','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2018-04-13 06:49:14','2018-04-13 06:49:14','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2018-04-13 06:49:14','2018-04-13 06:49:14','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2018-04-13 06:49:14','2018-04-13 06:49:14','WePay','WePay',1,1,3,0,NULL,0,0),(61,'2018-04-13 06:49:14','2018-04-13 06:49:14','Braintree','Braintree',1,1,3,0,NULL,0,0),(62,'2018-04-13 06:49:14','2018-04-13 06:49:14','Custom','Custom1',1,1,20,0,NULL,1,0),(63,'2018-04-13 06:49:14','2018-04-13 06:49:14','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0),(64,'2018-04-13 06:49:14','2018-04-13 06:49:14','GoCardless','GoCardlessV2\\Redirect',1,1,9,0,NULL,1,0),(65,'2018-04-13 06:49:14','2018-04-13 06:49:14','PagSeguro','PagSeguro',1,1,10000,0,NULL,0,0),(66,'2018-04-13 06:49:14','2018-04-13 06:49:14','PAYMILL','Paymill',1,1,10000,0,NULL,0,0),(67,'2018-04-13 06:49:14','2018-04-13 06:49:14','Custom','Custom2',1,1,21,0,NULL,1,0),(68,'2018-04-13 06:49:14','2018-04-13 06:49:14','Custom','Custom3',1,1,22,0,NULL,1,0);
+INSERT INTO `gateways` VALUES (1,'2018-04-13 10:44:53','2018-04-13 10:44:53','Authorize.Net AIM','AuthorizeNet_AIM',1,1,5,0,NULL,0,0),(2,'2018-04-13 10:44:53','2018-04-13 10:44:53','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2018-04-13 10:44:53','2018-04-13 10:44:53','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2018-04-13 10:44:53','2018-04-13 10:44:53','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2018-04-13 10:44:53','2018-04-13 10:44:53','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2018-04-13 10:44:53','2018-04-13 10:44:53','GoCardless','GoCardless',1,2,10000,0,NULL,1,0),(7,'2018-04-13 10:44:53','2018-04-13 10:44:53','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2018-04-13 10:44:53','2018-04-13 10:44:53','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2018-04-13 10:44:53','2018-04-13 10:44:53','Mollie','Mollie',1,1,8,0,NULL,1,0),(10,'2018-04-13 10:44:53','2018-04-13 10:44:53','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2018-04-13 10:44:53','2018-04-13 10:44:53','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2018-04-13 10:44:53','2018-04-13 10:44:53','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2018-04-13 10:44:53','2018-04-13 10:44:53','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2018-04-13 10:44:53','2018-04-13 10:44:53','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2018-04-13 10:44:53','2018-04-13 10:44:53','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2018-04-13 10:44:53','2018-04-13 10:44:53','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2018-04-13 10:44:53','2018-04-13 10:44:53','PayPal Express','PayPal_Express',1,1,4,0,NULL,1,0),(18,'2018-04-13 10:44:53','2018-04-13 10:44:53','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2018-04-13 10:44:53','2018-04-13 10:44:53','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2018-04-13 10:44:53','2018-04-13 10:44:53','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2018-04-13 10:44:53','2018-04-13 10:44:53','SagePay Server','SagePay_Server',1,1,10000,0,NULL,1,0),(22,'2018-04-13 10:44:53','2018-04-13 10:44:53','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2018-04-13 10:44:53','2018-04-13 10:44:53','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2018-04-13 10:44:53','2018-04-13 10:44:53','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2018-04-13 10:44:53','2018-04-13 10:44:53','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2018-04-13 10:44:53','2018-04-13 10:44:53','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2018-04-13 10:44:53','2018-04-13 10:44:53','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2018-04-13 10:44:53','2018-04-13 10:44:53','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2018-04-13 10:44:53','2018-04-13 10:44:53','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2018-04-13 10:44:53','2018-04-13 10:44:53','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2018-04-13 10:44:53','2018-04-13 10:44:53','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2018-04-13 10:44:53','2018-04-13 10:44:53','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2018-04-13 10:44:53','2018-04-13 10:44:53','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2018-04-13 10:44:53','2018-04-13 10:44:53','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2018-04-13 10:44:53','2018-04-13 10:44:53','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2018-04-13 10:44:53','2018-04-13 10:44:53','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2018-04-13 10:44:53','2018-04-13 10:44:53','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2018-04-13 10:44:53','2018-04-13 10:44:53','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2018-04-13 10:44:53','2018-04-13 10:44:53','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2018-04-13 10:44:53','2018-04-13 10:44:53','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2018-04-13 10:44:53','2018-04-13 10:44:53','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2018-04-13 10:44:53','2018-04-13 10:44:53','BitPay','BitPay',1,1,7,0,NULL,1,0),(43,'2018-04-13 10:44:53','2018-04-13 10:44:53','Dwolla','Dwolla',1,1,6,0,NULL,1,0),(44,'2018-04-13 10:44:53','2018-04-13 10:44:53','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2018-04-13 10:44:53','2018-04-13 10:44:53','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2018-04-13 10:44:53','2018-04-13 10:44:53','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2018-04-13 10:44:53','2018-04-13 10:44:53','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2018-04-13 10:44:53','2018-04-13 10:44:53','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2018-04-13 10:44:53','2018-04-13 10:44:53','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2018-04-13 10:44:53','2018-04-13 10:44:53','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2018-04-13 10:44:53','2018-04-13 10:44:53','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2018-04-13 10:44:53','2018-04-13 10:44:53','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2018-04-13 10:44:53','2018-04-13 10:44:53','Multicards','Multicards',1,2,10000,0,NULL,0,0),(54,'2018-04-13 10:44:53','2018-04-13 10:44:53','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2018-04-13 10:44:53','2018-04-13 10:44:53','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2018-04-13 10:44:53','2018-04-13 10:44:53','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2018-04-13 10:44:53','2018-04-13 10:44:53','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2018-04-13 10:44:53','2018-04-13 10:44:53','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2018-04-13 10:44:53','2018-04-13 10:44:53','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2018-04-13 10:44:53','2018-04-13 10:44:53','WePay','WePay',1,1,3,0,NULL,0,0),(61,'2018-04-13 10:44:53','2018-04-13 10:44:53','Braintree','Braintree',1,1,3,0,NULL,0,0),(62,'2018-04-13 10:44:53','2018-04-13 10:44:53','Custom','Custom1',1,1,20,0,NULL,1,0),(63,'2018-04-13 10:44:53','2018-04-13 10:44:53','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0),(64,'2018-04-13 10:44:53','2018-04-13 10:44:53','GoCardless','GoCardlessV2\\Redirect',1,1,9,0,NULL,1,0),(65,'2018-04-13 10:44:53','2018-04-13 10:44:53','PagSeguro','PagSeguro',1,1,10000,0,NULL,0,0),(66,'2018-04-13 10:44:53','2018-04-13 10:44:53','PAYMILL','Paymill',1,1,10000,0,NULL,0,0),(67,'2018-04-13 10:44:53','2018-04-13 10:44:53','Custom','Custom2',1,1,21,0,NULL,1,0),(68,'2018-04-13 10:44:53','2018-04-13 10:44:53','Custom','Custom3',1,1,22,0,NULL,1,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1843,7 +1843,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2018-04-13 06:49:12','2018-04-13 06:49:12','Omnipay',1),(2,'2018-04-13 06:49:12','2018-04-13 06:49:12','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2018-04-13 10:44:51','2018-04-13 10:44:51','Omnipay',1),(2,'2018-04-13 10:44:51','2018-04-13 10:44:51','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1950,7 +1950,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,1),(2,10,'Net 10','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,2),(3,14,'Net 14','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,3),(4,15,'Net 15','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,4),(5,30,'Net 30','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,5),(6,60,'Net 60','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,6),(7,90,'Net 90','2018-04-13 06:49:12','2018-04-13 06:49:12',NULL,0,0,7),(8,-1,'Net 0','2018-04-13 06:49:16','2018-04-13 06:49:16',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,1),(2,10,'Net 10','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,2),(3,14,'Net 14','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,3),(4,15,'Net 15','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,4),(5,30,'Net 30','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,5),(6,60,'Net 60','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,6),(7,90,'Net 90','2018-04-13 10:44:51','2018-04-13 10:44:51',NULL,0,0,7),(8,-1,'Net 0','2018-04-13 10:44:55','2018-04-13 10:44:55',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2290,7 +2290,7 @@ CREATE TABLE `proposal_templates` (
 
 LOCK TABLES `proposal_templates` WRITE;
 /*!40000 ALTER TABLE `proposal_templates` DISABLE KEYS */;
-INSERT INTO `proposal_templates` VALUES (1,NULL,NULL,'2018-04-13 06:49:15','2018-04-13 06:49:15',NULL,0,'','Clean','<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n\n	<tr class=\"grey-bg\">\n		<td><img src=\"$logoUrl\" width=\"193\"/></td>\n		<td align=\"right\"><p class=\"quote quote-number grey-upper\">Proposal #$quoteNumber</p></td>\n	</tr>\n\n	<tr class=\"top-header grey-bg\">\n		<td colspan=\"2\" align=\"center\">\n			<h1 class=\"heading\">New Business Proposal</h1>\n			<p class=\"quote quoteDate grey-upper\">Valid Until $validUntil</p>\n		</td>\n	</tr>\n\n	<tr align=\"center\" class=\"grey-bg proposal-info\">\n		<td>\n			<p class=\"blue-upper\">Prepared for:</p>\n			<h3 class=\"client name\">$client.name</h3>\n			<p>\n				<span class=\"client address1\">$client.address1</span><br/>\n				<span class=\"client city\">$client.city</span>, <span class=\"client state\">$client.state</span> <span class=\"client postal-code\">$client.postal_code</span></p>\n			</td>\n			<td>\n				<p class=\"blue-upper\">Prepared by:</p>\n				<h3 class=\"account name\">$account.name</h3>\n				<p>\n					<span class=\"account address1\">$account.address1</span><br/>\n					<span class=\"account city\">$account.city</span>, <span class=\"account state\">$account.state</span> <span class=\"account postal-code\">$account.postal_code</span></p>\n				</td>\n			</tr>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\" class=\"card-content\">\n			<h2 class=\"card-title\">Project Description:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p><br/>\n		</td>\n	</tr>\n	<tr>\n		<td colspan=\"2\">\n			<hr/>\n		</td>\n	</tr>\n	<tr>\n		<td class=\"grid-item-card card-content\">\n			<h2 class=\"card-title\">Objective:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n		<td class=\"grid-item-card card-content\">\n			<h2 class=\"card-title\">Goal:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n	</tr>\n\n	<tr class=\"block-quote\" align=\"center\">\n		<td colspan=\"2\">\n			<img src=\"$quoteImageUrl\" width=\"25\"/>\n			<p class=\"quote\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce congue auctor magna id sodales. Maecenas mollis justo sed tempor facilisis. Ut malesuada in nibh ultrices auctor. Proin id maximus ipsum. Sed eu magna ac nisl sollicitudin porta in non augue. Mauris feugiat interdum aliquam. Aliquam ultrices interdum dolor.</p>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\">\n			<table>\n				<tr class=\"card-content\">\n					<td><img width=\"150px\" srcx=\"img/thumb-square.jpg\"/></td>\n					<td><h2 class=\"card-title\">Objective:</h2>\n						<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n					</td>\n				</tr>\n				<tr class=\"card-content\">\n					<td><img width=\"150px\" srcx=\"img/thumb-square.jpg\"/></td>\n					<td><h2 class=\"card-title\">Objective:</h2>\n						<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n					</td>\n				</tr>\n			</table>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\">\n			<hr/>\n		</td>\n	</tr>\n\n	<tr>\n		<td class=\"grid-item-card card-content\">\n			<img width=\"250px\" height=\"150px\" srcx=\"img/thumb-rectangle.jpg\"/>\n			<h2 class=\"card-title\">Objective:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n		<td class=\"grid-item-card card-content\">\n			<img width=\"250px\" height=\"150px\" srcx=\"img/thumb-rectangle.jpg\"/>\n			<h2 class=\"card-title\">Goal:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n	</tr>\n\n	<tr class=\"footer\" align=\"center\">\n		<td colspan=\"2\"></td>\n	</tr>\n\n</table>\n','body {\n    font-family: \'Open Sans\', Helvetica, arial, sans-serif;\n    color: #161616;\n}\n\n.grey-upper {\n	font-size: 11px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #9a9a9a;\n}\n\n.blue-upper {\n	padding-bottom: 8px;\n	font-size: 11px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #37a3c6;\n	margin: 0;\n}\n\np span.client  {\n	margin:5px 0px 0px 0px;\n}\n\nh1.heading {\n	font-size: 48px;\n	line-height: 53px;\n	text-transform: uppercase;\n	font-weight: 100;\n	letter-spacing: 3px;\n	padding: 0 50px;\n}\n\nh3.client.name {\n	padding: 0;\n	margin: 0 0 -10px 0;\n	font-size:18px;\n	font-weight: 600;\n}\n\nspan.client.address1, span.client.city, span.client.state, span.client.postal-code {\n	font-size: 14px;\n	line-height: 18.5px;\n}\n\nh3.account.name {\n	padding: 0;\n	margin: 0 0 -10px 0;\n	font-size:18px;\n	font-weight: 600;\n}\n\nspan.account.address1, span.account.city, span.account.state, span.account.postal-code {\n	font-size: 14px;\n	line-height: 18.5px;\n}\n\n\n.card-title {\n	font-size: 13px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #37a3c6;\n	font-weight: 600;\n}\n\n.card-text {\n	font-size: 15px;\n	line-height: 21px;\n}\n\n\na.button {\n	background: #37a3c6;\n	padding: 12px 25px;\n	border-radius: 2px;\n	color: #fff;\n	text-transform: uppercase;\n	font-size: 12px;\n	text-decoration: none;\n	letter-spacing: 3px;\n	font-weight: 600;\n	margin: 15px 0;\n}\n\na.button:hover {\n	background: #161616;\n}\n\n/****** Table *****************************************/\n\n.grey-bg {\n	background: #eeefef;\n}\n\ntable td {\n	padding: 20px;\n}\n\ntr.top-header {\n	height: 350px;\n}\n\ntr.top-header td {\n	padding: 80px 0 0 0;\n	border-bottom: 1px solid #dddcdc;\n}\n\ntr.top-header h1.heading {\n	margin: 0;\n}\n\ntr.top-header p {\n	margin: 5px 0 0 0;\n}\n\n.proposal-info {\n	height: 350px;\n}\n\n.proposal-info td {\n	padding: 0 0 120px 0;\n}\n\ntr.block-quote {\n	margin: 50px 0 ;\n}\n\ntr.block-quote td {\n	background: #fbfbfb;\n	font-style: italic;\n	padding: 0 75px;\n	font-size: 17px;\n	line-height: 24px;\n	padding: 80px 120px;\n	color: #686766;\n	border-top: 1px solid #dddcdc;\n	border-bottom: 1px solid #dddcdc;\n}\n\ntr.footer td {\n	background: #f0efef;\n	font-size: 12px;\n	letter-spacing: 3px;\n	color: #8c8b8a;\n	padding: 50px 0;\n	text-transform: uppercase;\n}\n\n/****** Misc *****************************************/\n\n\nhr {\n	border: 0;\n	height: 1px;\n	background: #dddada;\n}\n\n.footer img {\n	vertical-align: middle;\n}\n',1);
+INSERT INTO `proposal_templates` VALUES (1,NULL,NULL,'2018-04-13 10:44:54','2018-04-13 10:44:54',NULL,0,'','Clean','<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n\n	<tr class=\"grey-bg\">\n		<td><img src=\"$logoUrl\" width=\"193\"/></td>\n		<td align=\"right\"><p class=\"quote quote-number grey-upper\">Proposal #$quoteNumber</p></td>\n	</tr>\n\n	<tr class=\"top-header grey-bg\">\n		<td colspan=\"2\" align=\"center\">\n			<h1 class=\"heading\">New Business Proposal</h1>\n			<p class=\"quote quoteDate grey-upper\">Valid Until $validUntil</p>\n		</td>\n	</tr>\n\n	<tr align=\"center\" class=\"grey-bg proposal-info\">\n		<td>\n			<p class=\"blue-upper\">Prepared for:</p>\n			<h3 class=\"client name\">$client.name</h3>\n			<p>\n				<span class=\"client address1\">$client.address1</span><br/>\n				<span class=\"client city\">$client.city</span>, <span class=\"client state\">$client.state</span> <span class=\"client postal-code\">$client.postal_code</span></p>\n			</td>\n			<td>\n				<p class=\"blue-upper\">Prepared by:</p>\n				<h3 class=\"account name\">$account.name</h3>\n				<p>\n					<span class=\"account address1\">$account.address1</span><br/>\n					<span class=\"account city\">$account.city</span>, <span class=\"account state\">$account.state</span> <span class=\"account postal-code\">$account.postal_code</span></p>\n				</td>\n			</tr>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\" class=\"card-content\">\n			<h2 class=\"card-title\">Project Description:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p><br/>\n		</td>\n	</tr>\n	<tr>\n		<td colspan=\"2\">\n			<hr/>\n		</td>\n	</tr>\n	<tr>\n		<td class=\"grid-item-card card-content\">\n			<h2 class=\"card-title\">Objective:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n		<td class=\"grid-item-card card-content\">\n			<h2 class=\"card-title\">Goal:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n	</tr>\n\n	<tr class=\"block-quote\" align=\"center\">\n		<td colspan=\"2\">\n			<img src=\"$quoteImageUrl\" width=\"25\"/>\n			<p class=\"quote\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce congue auctor magna id sodales. Maecenas mollis justo sed tempor facilisis. Ut malesuada in nibh ultrices auctor. Proin id maximus ipsum. Sed eu magna ac nisl sollicitudin porta in non augue. Mauris feugiat interdum aliquam. Aliquam ultrices interdum dolor.</p>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\">\n			<table>\n				<tr class=\"card-content\">\n					<td><img width=\"150px\" srcx=\"img/thumb-square.jpg\"/></td>\n					<td><h2 class=\"card-title\">Objective:</h2>\n						<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n					</td>\n				</tr>\n				<tr class=\"card-content\">\n					<td><img width=\"150px\" srcx=\"img/thumb-square.jpg\"/></td>\n					<td><h2 class=\"card-title\">Objective:</h2>\n						<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n					</td>\n				</tr>\n			</table>\n		</td>\n	</tr>\n\n	<tr>\n		<td colspan=\"2\">\n			<hr/>\n		</td>\n	</tr>\n\n	<tr>\n		<td class=\"grid-item-card card-content\">\n			<img width=\"250px\" height=\"150px\" srcx=\"img/thumb-rectangle.jpg\"/>\n			<h2 class=\"card-title\">Objective:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n		<td class=\"grid-item-card card-content\">\n			<img width=\"250px\" height=\"150px\" srcx=\"img/thumb-rectangle.jpg\"/>\n			<h2 class=\"card-title\">Goal:</h2>\n			<p class=\"card-text\">Koala Photography seeks a full review of their historical financial records and future accounting needs. At the start, our experts carefully review your past records and assess your financial services needs according to the nature of your company and suggest the services model best suited to your requirements. The work plan is finalized only after an initial (and possibly subsequent) extensive consultation with [Client.Company]. Periodic review of our services and client feedback is an essential feature of our work plan which ensures that we remain an efficient accounting partner for your business.</p>\n		</td>\n	</tr>\n\n	<tr class=\"footer\" align=\"center\">\n		<td colspan=\"2\"></td>\n	</tr>\n\n</table>\n','body {\n    font-family: \'Open Sans\', Helvetica, arial, sans-serif;\n    color: #161616;\n}\n\n.grey-upper {\n	font-size: 11px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #9a9a9a;\n}\n\n.blue-upper {\n	padding-bottom: 8px;\n	font-size: 11px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #37a3c6;\n	margin: 0;\n}\n\np span.client  {\n	margin:5px 0px 0px 0px;\n}\n\nh1.heading {\n	font-size: 48px;\n	line-height: 53px;\n	text-transform: uppercase;\n	font-weight: 100;\n	letter-spacing: 3px;\n	padding: 0 50px;\n}\n\nh3.client.name {\n	padding: 0;\n	margin: 0 0 -10px 0;\n	font-size:18px;\n	font-weight: 600;\n}\n\nspan.client.address1, span.client.city, span.client.state, span.client.postal-code {\n	font-size: 14px;\n	line-height: 18.5px;\n}\n\nh3.account.name {\n	padding: 0;\n	margin: 0 0 -10px 0;\n	font-size:18px;\n	font-weight: 600;\n}\n\nspan.account.address1, span.account.city, span.account.state, span.account.postal-code {\n	font-size: 14px;\n	line-height: 18.5px;\n}\n\n\n.card-title {\n	font-size: 13px;\n	letter-spacing: 3px;\n	text-transform: uppercase;\n	color: #37a3c6;\n	font-weight: 600;\n}\n\n.card-text {\n	font-size: 15px;\n	line-height: 21px;\n}\n\n\na.button {\n	background: #37a3c6;\n	padding: 12px 25px;\n	border-radius: 2px;\n	color: #fff;\n	text-transform: uppercase;\n	font-size: 12px;\n	text-decoration: none;\n	letter-spacing: 3px;\n	font-weight: 600;\n	margin: 15px 0;\n}\n\na.button:hover {\n	background: #161616;\n}\n\n/****** Table *****************************************/\n\n.grey-bg {\n	background: #eeefef;\n}\n\ntable td {\n	padding: 20px;\n}\n\ntr.top-header {\n	height: 350px;\n}\n\ntr.top-header td {\n	padding: 80px 0 0 0;\n	border-bottom: 1px solid #dddcdc;\n}\n\ntr.top-header h1.heading {\n	margin: 0;\n}\n\ntr.top-header p {\n	margin: 5px 0 0 0;\n}\n\n.proposal-info {\n	height: 350px;\n}\n\n.proposal-info td {\n	padding: 0 0 120px 0;\n}\n\ntr.block-quote {\n	margin: 50px 0 ;\n}\n\ntr.block-quote td {\n	background: #fbfbfb;\n	font-style: italic;\n	padding: 0 75px;\n	font-size: 17px;\n	line-height: 24px;\n	padding: 80px 120px;\n	color: #686766;\n	border-top: 1px solid #dddcdc;\n	border-bottom: 1px solid #dddcdc;\n}\n\ntr.footer td {\n	background: #f0efef;\n	font-size: 12px;\n	letter-spacing: 3px;\n	color: #8c8b8a;\n	padding: 50px 0;\n	text-transform: uppercase;\n}\n\n/****** Misc *****************************************/\n\n\nhr {\n	border: 0;\n	height: 1px;\n	background: #dddada;\n}\n\n.footer img {\n	vertical-align: middle;\n}\n',1);
 /*!40000 ALTER TABLE `proposal_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2880,4 +2880,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2018-04-13 12:49:16
+-- Dump completed on 2018-04-13 16:44:56