diff --git a/composer.json b/composer.json
index 1cb9141..7863dc6 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     "require": {
         "php": ">=5.3.6",
         "ext-dom": "*",
-        "twig/twig": "^1.35",
+        "twig/twig": "^1.36",
         "symfony/yaml" : "^2.8",
         "erusev/parsedown": "~1.8.0|1.8.0@beta",
         "erusev/parsedown-extra": "~0.8.0|0.8.0@beta"
@@ -39,8 +39,8 @@
         "picocms/composer-installer": "This Composer plugin is responsible for installing Pico plugins and themes using the Composer package manager."
     },
     "require-dev" : {
-        "phpdocumentor/phpdocumentor": "^2.8",
-        "squizlabs/php_codesniffer": "^2.4"
+        "phpdocumentor/phpdocumentor": "^2.9",
+        "squizlabs/php_codesniffer": "^2.9"
     },
     "autoload": {
         "psr-0": {
diff --git a/lib/Pico.php b/lib/Pico.php
index fd87314..f75f320 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -40,7 +40,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
+ * @version 2.1
  */
 class Pico
 {
@@ -49,14 +49,14 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '2.0.5-beta.1';
+    const VERSION = '2.1.0-nightly';
 
     /**
      * Pico version ID
      *
      * @var int
      */
-    const VERSION_ID = 20005;
+    const VERSION_ID = 20100;
 
     /**
      * Pico API version