diff --git a/.php_cs b/.php_cs
index 923f935..30fc86b 100644
--- a/.php_cs
+++ b/.php_cs
@@ -23,14 +23,11 @@ return Symfony\CS\Config\Config::create()
     ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
     ->fixers(
         [
-            '-psr0',
             'ordered_use',
             'short_array_syntax',
             'strict',
             'strict_param',
-            '-no_empty_lines_after_phpdocs',
             'header_comment',
-            'newline_after_open_tag',
             'phpdoc_order',
         ]
     )
diff --git a/composer.json b/composer.json
index 2a4fd0f..b946613 100644
--- a/composer.json
+++ b/composer.json
@@ -17,10 +17,10 @@
     ],
     "require": {
         "php"                                           : ">=5.4.0",
-        "gwa/zero-library"                              : "~1.0.7"
+        "gwa/zero-library"                              : "~3.0.1"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer"                           : "~1.8.1",
+        "fabpot/php-cs-fixer"                           : "~1.9",
         "phpunit/phpunit"                               : "~4.7"
     },
     "autoload": {
@@ -31,27 +31,11 @@
     "extra": {
         "installer-name": "zero",
         "branch-alias": {
-            "dev-master"                     : "2.0.0-dev"
+            "dev-master"                                : "3.0.0-dev"
         }
     },
     "repositories": [{
         "type": "composer",
         "url" : "http://wpackagist.org"
-    },
-    {
-        "type"         : "package",
-        "package": {
-            "name"     : "jarednova/php-router",
-            "version"  : "1.0.1",
-            "dist": {
-                "url"  : "https://github.com/jarednova/PHP-Router/archive/fix_psr_0.zip",
-                "type" : "zip"
-            },
-            "autoload": {
-                "psr-0": {
-                    "PHPRouter": "src/"
-                }
-            }
-        }
     }]
 }
diff --git a/theme/languages/zero.pot b/theme/languages/zero.pot
deleted file mode 100644
index e69de29..0000000