diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php
index 5cf80aff32..ef0e68ac4a 100644
--- a/app/Console/Commands/UseEncryption.php
+++ b/app/Console/Commands/UseEncryption.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 /**
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
index 01d7f675cd..3f820ed719 100644
--- a/app/Mail/RegisteredUser.php
+++ b/app/Mail/RegisteredUser.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * RegisteredUser.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php
index b5399ecd40..58b0a42f05 100644
--- a/app/Mail/RequestedNewPassword.php
+++ b/app/Mail/RequestedNewPassword.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * RequestedNewPassword.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/config/auth.php b/config/auth.php
index ddf966efc8..52d3280350 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * auth.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 return [
     'defaults'  => [
         'guard'     => 'web',
diff --git a/config/broadcasting.php b/config/broadcasting.php
index e4012544ff..3257e542d3 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * broadcasting.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/cache.php b/config/cache.php
index 464b334317..dd2dbe7a70 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,16 +1,18 @@
 <?php
-declare(strict_types=1);
 
 /**
  * cache.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
+
 return [
 
     /*
diff --git a/config/compile.php b/config/compile.php
index d5812f37c3..f627a86b7a 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * compile.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 return [
 
     /*
diff --git a/config/database.php b/config/database.php
index b17719c1b1..272de2acdc 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * database.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 // for heroku:
 $databaseUrl = getenv('DATABASE_URL');
 $host        = '';
diff --git a/config/filesystems.php b/config/filesystems.php
index 06cfd1b5d3..0a64af6c68 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * filesystems.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/firefly.php b/config/firefly.php
index 0f342a6b93..6903836d2b 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -42,6 +42,9 @@ return [
     'import_pre' => [
         'bunq' => 'FireflyIII\Support\Import\Prerequisites\BunqPrerequisites',
     ],
+    'bunq' => [
+        'server' => 'https://sandbox.public.api.bunq.com',
+    ],
     'default_export_format'      => 'csv',
     'default_import_format'      => 'csv',
     'bill_periods'               => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
diff --git a/config/mail.php b/config/mail.php
index 61d69cdc5b..f5d33fd68e 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * mail.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/queue.php b/config/queue.php
index 4d891e2d1c..592710d91d 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * queue.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/services.php b/config/services.php
index f5d419a687..bad5a03d81 100644
--- a/config/services.php
+++ b/config/services.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * services.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/twigbridge.php b/config/twigbridge.php
index d66b768afe..d438e9146a 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
-
 
 /**
- * This file is part of the TwigBridge package.
+ * twigbridge.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
- * @copyright Robert Crowe <hello@vivalacrowe.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 /**
  * Configuration options for Twig.
  */
diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php
index 6b4e345582..6909aaa2a5 100644
--- a/database/migrations/2016_10_09_150037_expand_transactions_table.php
+++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_10_09_150037_expand_transactions_table.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php
index 217bfeb953..0714fb32e5 100644
--- a/database/migrations/2016_10_22_075804_changes_for_v410.php
+++ b/database/migrations/2016_10_22_075804_changes_for_v410.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_10_22_075804_changes_for_v410.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php
index ac701001b9..1d0a57e940 100644
--- a/database/migrations/2016_11_24_210552_changes_for_v420.php
+++ b/database/migrations/2016_11_24_210552_changes_for_v420.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_11_24_210552_changes_for_v420.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php
index d2c046b132..ef0747e4f4 100644
--- a/database/migrations/2016_12_22_150431_changes_for_v430.php
+++ b/database/migrations/2016_12_22_150431_changes_for_v430.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2016_12_22_150431_changes_for_v430.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php
index c7d3075ba6..1bac0f7924 100644
--- a/database/migrations/2016_12_28_203205_changes_for_v431.php
+++ b/database/migrations/2016_12_28_203205_changes_for_v431.php
@@ -1,14 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_12_28_203205_changes_for_v431.php
- * Copyright (c) 2016 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php
index c2cd3f969e..8293836751 100644
--- a/database/migrations/2017_04_13_163623_changes_for_v440.php
+++ b/database/migrations/2017_04_13_163623_changes_for_v440.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2017_04_13_163623_changes_for_v440.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php
index 011a66e188..44c2a04dc4 100644
--- a/database/migrations/2017_06_02_105232_changes_for_v450.php
+++ b/database/migrations/2017_06_02_105232_changes_for_v450.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2017_06_02_105232_changes_for_v450.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/gulpfile.js b/gulpfile.js
index 04d503d8d5..5f7804554a 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,3 +1,12 @@
+/*
+ * gulpfile.js
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 const elixir = require('laravel-elixir');
 
 require('laravel-elixir-vue');
diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml
index 0997eb6bb2..b0b352d90a 100755
--- a/phpunit.coverage.xml
+++ b/phpunit.coverage.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpunit.coverage.xml
+  ~ Copyright (c) 2017 thegrumpydictator@gmail.com
+  ~ This software may be modified and distributed under the terms of the
+  ~ Creative Commons Attribution-ShareAlike 4.0 International License.
+  ~
+  ~ See the LICENSE file for details.
+  -->
+
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="bootstrap/autoload.php"
diff --git a/phpunit.xml b/phpunit.xml
index b0e315533c..73d2797478 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpunit.xml
+  ~ Copyright (c) 2017 thegrumpydictator@gmail.com
+  ~ This software may be modified and distributed under the terms of the
+  ~ Creative Commons Attribution-ShareAlike 4.0 International License.
+  ~
+  ~ See the LICENSE file for details.
+  -->
+
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="bootstrap/autoload.php"
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index b4cc8b15b2..acb598dcc1 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-
 
 /**
  * CreatesApplication.php
@@ -12,6 +9,8 @@ declare(strict_types=1);
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index 2cdc406421..df6e4a591d 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -1,14 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * ExampleTest.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests\Feature;
 
 use Tests\TestCase;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 9bec6db836..5d0faaae6b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * TestCase.php
@@ -10,6 +9,8 @@ declare(strict_types=1);
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Carbon\Carbon;
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index 25b906c212..b55d6c83f1 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -1,5 +1,15 @@
 <?php
 
+
+/**
+ * ExampleTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 /**