diff --git a/composer.json b/composer.json
index f2ae385..bf9dcd0 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
 	"require": {
 		"smarty/smarty": "~3.1.29",
 		"rg3/youtube-dl": "2016.04.13",
-		"slim/slim": "1838.x-dev as 3.3.0",
+		"slim/slim": "3.x-dev",
 		"mathmarques/smarty-view": "~1.1.0",
 		"symfony/yaml": "~3.0.0",
 		"symfony/process": "~3.0.0",
@@ -50,9 +50,6 @@
 				"ffmpeg"
 			]
 		}
-	}, {
-		"type": "vcs",
-		"url": "https://github.com/llvdl/Slim.git"
 	}],
 	"authors": [{
 		"name": "Pierre Rudloff",
diff --git a/composer.lock b/composer.lock
index 888d03b..e8224f9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "6e64354dc4d656c303e0cd83b4ccfda6",
-    "content-hash": "4418cbfe45cf745f1f170c49746bfdfd",
+    "hash": "e173fa909efaf932dcbc99c365645eaf",
+    "content-hash": "54da2bfd3a8f04d66a1cd4465ec0a261",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -479,16 +479,16 @@
         },
         {
             "name": "slim/slim",
-            "version": "1838.x-dev",
+            "version": "3.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/llvdl/Slim.git",
-                "reference": "388272244ab335f2309448e881fb838abed425f1"
+                "url": "https://github.com/slimphp/Slim.git",
+                "reference": "30cfe3c07dac28ec1129c0577e64b90ba11a54c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/llvdl/Slim/zipball/388272244ab335f2309448e881fb838abed425f1",
-                "reference": "388272244ab335f2309448e881fb838abed425f1",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/30cfe3c07dac28ec1129c0577e64b90ba11a54c4",
+                "reference": "30cfe3c07dac28ec1129c0577e64b90ba11a54c4",
                 "shasum": ""
             },
             "require": {
@@ -511,41 +511,30 @@
                     "Slim\\": "Slim"
                 }
             },
-            "scripts": {
-                "test": [
-                    "@phpunit",
-                    "@phpcs"
-                ],
-                "phpunit": [
-                    "php vendor/bin/phpunit"
-                ],
-                "phpcs": [
-                    "php vendor/bin/phpcs"
-                ]
-            },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Josh Lockhart",
-                    "email": "hello@joshlockhart.com",
-                    "homepage": "https://joshlockhart.com"
-                },
-                {
-                    "name": "Andrew Smith",
-                    "email": "a.smith@silentworks.co.uk",
-                    "homepage": "http://silentworks.co.uk"
-                },
                 {
                     "name": "Rob Allen",
                     "email": "rob@akrabat.com",
                     "homepage": "http://akrabat.com"
                 },
+                {
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "https://joshlockhart.com"
+                },
                 {
                     "name": "Gabriel Manricks",
                     "email": "gmanricks@me.com",
                     "homepage": "http://gabrielmanricks.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
                 }
             ],
             "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
@@ -556,10 +545,7 @@
                 "micro",
                 "router"
             ],
-            "support": {
-                "source": "https://github.com/llvdl/Slim/tree/1838"
-            },
-            "time": "2016-05-19 08:36:13"
+            "time": "2016-05-26 08:20:33"
         },
         {
             "name": "smarty/smarty",
@@ -839,14 +825,7 @@
             "time": "2016-04-25 11:17:47"
         }
     ],
-    "aliases": [
-        {
-            "alias": "3.3.0",
-            "alias_normalized": "3.3.0.0",
-            "version": "1838.9999999.9999999.9999999-dev",
-            "package": "slim/slim"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
         "slim/slim": 20,