diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml
index 1eec9952..4724f30c 100644
--- a/etc/adminhtml/paymentmethods.xml
+++ b/etc/adminhtml/paymentmethods.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+-->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Config/etc/system_include.xsd">
     <include path="Paynl_Payment::paymentmethods/afterpay.xml" />
     <include path="Paynl_Payment::paymentmethods/billink.xml" />
diff --git a/etc/adminhtml/paymentmethods/afterpay.xml b/etc/adminhtml/paymentmethods/afterpay.xml
index 76270057..6b12d81d 100644
--- a/etc/adminhtml/paymentmethods/afterpay.xml
+++ b/etc/adminhtml/paymentmethods/afterpay.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_afterpay" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/billink.xml b/etc/adminhtml/paymentmethods/billink.xml
index 9ee2a716..ec4a01c8 100644
--- a/etc/adminhtml/paymentmethods/billink.xml
+++ b/etc/adminhtml/paymentmethods/billink.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_billink" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/cartebleue.xml b/etc/adminhtml/paymentmethods/cartebleue.xml
index 32ba81c1..bf157b40 100644
--- a/etc/adminhtml/paymentmethods/cartebleue.xml
+++ b/etc/adminhtml/paymentmethods/cartebleue.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_cartebleue" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/clickandbuy.xml b/etc/adminhtml/paymentmethods/clickandbuy.xml
index 70e9c3b0..42f511c4 100644
--- a/etc/adminhtml/paymentmethods/clickandbuy.xml
+++ b/etc/adminhtml/paymentmethods/clickandbuy.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_clickandbuy" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/fashioncheque.xml b/etc/adminhtml/paymentmethods/fashioncheque.xml
index af8ef4c3..88b43246 100644
--- a/etc/adminhtml/paymentmethods/fashioncheque.xml
+++ b/etc/adminhtml/paymentmethods/fashioncheque.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_fashioncheque" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/fashiongiftcard.xml b/etc/adminhtml/paymentmethods/fashiongiftcard.xml
index d1ab838f..ad32bfbd 100644
--- a/etc/adminhtml/paymentmethods/fashiongiftcard.xml
+++ b/etc/adminhtml/paymentmethods/fashiongiftcard.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_fashiongiftcard" sortOrder="600" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/gezondheidsbon.xml b/etc/adminhtml/paymentmethods/gezondheidsbon.xml
index 52ecc16e..fd837b9f 100644
--- a/etc/adminhtml/paymentmethods/gezondheidsbon.xml
+++ b/etc/adminhtml/paymentmethods/gezondheidsbon.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_gezondheidsbon" sortOrder="700" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/giropay.xml b/etc/adminhtml/paymentmethods/giropay.xml
index 1349233e..0dac16e0 100644
--- a/etc/adminhtml/paymentmethods/giropay.xml
+++ b/etc/adminhtml/paymentmethods/giropay.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_giropay" sortOrder="800" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/givacard.xml b/etc/adminhtml/paymentmethods/givacard.xml
index 7b4aa390..9701922b 100644
--- a/etc/adminhtml/paymentmethods/givacard.xml
+++ b/etc/adminhtml/paymentmethods/givacard.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_giropay" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index b5ff117b..ea59b376 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_ideal" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/maestro.xml b/etc/adminhtml/paymentmethods/maestro.xml
index af46c8bc..39ccb424 100644
--- a/etc/adminhtml/paymentmethods/maestro.xml
+++ b/etc/adminhtml/paymentmethods/maestro.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_maestro" sortOrder="1100" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/mistercash.xml b/etc/adminhtml/paymentmethods/mistercash.xml
index 764b1638..9a13cb67 100644
--- a/etc/adminhtml/paymentmethods/mistercash.xml
+++ b/etc/adminhtml/paymentmethods/mistercash.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_mistercash" sortOrder="1200" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/mybank.xml b/etc/adminhtml/paymentmethods/mybank.xml
index c94a23ce..0c8c9929 100644
--- a/etc/adminhtml/paymentmethods/mybank.xml
+++ b/etc/adminhtml/paymentmethods/mybank.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_mybank" sortOrder="1300" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/overboeking.xml b/etc/adminhtml/paymentmethods/overboeking.xml
index 1b76da49..a1c9ab9e 100644
--- a/etc/adminhtml/paymentmethods/overboeking.xml
+++ b/etc/adminhtml/paymentmethods/overboeking.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_overboeking" sortOrder="1400" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/paypal.xml b/etc/adminhtml/paymentmethods/paypal.xml
index b384feb1..8bdfdbde 100644
--- a/etc/adminhtml/paymentmethods/paypal.xml
+++ b/etc/adminhtml/paymentmethods/paypal.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_paypal" sortOrder="1500" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/paysafecard.xml b/etc/adminhtml/paymentmethods/paysafecard.xml
index aa0aa4d3..962b75e2 100644
--- a/etc/adminhtml/paymentmethods/paysafecard.xml
+++ b/etc/adminhtml/paymentmethods/paysafecard.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_paysafecard" sortOrder="1600" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml
index 13a3d83b..f76e81c6 100644
--- a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml
+++ b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_podiumcadeaukaart" sortOrder="1700" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/postepay.xml b/etc/adminhtml/paymentmethods/postepay.xml
index d566fc74..4cffadf1 100644
--- a/etc/adminhtml/paymentmethods/postepay.xml
+++ b/etc/adminhtml/paymentmethods/postepay.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_postepay" sortOrder="1800" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/sofortbanking.xml b/etc/adminhtml/paymentmethods/sofortbanking.xml
index 2ab55c14..ef06920a 100644
--- a/etc/adminhtml/paymentmethods/sofortbanking.xml
+++ b/etc/adminhtml/paymentmethods/sofortbanking.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_sofortbanking" sortOrder="1900" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/telefonischbetalen.xml b/etc/adminhtml/paymentmethods/telefonischbetalen.xml
index 40015386..7d706883 100644
--- a/etc/adminhtml/paymentmethods/telefonischbetalen.xml
+++ b/etc/adminhtml/paymentmethods/telefonischbetalen.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_telefonischbetalen" sortOrder="2000" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/visamastercard.xml b/etc/adminhtml/paymentmethods/visamastercard.xml
index b12a12fb..abeef718 100644
--- a/etc/adminhtml/paymentmethods/visamastercard.xml
+++ b/etc/adminhtml/paymentmethods/visamastercard.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_visamastercard" sortOrder="2100" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/webshopgiftcard.xml b/etc/adminhtml/paymentmethods/webshopgiftcard.xml
index 7149d4d3..339ccd9a 100644
--- a/etc/adminhtml/paymentmethods/webshopgiftcard.xml
+++ b/etc/adminhtml/paymentmethods/webshopgiftcard.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_webshopgiftcard" sortOrder="2200" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/wijncadeau.xml b/etc/adminhtml/paymentmethods/wijncadeau.xml
index 1a7bbdf3..8a8c6c37 100644
--- a/etc/adminhtml/paymentmethods/wijncadeau.xml
+++ b/etc/adminhtml/paymentmethods/wijncadeau.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_wijncadeau" sortOrder="2300" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/paymentmethods/yourgift.xml b/etc/adminhtml/paymentmethods/yourgift.xml
index 9eedc5c1..8dd12b11 100644
--- a/etc/adminhtml/paymentmethods/yourgift.xml
+++ b/etc/adminhtml/paymentmethods/yourgift.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../Config/etc/system_include.xsd">
     <group id="paynl_payment_yourgift" sortOrder="2400" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index c6b41265..980940fe 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
-
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Config/etc/system_file.xsd">
     <system>        
         <section id="payment">
@@ -32,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <label>Testmode</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>   
                 </field>
-                <group id="paynl_paymentmethods" sortOrder="101" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="paynl_paymentmethods" translate="label"  sortOrder="101" showInDefault="1" showInWebsite="1" showInStore="1">
                     <frontend_model>Paynl\Payment\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                     <label>Paymentmethods</label>
                     <include path="Paynl_Payment::paymentmethods.xml"/>
diff --git a/etc/config.xml b/etc/config.xml
index ae794e95..0ff2bffd 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2015 Andy Pieters <andy@pay.nl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
 -->
-
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
     <default>
diff --git a/etc/di.xml b/etc/di.xml
index be9bc813..308a060a 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright © 2015 Pay.nl All rights reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index d23d3df9..c85a3b67 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright © 2015 Pay.nl All rights reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
index e5f70aa9..293d171e 100644
--- a/etc/frontend/routes.xml
+++ b/etc/frontend/routes.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright © 2015 Pay.nl All rights reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
diff --git a/etc/module.xml b/etc/module.xml
index e8371daa..cde9dcf7 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Paynl_Payment" schema_version="0.0.1" setup_version="2.0.0" />
 </config>
\ No newline at end of file
diff --git a/etc/payment.xml b/etc/payment.xml
index c4fea4c6..7ab8c90b 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright © 2015 Pay.nl All rights reserved.
  */
 -->
 <payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
new file mode 100644
index 00000000..cd7680fe
--- /dev/null
+++ b/i18n/en_US.csv
@@ -0,0 +1,23 @@
+Discount,Discount
+"Something went wrong, please try again later","Something went wrong, please try again later"
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"We can't add this item to your shopping cart right now.","We can't add this item to your shopping cart right now."
+"Payment canceled","Payment canceled"
+"Enter your API-token and ServiceId first","Enter your API-token and ServiceId first"
+No,No
+Yes,Yes
+"Not available, you can enable this on admin.pay.nl","Not available, you can enable this on admin.pay.nl"
+Enabled,Enabled
+Title,Title
+"New Order Status","New Order Status"
+"Payment from Applicable Countries","Payment from Applicable Countries"
+"Payment from Specific Countries","Payment from Specific Countries"
+Instructions,Instructions
+"Minimum Order Total","Minimum Order Total"
+"Maximum Order Total","Maximum Order Total"
+"Sort Order","Sort Order"
+"Pay.nl Settings","Pay.nl Settings"
+API-token,API-token
+ServiceId,ServiceId
+Testmode,Testmode
+Paymentmethods,Paymentmethods
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
new file mode 100644
index 00000000..597596cf
--- /dev/null
+++ b/i18n/nl_NL.csv
@@ -0,0 +1,23 @@
+Discount,Korting
+"Something went wrong, please try again later","Er is iets mis gegaan, probeer het later nog eens"
+"You notified customer about invoice #%1.","Factuur: #%1 gemaakt."
+"We can't add this item to your shopping cart right now.","We kunnen dit product niet aan de winkelmand toevoegen"
+"Payment canceled","Betaling geannuleerd"
+"Enter your API-token and ServiceId first","Voer eerst uw API-token en ServiceId in"
+No,Nee
+Yes,Ja
+"Not available, you can enable this on admin.pay.nl","Niet beschikbaar, je kunt betaalmethoden inschakelen op admin.pay.nl"
+Enabled,Ingeschakeld
+Title,Titel
+"New Order Status","Nieuwe Order Status"
+"Payment from Applicable Countries","Betalingen toestaan uit alle toegestane landen"
+"Payment from Specific Countries","Betalingen alleen toestaan uit bepaalde landen"
+Instructions,Instructies
+"Minimum Order Total","Minimale order waarde"
+"Maximum Order Total","Maximale order waarde"
+"Sort Order","Sortering"
+"Pay.nl Settings","Pay.nl Instellingen"
+API-token,API-token
+ServiceId,ServiceId
+Testmode,Testmode
+Paymentmethods,Betaalmethoden
\ No newline at end of file
diff --git a/view/frontend/web/js/action/set-payment-method.js b/view/frontend/web/js/action/set-payment-method.js
index 042f32ed..5e62495b 100644
--- a/view/frontend/web/js/action/set-payment-method.js
+++ b/view/frontend/web/js/action/set-payment-method.js
@@ -1,6 +1,5 @@
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright © 2015 Pay.nl All rights reserved.
  */
 define(
     [
diff --git a/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js
index a762e9e6..622b0ee8 100644
--- a/view/frontend/web/js/view/payment/method-renderer.js
+++ b/view/frontend/web/js/view/payment/method-renderer.js
@@ -39,8 +39,7 @@ define(
         ];
         $.each(methods, function (k, method) {
             rendererList.push(method);
-        })
-
+        });
 
         return Component.extend({});
     }
diff --git a/view/frontend/web/js/view/payment/method-renderer/default.js b/view/frontend/web/js/view/payment/method-renderer/default.js
index d8adf546..772f694b 100644
--- a/view/frontend/web/js/view/payment/method-renderer/default.js
+++ b/view/frontend/web/js/view/payment/method-renderer/default.js
@@ -28,9 +28,7 @@ define(
                     setPaymentMethodAction(this.messageContainer);
                     return false;
                 }
-            },
-
-
+            }
         });
     }
 );
\ No newline at end of file