diff --git a/.gitignore b/.gitignore
index f097463..21e07c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ public/asbach/
 public/images/
 resources/views/unused/
 app/Http/Controllers/tmp/test.png
+public/d344.png
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index fa5c2f6..5b761b0 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -151,8 +151,8 @@ class UserController extends Controller
         $validator = \Validator::make($request->all(), [
             'username' => 'required|unique:users|min:3|max:25|alpha_num',
             'email' => 'required|email|unique:users|confirmed',
-            'password' => 'required|min:128|confirmed',
-            'captcha' => 'required|captcha'
+            // 'password' => 'required|min:6|confirmed',
+            // 'captcha' => 'required|captcha'
         ]);
 
         if($validator->fails()) {
@@ -179,12 +179,12 @@ class UserController extends Controller
             // Send Mail
 
             \Mail::queue('emails.activation', $data, function($message) use ($user) {
-                $message->to($user->email, $user->username)->subject('Welcome to w0bm. Activate your account');
+                $message->to($user->email, $user->username)->subject('Welcome to .-.- . Activate your account');
             });
 
-            return redirect('/login')->with('info', 'Congratulations! Your Account was successful created, please verify your email');
+            return view('success')->with('info', 'Congratulations! Your Account was successful created, please verify your email');
         } else {
-            return redirect()->back()->with('error', 'Account could not be created')->withInput($request->except(['password', 'password_confirmation']));
+            return view()->with('error', 'Account could not be created')->withInput($request->except(['password', 'password_confirmation']));
         }
     }
 
@@ -460,4 +460,9 @@ class UserController extends Controller
         //return Response::create("success mothafukka, you can now go back and fap your dick", 200);
         return redirect()->back()->with('success', 'Jesus Scriptus is with you' );
     }
+    public function settings(Request $request) {
+        return view('settings', [
+            'fuser' => 'pimmel',
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png
index c956bfe..6f961a8 100644
Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 3d4bc28..a194734 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -130,13 +130,12 @@ Route::group(["middleware" => "theme"], function() {
 	Route::get('upload', 'VideoController@create')->middleware('auth');
 	Route::get('categories', 'CategoryController@index');
 	Route::get('webm', function() { return view('webm'); })->middleware('auth');
-    Route::get('settings', function() { return view('settings'); })->middleware('auth');
+    Route::get('settings', 'UserController@settings');
     Route::get('matrix', function() { return view('matrix'); })->middleware('auth');
 	Route::get('git', function() { return view('git'); });
 	#Route::get('about', function() { return view('about'); })->middleware('auth');
     Route::get('about', 'aboutController@index');
-	Route::get('irc', function() { return view('irc'); });
-	Route::get('rules', 'rulezController@index');
+	Route::get('rules', function() { return view('rulez'); });
 	#Route::get('tos', function() { return view('tos'); });
 	#Route::get('rulez', 'rulezController@index')->middleware('auth');
 	Route::get('todo', function() { return view('todo'); })->middleware('auth');
diff --git a/app/Models/Icon.php b/app/Models/Icon.php
index 491fc55..a49019d 100644
--- a/app/Models/Icon.php
+++ b/app/Models/Icon.php
@@ -26,7 +26,7 @@ class Icon extends Model
                 return '<i class="fa fa-' . $this->icon . '"></i>';
             case 'img':
             case 'image':
-                return '<img class="icon" src="https://w0bm.com/' . ltrim($this->icon, '/') . '" alt="' . $this->icon . '">';
+                return '<img class="icon" src="/' . ltrim($this->icon, '/') . '" alt="' . $this->icon . '">';
             default:
                 return '';
         }
diff --git a/app/Services/Markdown.php b/app/Services/Markdown.php
index 4ace2e1..148f58c 100644
--- a/app/Services/Markdown.php
+++ b/app/Services/Markdown.php
@@ -55,7 +55,7 @@ class Markdown extends \Parsedown {
 		    		'handler' => 'line',
                     'attributes' => [
                         'class' => 'comment_emoji',
-			'src' => '//w0bm.com/images/comments/' . $matches[1] . $file_ext,
+			'src' => '/images/comments/' . $matches[1] . $file_ext,
 			'alt' => ':' . $matches[1] . ':',
 			'title' => ':' . $matches[1] . ':'
                     ],
diff --git a/config/app.php b/config/app.php
index 66c3b50..7497387 100644
--- a/config/app.php
+++ b/config/app.php
@@ -98,6 +98,14 @@ return [
 
     'log' => 'single',
 
+    /* VARS */
+
+    /* Iconic
+    >>Please stick to a single word as your iconic 
+    */
+    'iconic' => env('ICONIC', 'iconic'),
+
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
diff --git a/database/seeds/CategorySeeder.php b/database/seeds/CategorySeeder.php
index aae9c31..00141d9 100644
--- a/database/seeds/CategorySeeder.php
+++ b/database/seeds/CategorySeeder.php
@@ -13,52 +13,9 @@ class CategorySeeder extends Seeder
     public function run()
     {
         Category::create([
-            'name' => 'Musicvideos',
-            'shortname' => 'mv',
-            'description' => 'WebMs containing music'
+            'name' => 'random',
+            'shortname' => 'random',
+            'description' => 'random'
         ]);
-
-        Category::create([
-            'name' => 'Anime',
-            'shortname' => 'anime',
-            'description' => 'Everything from AMV to Hentai'
-        ]);
-
-        Category::create([
-            'name' => 'Russia',
-            'shortname' => 'russia',
-            'description' => 'Сука Блять'
-        ]);
-
-        Category::create([
-            'name' => 'Asians',
-            'shortname' => 'asians',
-            'description' => 'Mostly Korean and Japanese girls'
-        ]);
-
-        Category::create([
-            'name' => 'Funny',
-            'shortname' => 'funny',
-            'description' => 'Supposed to be funny'
-        ]);
-
-        Category::create([
-            'name' => 'Pr0n',
-            'shortname' => 'pr0n',
-            'description' => 'Crazy Japanese porn you will find my son'
-        ]);
-
-        Category::create([
-            'name' => 'Politics',
-            'shortname' => 'pol',
-            'description' => 'Videos about faggots in suits'
-        ]);
-
-        Category::create([
-            'name' => 'Misc',
-            'shortname' => 'misc',
-            'description' => 'Stuff that doesnt fit anywhere else'
-        ]);
-        
     }
 }
diff --git a/database/seeds/VideoTableSeeder.php b/database/seeds/VideoTableSeeder.php
index 7272a9d..c0a7946 100644
--- a/database/seeds/VideoTableSeeder.php
+++ b/database/seeds/VideoTableSeeder.php
@@ -21,7 +21,7 @@ class VideoTableSeeder extends Seeder
             return ($a < $b) ? -1 : 1;
         });
 
-        $category = \App\Models\Category::where('shortname', '=', 'misc')->first();
+        $category = \App\Models\Category::where('shortname', '=', 'random')->first();
         $user = \App\Models\User::find(1);
 
         foreach($videos as $video) {
diff --git a/public/css/glitch.css b/public/css/glitch.css
index 57ce100..ccacc44 100644
--- a/public/css/glitch.css
+++ b/public/css/glitch.css
@@ -5,10 +5,12 @@
 /* end */
 
 a.navbar-brand {
-    content: "";
-    background-size: contain;
-    background-image: url(/w0bm_mosh_banner_by_marderchen.gif);
-    background-repeat: no-repeat;
+  content: "";
+  background-size: cover;
+  background-image: url(/traurig.gif);
+  background-repeat: no-repeat;
+  background-position-x: 0;
+  background-position-y: -60px;
 }
 
 a.navbar-brand {
@@ -1095,17 +1097,6 @@ div#tag-display {
     color: #00fbff;
 }
 
-/* Admin shizzle */
-a.sirx, a[href="https://w0bm.com/user/sirx"] {
-    color: #ff0099 !important;
-    text-transform: uppercase;
-    text-shadow: 1px 1px 2px #ff00c8, 0px -2px 0px black, 2px 0px #6eff00;
-    font-family: vcr;
-    vertical-align: middle;
-    padding-right: 5px;
-    padding-left: 5px;
-}
-
 ul.pagination {
     display: flex;
     justify-content: left;
diff --git a/public/css/w0bm_override.css b/public/css/w0bm_override.css
index 3ca4087..4d99251 100644
--- a/public/css/w0bm_override.css
+++ b/public/css/w0bm_override.css
@@ -78,7 +78,7 @@ span#w0bm_version {
 }
 
 .navbar-brand {
-  background-image: url(https://w0bm.com/w0bm_mosh_banner_by_marderchen.gif)!important;
+  background-image: url(/traurig.gif)!important;
   background-repeat: no-repeat!important;
   background-size: contain!important;
   background-position: center!important;
diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css
index 89bd2f4..2bf733e 100644
--- a/public/css/w0bmcustom.css
+++ b/public/css/w0bmcustom.css
@@ -8,7 +8,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 400;
-  src: local('Oswald Regular'), local('Oswald-Regular'), url(//w0bm.com/fonts/Oswald_Cyrillic.woff2) format('woff2');
+  src: local('Oswald Regular'), local('Oswald-Regular'), url(/fonts/Oswald_Cyrillic.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* vietnamese */
@@ -16,7 +16,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 400;
-  src: local('Oswald Regular'), local('Oswald-Regular'), url(//w0bm.com/fonts/Odwald_Vietnamese.woff2) format('woff2');
+  src: local('Oswald Regular'), local('Oswald-Regular'), url(/fonts/Odwald_Vietnamese.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -24,7 +24,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 400;
-  src: local('Oswald Regular'), local('Oswald-Regular'), url(//w0bm.com/fonts/Oswald_Latin_ext.woff2) format('woff2');
+  src: local('Oswald Regular'), local('Oswald-Regular'), url(/fonts/Oswald_Latin_ext.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -32,7 +32,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 400;
-  src: local('Oswald Regular'), local('Oswald-Regular'), url(//w0bm.com/fonts/Oswald_latin.woff2) format('woff2');
+  src: local('Oswald Regular'), local('Oswald-Regular'), url(/fonts/Oswald_latin.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* Oswal Test End */
@@ -44,7 +44,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvtg2H68T.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvtg2H68T.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -52,7 +52,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvtE2H68T.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvtE2H68T.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek */
@@ -60,7 +60,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvtY2H68T.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvtY2H68T.woff2) format('woff2');
   unicode-range: U+0370-03FF;
 }
 /* vietnamese */
@@ -68,7 +68,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvto2H68T.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvto2H68T.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -76,7 +76,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvts2H68T.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvts2H68T.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -84,7 +84,7 @@
   font-family: 'Play';
   font-style: normal;
   font-weight: 400;
-  src: local('Play Regular'), local('Play-Regular'), url(//w0bm.com/fonts/6aez4K2oVqwIvtU2Hw.woff2) format('woff2');
+  src: local('Play Regular'), local('Play-Regular'), url(/fonts/6aez4K2oVqwIvtU2Hw.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* Play Font End */
@@ -153,7 +153,7 @@ body {
     opacity: 1;
     z-index: -1;
     position: fixed !important;
-    content: url(https://w0bm.com/rip_w.png);
+    content: url(https:/rip_w.png);
     right: 5px !important;
 }*/
 
@@ -1223,7 +1223,8 @@ a.delete-tag.default-link {
 }
 
 #sidebar > .comments, #sidebar > .tags {
-    border-bottom: 1px solid #1fb2b0;
+    border-bottom: 1px solid #2c2c2c;
+    /* actually important setting for the layout */
     width: 350px;
 }
 
@@ -1276,14 +1277,11 @@ div#tag-display::-webkit-scrollbar {
 
 label[for='tag-add-toggle'] {
     color: #1FB2B0;
-    padding-top: 10px;
     font-weight: normal;
-    padding-bottom: 5px;
-    margin-bottom: 0px;
+    padding: 5px;
+    margin: 0px;
     font-family: Oswald;
     cursor: pointer;
-    padding-right: 5px;
-    padding-left: 5px;
     transition-duration: 0.2s;
     -webkit-transition-duration: 0.2s;
 }
@@ -1351,7 +1349,6 @@ span.addtagsy {
     font-family: Oswald;
     letter-spacing: 0.4px;
     cursor: pointer;
-    padding: 5px 5px;
 }
 
 span.addtagsy>a {
@@ -3331,10 +3328,6 @@ img#thumbnail_img {
     margin-bottom: 5px;
 }
 
-a[href="https://w0bm.com/user/thebigben"], a.thebigben, h3.thebigben {
-    font-family: unifrakturcook,cursive;
-}
-
 .no-js {
     position: absolute;
     font-size: 10px;
@@ -3956,10 +3949,6 @@ video#placeholder {
     width: 100%;
 }
 
-label[for='tag-add-toggle'] {
-        padding-top: 12px;
-}
-
 .nav>li>a:hover, .nav>li>a:focus {
     text-decoration: none;
     background-color: #12161900;
@@ -4057,9 +4046,7 @@ position: absolute;
     left: 85px;
     font-family: vcr;}
 
-    label[for='tag-add-toggle'] {
-        padding-top: 10px;
-    }
+
 
     i.fa.fa-bitcoin {
         color: #e2c910;
diff --git a/public/favicon.gif b/public/favicon.gif
new file mode 100644
index 0000000..045b2ae
Binary files /dev/null and b/public/favicon.gif differ
diff --git a/public/js/w0bmscript.js b/public/js/w0bmscript.js
index 0f8a8f6..826e5bc 100644
--- a/public/js/w0bmscript.js
+++ b/public/js/w0bmscript.js
@@ -121,7 +121,7 @@ if(videoElem !== null) {
     if($.browser.mobile) {
         let src_split = document.querySelector("video > source:first-child").src.split("/");
         src_split = src_split[src_split.length - 1];
-        videoElem.setAttribute("poster", "//w0bm.com/thumbs/" + src_split.replace(".webm", ".gif"));
+        videoElem.setAttribute("poster", "/thumbs/" + src_split.replace(".webm", ".gif"));
     }
     var player = videojs(videoElem, {
         controls: true,
@@ -1454,5 +1454,5 @@ document.querySelectorAll("#layoutSwitcher [id^=layout]").forEach(el => el.addEv
 // if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) 
 //     || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4))) { 
 //     isMobile = true;
-//     window.location.href = "https://w0bm.com/api/user/layout?layout=5";
+//     window.location.href = "https:/api/user/layout?layout=5";
 // }
\ No newline at end of file
diff --git a/public/mobile/css/w0bmcustom.css b/public/mobile/css/w0bmcustom.css
index f710eb5..4cd2a15 100644
--- a/public/mobile/css/w0bmcustom.css
+++ b/public/mobile/css/w0bmcustom.css
@@ -52,29 +52,10 @@ body {
     background-color: #161618;
 }
 
-/*body::after {
-    bottom: -5px;
-    opacity: 1;
-    z-index: -1;
-    position: fixed !important;
-    content: url(https://w0bm.com/rip_w.png);
-    right: 5px !important;
-}*/
-
 a:focus {
     outline: none;
 }
 
-/*body::after {
-    position: fixed !important;
-    content: url("https://koyaanis.com/i/kawaii2.gif");
-    bottom: -5px;
-    right: -20px !important;
-    left: 0px !important;
-    opacity: 1;
-    z-index: -1;
-}*/
-
 .indexedit input, .indexedit select {
     display: none;
 }
@@ -3193,10 +3174,6 @@ img#thumbnail_img {
     margin-bottom: 5px;
 }
 
-a[href="https://w0bm.com/user/thebigben"], a.thebigben, h3.thebigben {
-    font-family: unifrakturcook,cursive;
-}
-
 .no-js {
     position: absolute;
     font-size: 10px;
diff --git a/public/mobile/js/w0bmscript.js b/public/mobile/js/w0bmscript.js
index cc08a15..dd0a350 100644
--- a/public/mobile/js/w0bmscript.js
+++ b/public/mobile/js/w0bmscript.js
@@ -121,7 +121,7 @@ if(videoElem !== null) {
     if($.browser.mobile) {
         let src_split = document.querySelector("video > source:first-child").src.split("/");
         src_split = src_split[src_split.length - 1];
-        videoElem.setAttribute("poster", "//b.w0bm.com/thumbs/" + src_split.replace(".webm", ".gif"));
+        videoElem.setAttribute("poster", "/thumbs/" + src_split.replace(".webm", ".gif"));
     }
     var player = videojs(videoElem, {
         controls: true,
@@ -632,7 +632,7 @@ $(function() {
 
     $('[data-thumb]').on('mouseenter', function(e) {
         var id = $(this).data('thumb');
-        var lnk = '//w0bm.com/thumbs/' + id + '.gif';
+        var lnk = '/thumbs/' + id + '.gif';
         var loc = get_loc(e);
         $(document.body).prepend('<div id="thumb"></div>');
         $('div#thumb').prepend('<img id="thumb"/>');
@@ -1432,5 +1432,5 @@ if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine
     || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4))) { 
     isMobile = true;
 } else {
-    window.location.href = "https://w0bm.com/api/user/layout?layout=1";
+    window.location.href = "https:/api/user/layout?layout=1";
 }
\ No newline at end of file
diff --git a/public/njum/js/w0bmscript.js b/public/njum/js/w0bmscript.js
index 124f534..9ce76a4 100644
--- a/public/njum/js/w0bmscript.js
+++ b/public/njum/js/w0bmscript.js
@@ -121,7 +121,7 @@ if(videoElem !== null) {
     if($.browser.mobile) {
         let src_split = document.querySelector("video > source:first-child").src.split("/");
         src_split = src_split[src_split.length - 1];
-        videoElem.setAttribute("poster", "//w0bm.com/thumbs/" + src_split.replace(".webm", ".gif"));
+        videoElem.setAttribute("poster", "/thumbs/" + src_split.replace(".webm", ".gif"));
     }
     var player = videojs(videoElem, {
         controls: true,
@@ -1430,9 +1430,9 @@ if(infoboxContent)
 //This was supposed to work for urls that are not in a correct url-sheme such as z0r.de/1337 but ehm itz out of biz cuz uhm xD https://f0ck.it/uploads/%5B2019%5D_firefox_YapokIcyShoveler.png
 //infoboxContent.dataset.content = infoboxContent.dataset.content.replace(/((https?:\/\/)?[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?)?/gi, "<a href='$1'>$1</a>");
 
-if( /Android|webOS|iPhone|iPad|Mac|Macintosh|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
-    window.location.href = "https://w0bm.com/api/user/layout?layout=5";
-}
+// if( /Android|webOS|iPhone|iPad|Mac|Macintosh|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
+//     window.location.href = "/api/user/layout?layout=5";
+// }
 
 /* $('#collapseEmojis').on('click', function (event) {
     let panelCollapse = $(this).closest('.panel').find('.collapseEmojis');
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index a937529..8b7ea5d 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -2,13 +2,6 @@
     body {
         background: black;
         color: white;
-        text-align: center;
     }
 </style>
-
-	<h5>Oh shit! Something went horribly wrong!</h5>
-    <p>Please try again later</p>
-    <video autoplay muted loop src="doge.webm"></video>
-    <div style="">
-        <small>if this error persists, please contact an admin in the <a href="https://n0xy.net">IRC</a> #w0bm </small>
-    </div>
+<pre>Exception occured, to be excused</pre>
\ No newline at end of file
diff --git a/resources/views/layout1/apply_open.blade.php b/resources/views/layout1/apply_open.blade.php
index 4b4046b..788c795 100644
--- a/resources/views/layout1/apply_open.blade.php
+++ b/resources/views/layout1/apply_open.blade.php
@@ -2,8 +2,8 @@
 @section('content')
 @include('partials.flash')
     <div class="page-header">
-	<h5>Register your w0bm.com Account</h5>
-<p style="color:red;">Note: If you ever lose your password you are fucked, we will <b>NOT</b> reset it. To prevent this not only on w0bm.com but evrywhere we highly recommend the usage of a password manager such as <a href="https://keepassxc.org/">KeePassXC</a></p>
+	<h5>Register your {{ config('app.iconic') }} Account</h5>
+<p style="color:red;">Note: If you ever lose your password you are fucked, we will <b>NOT</b> reset it. To prevent this not only on {{ config('app.iconic') }} but evrywhere we highly recommend the usage of a password manager such as <a href="https://keepassxc.org/">KeePassXC</a></p>
 <p style="color:red;font-weight: bold;">MINIMUM PASSWORD LENGTH: 128 👹</p>
     </div>
     <div class="register">
diff --git a/resources/views/layout1/contact.blade.php b/resources/views/layout1/contact.blade.php
index 0f680e6..e6fddba 100644
--- a/resources/views/layout1/contact.blade.php
+++ b/resources/views/layout1/contact.blade.php
@@ -1,13 +1,2 @@
 @extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Contact</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<p>
-  For anything w0bm related you can either reach us via email: <code>admin@w0bm.com</code> or via our <a href="/irc">IRC</a>
-</p>
-</div>
-@include('footer')
-@endsection
+
diff --git a/resources/views/layout1/footer.blade.php b/resources/views/layout1/footer.blade.php
index bff5b03..f16b112 100644
--- a/resources/views/layout1/footer.blade.php
+++ b/resources/views/layout1/footer.blade.php
@@ -1,6 +1,5 @@
 <nav class="navbar-fixed-bottom">
   <div class="container futter">
-  @if(auth()->check())<a href="/about">About</a> | @endif<a href="/rules">Rules</a> | <a href="/contact">Contact</a> | <a href="/privacy">Privacy</a>@if(auth()->check()) | <a href="/stats">Stats</a>@endif
-    <p>Inspired by <a href="http://z0r.de">z0r.de</a> | © 2015 – {{ date('Y') }} w0bm.com</p>
+    <p>{{ config('app.iconic') }}</p>
   </div>
 </nav>
diff --git a/resources/views/layout1/index.blade.php b/resources/views/layout1/index.blade.php
index eadd00d..eda7fea 100644
--- a/resources/views/layout1/index.blade.php
+++ b/resources/views/layout1/index.blade.php
@@ -4,7 +4,7 @@
 	<h3 id="index">Index <small>{{ $number_of_results }} results</small></h3>
         <form method="get">
 	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
+            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search']) !!}
         </form>
     </div>
     <table class="table table-hover table-condensed">
diff --git a/resources/views/layout1/layout.blade.php b/resources/views/layout1/layout.blade.php
index 0a3fae1..f394f69 100644
--- a/resources/views/layout1/layout.blade.php
+++ b/resources/views/layout1/layout.blade.php
@@ -8,11 +8,11 @@
           content="width=device-width,initial-scale=1">
     <meta charset="UTF-8">
     <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
+    <meta name="keywords" content="">
     <meta name="robots" content="noindex">
     @if(auth()->check())<meta name="Description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
     <meta name="description" content="">
-    <meta property="og:site_name" content="w0bm.com" />
+    <meta property="og:site_name" content="{{ config('app.iconic') }}" />
     <meta property="og:title" content="@if(isset($video)){{$video->videotitle}}@endif">
     <meta name="twitter:card" content="summary_large_image" />
     @if(auth()->check())<meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
@@ -29,8 +29,8 @@
     @if(auth()->check())<meta property="og:video" content="@if(isset($video))/b/{{ $video->file }} @endif">@endif
     <meta property="og:url" content="@if(isset($video))/{{ $video->id }}@endif">
     <meta property="og:video:type" content="video/webm">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
+    <link rel="icon" href="/favicon.gif">
+    <title>{{ config('app.iconic') }} | @if(isset($video)){{ $video->id }}@endif</title>
     <link rel="favicon" href="favicon.ico" type="image/ico">
     <link rel="stylesheet" href="/css/style.css">
     <link rel="stylesheet" href="/css/w0bmfonts.css">
diff --git a/resources/views/layout1/login.blade.php b/resources/views/layout1/login.blade.php
index 05f87ca..c6397a3 100644
--- a/resources/views/layout1/login.blade.php
+++ b/resources/views/layout1/login.blade.php
@@ -18,9 +18,6 @@
           </form>
         </div>
         </div>
-        <div class="modal-footer">
-          <a href="/contact">Contact</a> | <a href="/irc">IRC</a>
-        </div>
       </div>
     </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/layout1/main.blade.php b/resources/views/layout1/main.blade.php
index de4eb10..608a348 100644
--- a/resources/views/layout1/main.blade.php
+++ b/resources/views/layout1/main.blade.php
@@ -5,7 +5,7 @@
         {!! $videos->render() !!}
         <form method="get">
 	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
+            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search']) !!}
         </form>
     </div>
     </div>
diff --git a/resources/views/layout1/partials/commentform.blade.php b/resources/views/layout1/partials/commentform.blade.php
index 7855f52..fdf2e41 100644
--- a/resources/views/layout1/partials/commentform.blade.php
+++ b/resources/views/layout1/partials/commentform.blade.php
@@ -8,10 +8,10 @@
         <div class="commbordersoos">
     <div id="comment_tools" class="commentform-panel-footer"><button type="submit" class="btn btn-primary btn-sm">Post</button>
         <div class="textmodifierss">
-                   <a style="font-size: 14px;" class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-       <a style="font-size: 14px;" class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-       <a style="font-size: 14px;" class="anim" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-       <a style="font-size: 14px; color: white;" class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
+                   <a style="font-size: 14px;" class="rainbow" href="javascript:;" onclick="formatText ('rb');">[~]</a>
+       <a style="font-size: 14px;" class="reich" href="javascript:;" onclick="formatText ('reich');">[ß]</a>
+       <a style="font-size: 14px;" class="anim" href="javascript:;" onclick="formatText ('krebs');">[-^_^-]</a>
+       <a style="font-size: 14px; color: white;" class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[****]</a>
     <div class="emoji-shit">
     <div class="header"><span>😂</span></div>
     </div>
diff --git a/resources/views/layout1/partials/navigation.blade.php b/resources/views/layout1/partials/navigation.blade.php
index 77855d1..9d96fbb 100644
--- a/resources/views/layout1/partials/navigation.blade.php
+++ b/resources/views/layout1/partials/navigation.blade.php
@@ -9,11 +9,11 @@
             </button>
             @if(Auth::check())
             <a class="navbar-brand" href="/main">
-        <img src="{{ asset('logo.svg') }}" alt="w0bm.com">
+        <img src="/traurig.gif" alt="{{ config('app.iconic') }}">
         </a>
             @else
             <a class="navbar-brand" href="/main">
-        <img src="{{ asset('logo.svg') }}" alt="w0bm.com">
+        <img src="/traurig.gif" alt="{{ config('app.iconic') }}">
         </a>
             @endif
 
@@ -21,24 +21,25 @@
 
         <div class=" collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav navbar-left">
-            <li><a href="{{url('categories')}}"><i class="fa fa-clone"></i><span class="hidden-sm"> Categories</span></a></li>
-            <li><a href="{{url('index')}}"><i class="fa fa-list"></i><span class="hidden-sm"> Index</span></a></li>
+            <li><a href="{{url('categories')}}"><i class="fa fa-clone"></i><span class="hidden-sm"></span></a></li>
+            <li><a href="{{url('index')}}"><i class="fa fa-list"></i><span class="hidden-sm"></span></a></li>
         @include('partials.themechanger')
         @if(Auth::check())
         @include('partials.layoutchanger')
         @endif
             @include('partials.searchmodal')
-            <li><a href="#" data-toggle="modal" data-target="#searchmodal"><i class="fa fa-search"></i><span class="hidden-sm"> Find shit</span></a></li>
+            <li><a href="#" data-toggle="modal" data-target="#searchmodal"><i class="fa fa-search"></i><span class="hidden-sm"></span></a></li>
 
 	    </ul>
             @if(Auth::check())
                 <ul class="nav navbar-nav navbar-right">
 		    <li><a href="{{url('messages')}}"><i class="fa fa-envelope"></i> <span class="badge message-badge">{{Auth::user()->messagesRecv()->unread()->count()}}</span></a></li>
-                    <li><a href="#" data-toggle="modal" data-target="#filterselectmodal"><i class="fa fa-filter"></i><span class="hidden-sm"> Filter</span></a></li>
-                    <li><a href="{{url('upload')}}"><i class="fa fa-cloud-upload"></i><span class="hidden-sm"> Upload</span></a></li>
+                    <li><a href="#" data-toggle="modal" data-target="#filterselectmodal"><i class="fa fa-filter"></i><span class="hidden-sm"></span></a></li>
+                    <li><a href="{{url('upload')}}"><i class="fa fa-cloud-upload"></i><span class="hidden-sm"></span></a></li>
                     <li><a href="{{url('user', Auth::user()->username)}}/favs"><i class="fa fa-heart"></i></a></li>
-                    <li><a href="{{url('user', Auth::user()->username)}}"><i class="fa fa-user"></i> {{Auth::user()->username}}</a></li>
-                    <li><a href="{{url('logout')}}"><i class="fa fa-sign-out"></i><span class="hidden-sm"> Logout</span></a></li>
+                    <li><a href="{{url('user', Auth::user()->username)}}"><i class="fa fa-user"></i></a></li>
+                    <li><a href="{{url('settings')}}"><i class="fa fa-gear"></i><span class="hidden-sm"></span></a></li>
+                    <li><a href="{{url('logout')}}"><i class="fa fa-sign-out"></i><span class="hidden-sm"></span></a></li>
                 </ul>
             @else
 		<!-- Hier war mal der Login Kot -->
@@ -49,4 +50,4 @@
             @endif
         </div>
     </div>
-</nav>
+</nav>
\ No newline at end of file
diff --git a/resources/views/layout1/partials/searchbar.blade.php b/resources/views/layout1/partials/searchbar.blade.php
index 473c994..3528360 100644
--- a/resources/views/layout1/partials/searchbar.blade.php
+++ b/resources/views/layout1/partials/searchbar.blade.php
@@ -3,7 +3,7 @@
 </div>
 <div class="searchbar">
 	<form method="get" action="/main">
-            	{!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search w0bm.com']) !!}
+            	{!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search']) !!}
 		<button type="submit" class="suchbutton_video"><i style="color:white;" class="fa fa-search"></i></button>
 	</form>
 </div>
diff --git a/resources/views/layout1/partials/searchmodal.blade.php b/resources/views/layout1/partials/searchmodal.blade.php
index 801fb5e..c189ff5 100644
--- a/resources/views/layout1/partials/searchmodal.blade.php
+++ b/resources/views/layout1/partials/searchmodal.blade.php
@@ -27,7 +27,7 @@
             </div>
             <div class="searchbar">
 	            <form method="get" action="/main">
-            	    {!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search w0bm.com']) !!}
+            	    {!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search']) !!}
 		            <button type="submit" class="suchbutton_video"><i style="color:white;" class="fa fa-search"></i></button>
 	            </form>
             </div>
diff --git a/resources/views/layout1/partials/tags.blade.php b/resources/views/layout1/partials/tags.blade.php
index 37db8d7..7257a28 100644
--- a/resources/views/layout1/partials/tags.blade.php
+++ b/resources/views/layout1/partials/tags.blade.php
@@ -1,17 +1,9 @@
 <div class="tags hidden-xs">
     <div class="tagtest">
     @if(Auth::check())
-    <ul class="nav navbar-nav info-nav">
     <label for="tag-add-toggle">
-    <li id="tagadder" class="addtagsy">[+Add Tag]</li>
+    <span id="tagadder" class="addtagsy">[+Add Tag]</span>
     </label>
-    <li class="addtagsy"><a href="/irc">IRC </a></li>
-    <li class="addtagsy"><a href="/about">About </a></li>
-    <li class="addtagsy"><a href="/contact">Contact </a></li>
-    <li class="addtagsy"><a href="/rules">Rules </a></li>
-    <li class="addtagsy"><a href="/stats">Stats</a></li>
-    <li class="addtagsy"><a href="/marderchen">✝</a></li>
-    </ul>
     <input type="checkbox" id="tag-add-toggle">
     <div id="tag-add">
     <div class="input-group tag-input-open" style="margin-top: 4px;">
@@ -21,14 +13,7 @@
     </div>
         </div>
 	@else
-	<ul class="nav navbar-nav info-nav">
-            <li class="addtagsy"><a href="/irc">IRC </a></li>
-            <li class="addtagsy"><a href="/about">About </a></li>
-	    <li class="addtagsy"><a href="/contact">Contact </a></li>
-	    <li class="addtagsy"><a href="/rules">Rules </a></li>
-	    <li class="addtagsy"><a href="/stats">Stats</a></li>
-        <li class="addtagsy"><a href="/marderchen">✝</a></li>
-	</ul>
+
         @endif
 
     </div>
@@ -42,13 +27,5 @@
                 No tags yet ...
             @endif
         </div>
-        <div class="git">
-        <?php
-            $latestCommit = shell_exec('git log -n 1');
-            $getcommitID = substr($latestCommit,0,48);
-            $commitID = substr($getcommitID, 7);
-            echo "<a class='latestCommit' target='_blank' href='/git'>$commitID</a>"
-        ?>
-        </div>
     </div>
 </div>
diff --git a/resources/views/layout1/partials/themechanger.blade.php b/resources/views/layout1/partials/themechanger.blade.php
index 8203485..6dc5869 100644
--- a/resources/views/layout1/partials/themechanger.blade.php
+++ b/resources/views/layout1/partials/themechanger.blade.php
@@ -7,14 +7,8 @@
         <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
         <br>
     <button class="w0bm_override-css" onclick="setActiveStyleSheet('DARK'); return false;">DARK</button>
-	<br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
+	    <br>
     <button class="glitch-css" onclick="setActiveStyleSheet('Glitch'); return false;">Glitch</button>
-    <br>    
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
     </div>
 </ul>
 </li>
diff --git a/resources/views/layout1/privacy.blade.php b/resources/views/layout1/privacy.blade.php
deleted file mode 100644
index 3955833..0000000
--- a/resources/views/layout1/privacy.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Privacy</h3>
- </div>
-
-<div class="box">
-<h5>What do we log?</h5>
-<p>Our webserver does not log access log requests, we may log error logs from time to time if something breaks.</p>
-<h5>3<sup>rd</sup> party links</h5>
-<p>There are some 3rd party linkings on this website, be careful with clicking them we don't know whats inside the box blah blah blah, don't be stupid and don't trust the internet.</p>
-<p>If you encounter a malicious link shared here on w0bm.com please notify an admin in the <a href="/irc">IRC</a></p>
-<p>If you find a bug or a vulnerability, please notify an admin in the <a href="/irc">IRC</a></p>
-<h5>Cookies</h5>
-<p>Yes, we use cookies and if you don't like that don't come to our site! (or don't accept them in the first place) You can see the details of the cookies in your browser.</p>
-<p>Spoiler: They are all relevant for the website to function properly!</p>
-<ul>
-<p>The following cookies are being set by the website:</p>
-<li><code>remember_&lt;token&gt;</code> Well, it's used to remember you and so you don't have to re-login after like 5 minutes</li>
-<li><code>style</code> This one is used to store your style preference</li>
-<li><code>w0bm_session</code> Your session id</li>
-<li><code>XSRF-TOKEN</code> The XSRF Token</li>
-</ul>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout1/profilelayout.blade.php b/resources/views/layout1/profilelayout.blade.php
index 0d51ba3..3555d79 100644
--- a/resources/views/layout1/profilelayout.blade.php
+++ b/resources/views/layout1/profilelayout.blade.php
@@ -8,8 +8,8 @@
     <meta charset="UTF-8">
     <meta name="_token" content="{{csrf_token()}}">
     <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>w0bm.com - WebMs with sound!</title>
+    <link rel="icon" href="/favicon.gif">
+    <title>{{ config('app.iconic') }}</title>
     <link rel="stylesheet" href="/css/style.css">
     <link rel="favicon"
       type="image/ico"
diff --git a/resources/views/layout1/rulez.blade.php b/resources/views/layout1/rulez.blade.php
index 2c7f413..bfb0b32 100644
--- a/resources/views/layout1/rulez.blade.php
+++ b/resources/views/layout1/rulez.blade.php
@@ -1,39 +1,3 @@
 @extends('layout')
 @section('content')
-    <div class="page-header">
-        <h3>Rulez</h3>
-    </div>
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    @include('footer')
 @endsection
diff --git a/resources/views/layout1/settings.blade.php b/resources/views/layout1/settings.blade.php
index 13fbab4..2aa6139 100644
--- a/resources/views/layout1/settings.blade.php
+++ b/resources/views/layout1/settings.blade.php
@@ -1,17 +1,6 @@
- @extends('profilelayout')
+@extends('profilelayout')
 @section('content')
-<h4>Layouts</h4>
 <div class="box">
-    <h5>Change how you experience w0bm.com</h5>
-  <ul class="layout-ul">
-    <li><a class="nav-link layout1" style="font-size: 10px;" href="/api/user/layout?layout=1">w0bm</a>The default look</li>
-    <li><a class="nav-link layout2" style="font-size: 10px;" href="/api/user/layout?layout=2">Njum</a>Alternative approach</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=3">z0mb</a>z0r.de layout + theme</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=4">nojs</a>The nojs layout (broken)</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=5">Mobile</a>The mobile optimized default layout</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=6">Marderchen</a>This is marders Layout, it has no async js</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=7">2017</a>The layout from 2017</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=8">2015</a>The OG w0bm</li>
-  </ul>
+  {{ $fuser }}
 </div>
-  @endsection
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/layout1/success.blade.php b/resources/views/layout1/success.blade.php
new file mode 100644
index 0000000..f6bf0fc
--- /dev/null
+++ b/resources/views/layout1/success.blade.php
@@ -0,0 +1,2 @@
+Activate your account.
+You should have received a mail
\ No newline at end of file
diff --git a/resources/views/layout2/about.blade.php b/resources/views/layout2/about.blade.php
deleted file mode 100644
index 2a8b433..0000000
--- a/resources/views/layout2/about.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="dark-bg">
-{!!$blah!!}
-</div>
-@endsection
-
diff --git a/resources/views/layout2/abouttest.blade.php b/resources/views/layout2/abouttest.blade.php
deleted file mode 100644
index 8ba19b2..0000000
--- a/resources/views/layout2/abouttest.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-{{$blah}}
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout2/banned.blade.php b/resources/views/layout2/banned.blade.php
deleted file mode 100644
index d626301..0000000
--- a/resources/views/layout2/banned.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">YOU ARE BANNED!</h3>
-  </div>
-
-  <div class="panel-body">
-    <div style="border:0;" class="panel panel-default">
-      <div class="panel-body">
-        @if($perm)
-        <p>Your ban is permanent fool and will <b>NOT</b> expire!</p>
-        <video class="banwidth" autoplay loop src="https://b.w0bm.com/1515965864.webm">You are banned</video>
-        @else
-        <p class="banned">Reason: {{ $user->banreason }}</p>
-        <p class="banned">Your ban will expire in {{ $user->banend->diffForHumans(null, true) }}</p>
-        <img class="banwidth" src="otter-ban.png">
-        @endif
-      </div>
-    </div>
-    <p>If you think you were banned by accident or dindu nuffin to deserve the ban contact an administrator in the <a href="/irc">IRC</a></p>
-  </div>
-</div>
-@endsection
diff --git a/resources/views/layout2/categories.blade.php b/resources/views/layout2/categories.blade.php
deleted file mode 100644
index 0b14662..0000000
--- a/resources/views/layout2/categories.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-        <h3>Categories</h3>
-    </div>
-    <div class="dark-bg">
-    <div class="p-2" id="categories">
-        @foreach($categories as $category)
-            <div id="category_box_{{$category->shortname}}" class="category-box">
-                <div class="thumbnail">
-                   	<a href="{{$category->shortname}}"><img src="{{ asset('/images/cat/' . $category->shortname . '.webp') }}" alt="{{$category->name}}"></a>
-                    <div class="caption">
-                        <h5>{{$category->name}} <small><b>{{$category->videos()->count()}}</b></small></h5>
-                        <span class="cat-desc"><i>{{$category->description}}</i></span>
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout2/change.blade.php b/resources/views/layout2/change.blade.php
deleted file mode 100644
index 21ea187..0000000
--- a/resources/views/layout2/change.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
- <div class="page-header p-2">
-         <h3>RE: Content on w0bm</h3>
-         <p><i>For a happier future… or so I hope</i></p>
- </div>
-<div class="dark-bg">
-<div class="box">
-        <h4>Original in German</h4>
-        <div class="german">
-                <pre>
-RE: Content on w0bm
-
-Ich will keine Nachrichten, keine Politik, keinen Krieg und auch sonst keine zu mainstreamigen Sachen auf meiner Platform.
-Ich möchte das w0bm eine Page ist die lustiges und kurioses gezielt zur Schau stellt.
-Natürlich bin ich nicht alleiniger Entscheider darüber was potentiell als lustig, kurios oder anderweitig merkwürdig zu gelten hat,
-jedoch behalte ich mir vor das ganze in einem gewissen Rahmen zu formen, so ist nun der Zeitpunkt gekommen,
-an dem ich diese Formung verfestigen werde und in Futur 2 viele Uploads gelöscht haben werde.
-
-Die Löschung hat betroffen:
-
-Inhalte mit Nachrichten, Politik und Krieg.
-Inhalte mit Gore.
-
-Die vollständigen Kategorien:
-        politics, military, mett
-sind entfernt worden
-
-Ab sofort bitte keine Inhalte mit oben aufgeführten Kriterien mehr hochladen.
-
-Liebe Grüße
-
-Chatbot953
-                </pre>
-        </div>
-        <h4>English translation</h4>
-        <div class="usaenglish">
-                <pre>
-RE: Content on w0bm
-
-I don't want news, politics, war or anything too mainstream on my platform.
-I want w0bm to be a site that showcases funny and curious content.
-Of course, I am not the sole decider of what is potentially considered funny, curious or otherwise strange,
-but I reserve the right to shape the whole thing within a certain framework, so now the time has come,
-at which I will solidify this shaping and will have deleted many uploads in future tense 2.
-
-The deletion has affected:
-
-Content with news, politics and war.
-Content with Gore.
-
-The complete categories:
-        politics, military, mett
-have been removed
-
-From now on, please do not upload any content with the above criteria.
-
-Kind regards
-
-Chatbot953
-                </pre>
-        </div>
-        </div>
-</div>
-@endsection
-
diff --git a/resources/views/layout2/close.sh b/resources/views/layout2/close.sh
deleted file mode 100644
index 91e778e..0000000
--- a/resources/views/layout2/close.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/w0bm.com/resources/views/
-ln -sf registerclosed.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout2/closedreg.php b/resources/views/layout2/closedreg.php
deleted file mode 100644
index dcf75af..0000000
--- a/resources/views/layout2/closedreg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h1>Registration closed - check back later</h1>
-@endsection
diff --git a/resources/views/layout2/comments.blade.php b/resources/views/layout2/comments.blade.php
deleted file mode 100644
index a523214..0000000
--- a/resources/views/layout2/comments.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-@include('partials.comlist')
-<h3>Comments</h3>
-@if(Auth::check())
-
-<div class="row jkh">
-    <div class="col-md" id="list">
-        <div class="spinner">
-            <div class="cube1"></div>
-            <div class="cube2"></div>
-        </div>
-    </div>
-    <!--<div class="col-md-6" id="message"><h4>Select a comment to display content</h4></div>-->
-</div>
-
-@else
-<div class="row jkh">
-        <i>Not logged in. Please log in to view comments!</i>
-</div>
-@endif
-@endsection
-
diff --git a/resources/views/layout2/contact.blade.php b/resources/views/layout2/contact.blade.php
deleted file mode 100644
index 61ad6e1..0000000
--- a/resources/views/layout2/contact.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
- <div class="page-header p-2">
-         <h3>Professional Support</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<h4>Contact</h4>
-<ul>
-<li>Contact via IRC: <a href="https://webirc.n0xy.net/?join=%23w0bm">#w0bm on n0xy.net</a></li>
-</ul>
-<p><span>Need something? Let's talk then!</span></p>
-<p>Email: <a href="mailto:admin@w0bm.com">admin [ät] w0bm [dotto] com</a>
-</div>
-@endsection
diff --git a/resources/views/layout2/contact/create.blade.php b/resources/views/layout2/contact/create.blade.php
deleted file mode 100644
index ce73100..0000000
--- a/resources/views/layout2/contact/create.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@extends('layouts.app')
-
-@section('jumbotron')
-    <div class="jumbotron">
-        <div class="container">
-            <h1>Contact HackerPair</h1>
-            <h2>Your message will be delivered to our clandestine team</h2>
-        </div>
-    </div>
-@endsection
-
-@section('content')
-
-    <div class="row" style="margin-top: 25px;">
-
-        <div class="col-md-4 col-sm-12">
-
-            <div class="card">
-                <div class="card-body">
-                    <div class="card-title map">
-                        <gmap-map
-                                :center="{lat: 38.871026, lng: -77.055959}"
-                                :zoom="13"
-                                :options="{styles: mapStyles, streetViewControl: false, zoomControl: false, mapTypeControl: false}"
-                                map-type-id="roadmap"
-                                style="width: 100%; height: 300px;"
-                        >
-                        </gmap-map>
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-building" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Group 9
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map-signs" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-calendar" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                support@hackerpair.com
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <div class="col-md-8 col-sm-12">
-
-            <p>
-                Send us your questions, comments, and suggestions and someone will be in touch within
-                24 hours.
-            </p>
-
-            {!! Form::open(['route' => 'contact.store']) !!}
-
-            <div class="form-group">
-                {!! Form::label('name', 'Your Name') !!}
-                {!! Form::text('name', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('email', 'E-mail Address') !!}
-                {!! Form::text('email', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('msg', 'Message') !!}
-                {!! Form::textarea('msg', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-            </div>
-
-            {!! Form::submit('Submit', ['class' => 'btn btn-info']) !!}
-
-            {!! Form::close() !!}
-            <br />
-        </div>
-
-    </div>
-
-@endsection
diff --git a/resources/views/layout2/contactUS.blade.php b/resources/views/layout2/contactUS.blade.php
deleted file mode 100644
index 497de5e..0000000
--- a/resources/views/layout2/contactUS.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Laravel 5.4 Cloudways Contact US Form Example</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-</head>
-<body>
-<div class="container">
-<h1>Contact US Form</h1>
-@if(Session::has('success'))
-   <div class="alert alert-success">
-     {{ Session::get('success') }}
-   </div>
-@endif
-{!! Form::open(['route'=>'contactus.store']) !!}
-<div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
-{!! Form::label('Name:') !!}
-{!! Form::text('name', old('name'), ['class'=>'form-control', 'placeholder'=>'Enter Name']) !!}
-<span class="text-danger">{{ $errors->first('name') }}</span>
-</div>
-<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
-{!! Form::label('Email:') !!}
-{!! Form::text('email', old('email'), ['class'=>'form-control', 'placeholder'=>'Enter Email']) !!}
-<span class="text-danger">{{ $errors->first('email') }}</span>
-</div>
-<div class="form-group {{ $errors->has('message') ? 'has-error' : '' }}">
-{!! Form::label('Message:') !!}
-{!! Form::textarea('message', old('message'), ['class'=>'form-control', 'placeholder'=>'Enter Message']) !!}
-<span class="text-danger">{{ $errors->first('message') }}</span>
-</div>
-<div class="form-group">
-<button class="btn btn-success">Contact US!</button>
-</div>
-{!! Form::close() !!}
-</div>
-</body>
-</html>
diff --git a/resources/views/layout2/deleted.blade.php b/resources/views/layout2/deleted.blade.php
deleted file mode 100644
index 1c48390..0000000
--- a/resources/views/layout2/deleted.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<p>Video deleted by admin</p>
-<p>Given reason: </p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout2/email.blade.php b/resources/views/layout2/email.blade.php
deleted file mode 100644
index e986826..0000000
--- a/resources/views/layout2/email.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-You received a message from : {{ $name }}
-<p>
-Name: {{ $name }}
-</p>
-<p>
-Email: {{ $email }}
-</p>
-<p>
-Message: {{ $user_message }}
-</p>
diff --git a/resources/views/layout2/emails/activation.blade.php b/resources/views/layout2/emails/activation.blade.php
deleted file mode 100644
index e66f02f..0000000
--- a/resources/views/layout2/emails/activation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Hello {{$username}}</h3>
-<p>Welcome to <a href="https://w0bm.com">w0bm.com</a>.</p>
-<p>To activate your account please click this <a href="https://w0bm.com/activate/{{$activation_token}}">link</a>.</p>
diff --git a/resources/views/layout2/emails/report.blade.php b/resources/views/layout2/emails/report.blade.php
deleted file mode 100644
index cceac1e..0000000
--- a/resources/views/layout2/emails/report.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-
-  <div style="width:100%;font-family:verdana;">
-
-    <h1>webm got reported!</h1>
-
-    <div>
-      <b>Link:</b>
-      <a href="{{$videoURL}}">{{$videoURL}}</a>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%;border:1px solid black;border-collapse:collapse;">
-        <thead>
-          <tr style="border:1px solid black; padding:5px;">
-            <th style="background-color:#bbbbbb;border-right:1px solid black;">Report Reasons</th>
-            <th style="background-color:#bbbbbb;">Report Text</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td style="padding:10px;border-right:1px solid #bbbbbb;">
-              <ul>
-                {!! $reportReasons !!}
-              </ul>
-            </td>
-            <td style="padding:10px;">
-              {{$reportText}}
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%; border-collapse:collapse;border:1px solid black;">
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;width:200px;">Username</th>
-          <td>{!! $username !!}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Time reported</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">IP:</th>
-          <td></td>
-        </tr>-->
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video ID</th>
-          <td>{{$videoID}}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Title</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Tags</th>
-          <td></td>
-        </tr>-->
-      </table>
-    </div>
-
-    <br>
-    <hr>
-
-    <!--
-    <div>
-      <h3>Debug Output:</h3>
-      <div style="color:green;font-family:consolas;background-color:black;">
-        <pre>
-          {{$debugOutput}}
-        </pre>
-      </div>
-    </div>
-    -->
-
-  </div>
-
-
-</html>
\ No newline at end of file
diff --git a/resources/views/layout2/errors/404.blade.php b/resources/views/layout2/errors/404.blade.php
deleted file mode 100644
index 3a97175..0000000
--- a/resources/views/layout2/errors/404.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="notfound">
-<h1>404 - NOT FOUND</h1>
-<img id="notfound-img" src="/404.gif">
-</div>
-@endsection
diff --git a/resources/views/layout2/errors/500.blade.php b/resources/views/layout2/errors/500.blade.php
deleted file mode 100644
index cb1712a..0000000
--- a/resources/views/layout2/errors/500.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<style>
-.sf-reset .block > pre {
-    background-color: #000000;
-    padding: 10px 28px;
-    margin-bottom: 20px;
-    -webkit-border-bottom-right-radius: 0;
-    -webkit-border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    border-bottom: 1px solid #1faeac;
-    border-right: 1px solid #1faeac;
-    border-left: 1px solid #1faeac;
-    border-top: 1px solid #1faeac;
-    word-wrap: break-word;
-    color: green;
-}
-
-.block {
-    overflow: auto;
-    word-break: break-all;
-    max-height: 500px;
-}
-</style>
-
-	<h5>l0l! Something went wrong!</h5>
-        <div id="sf-resetcontent" class="sf-reset box">
-		<h6>Please don't send this fucking text to an admin, we have other problems.</h6>
-            <?php
-                $iv = openssl_random_pseudo_bytes(16);
-            ?>
-            @if(!env('APP_DEBUG'))
-            <div class="block">
-                {{bin2hex($iv)}}<br>
-                {{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
-            </div>
-            @else
-            <div class="block">
-                <pre>{{$exception}}</pre>
-            </div>
-            @endif
-
-        </div>
-@endsection
diff --git a/resources/views/layout2/errors/503.blade.php b/resources/views/layout2/errors/503.blade.php
deleted file mode 100644
index 4f63d68..0000000
--- a/resources/views/layout2/errors/503.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-	<title>Please Stand By we are just fucking this up</title>
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-		font-family: 'Lato';
-		background-color: #161618;
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Short maintenance, brb!</div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/layout2/footer.blade.php b/resources/views/layout2/footer.blade.php
deleted file mode 100644
index 80c807c..0000000
--- a/resources/views/layout2/footer.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<nav class="navbar-fixed-bottom">
-  <div class="container futter">
-    <a href="/about">About</a> | <a href="/rules">Rules</a> | <a href="/contact">Contact</a> | <a href="/privacy">Privacy</a> | <a href="/transparency">Transparency</a> | <a href="/friends">Friends</a> | <a href="/stats">Stats</a>
-    <p>Inspired by <a href="http://z0r.de">z0r.de</a> | © 2015 – {{ date('Y') }} w0bm.com</p>
-  </div>
-</nav>
diff --git a/resources/views/layout2/git.blade.php b/resources/views/layout2/git.blade.php
deleted file mode 100644
index d7e5519..0000000
--- a/resources/views/layout2/git.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<?php
-
-function getLatestCommit() {
-    $latestCommit = shell_exec('git log -n 1');
-    $getcommitID = substr($latestCommit,0,48);
-    $commitID = substr($getcommitID, 7);
-    echo "<div class='box'>";
-    echo "<span>Latest commit</span>";
-    //echo "<h4><a style='color:white' href='https://git.lat/w0bm/w0bm/commit/$commitID' target='_blank'>$commitID</a></h4>";
-    echo "<pre>$latestCommit</pre>";
-    echo "</div>";
-}
-
-function getLastTenCommits() {
-    $lastTenCommits = shell_exec('git log -n 10');
-    echo "<div class='box'>";
-    echo "<span>Last 10 Commits</span>";
-    echo "<pre>$lastTenCommits</pre>";
-    echo "</div>";
-}
-
-echo "<div class='box'>";
-echo "<h5>GIT LOG</h5>";
-getLatestCommit();
-getLastTenCommits();
-echo "</div>";
-?>
-
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout2/help.blade.php b/resources/views/layout2/help.blade.php
deleted file mode 100644
index 7402c87..0000000
--- a/resources/views/layout2/help.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="page-header p-2">
-        <h2></h2>
-</div>
-@endsection
-
diff --git a/resources/views/layout2/index.blade.php b/resources/views/layout2/index.blade.php
deleted file mode 100644
index b198ade..0000000
--- a/resources/views/layout2/index.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-    <h3 id="index">Index</h3>
-        
-        <form method="get" class="d-block d-sm-none">
-    <button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    <table class="table table-hover table-condensed">
-        <thead>
-        <tr>
-        <th>ID</th>
-        <th>Video Title</th>
-            <th>Artist</th>
-            <th>Songtitle</th>
-            <th class="hidden-xs">Video Source</th>
-            <th>Category</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <tr data-thumb="{{$thumb}}" class="indexedit" data-vid="{{$video->id}}">
-                <td>
-                    @if($edit = auth()->check() && auth()->user()->can('edit_video'))
-                        <form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
-                    @endif
-                    <div class="relativebla">
-                    @if(isset($q) && $video->hasAllTags($q))
-                        <span class="vinfo vid"><a href="/t/{{$q}}/{{$video->id}}">{{$video->id}}</a></span>
-                    @else
-                        <span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
-                    @endif
-                    <a href="{{url($video->id)}}"><img id="indexthumb" src="/thumbs/beta/{{$thumb}}.png"></a>
-                    </div>
-                    @if($edit)
-                        <input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
-                    @endif
-        </td>
-                <td>
-                    <span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="videotitle" value="{{$video->videotitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vinterpret">{{$video->interpret or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="interpret" value="{{$video->interpret or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vsongtitle">{{$video->songtitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="songtitle" value="{{$video->songtitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td class="hidden-xs">
-                    <span class="vinfo vimgsource">{{$video->imgsource or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="imgsource" value="{{$video->imgsource or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vcategory"><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></span>
-                    @if($edit)
-                        <select class="form-control" name="category" form="edit_{{$video->id}}">
-                            @foreach($categories as $cat)
-                                <option value="{{$cat->id}}" @if($cat->shortname === $video->category->shortname) selected @endif>{{$cat->name}}</option>
-                            @endforeach
-                        </select>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-
-    <div class="">
-        {!! $videos->render() !!}
-    </div>
-
-@endsection
diff --git a/resources/views/layout2/irc.blade.php b/resources/views/layout2/irc.blade.php
deleted file mode 100644
index d46724d..0000000
--- a/resources/views/layout2/irc.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header p-2">
-        <h3>IRC/[matrix]</h3>
-</div>
-<div class="dark-bg">
-<div class="box irc-matrix-info">
-	<h5>IRC</h5>
-<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
-<p><a href="https://webirc.n0xy.net/?join=%23w0bm" target="about_blank">webirc.n0xy.net</a></p>
-<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
-<h5>[matrix]</h5>
-<h6>#w0bm on the [matrix] network</h6>
-<p><a href="https://matrix.to/#/#!w0bm:f0ck.it?via=f0ck.it&via=matrix.org&via=f0.gg">#!w0bm:f0ck.it</a></p>
-<p>Alternatively you can use the Element web client hosted at <a href="https://element.f0ck.it">f0ck.it</a> to connect to our channel, it has some modifications to make chatting more comfy: <br><small>Note: Registrations are disabled, you can still use this client with every homeserver you have an account on!</small></p>
-<ul>
-    <li>w0bm.com Stylesheet</li>
-    <li>Greentexting</li>
-</ul>
-<a href="https://spyware.neocities.org/articles/discord.html" target="_blank"><img src="/images/shitcord.gif" alt="discord-no-way"></a><br><a href="/matrix">Additional Redpill</a>
-</div>
-{{--<div class="box">
-<iframe src="https://webirc.n0xy.net?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe>
-</div>--}}
-</div>
-@endsection
-
diff --git a/resources/views/layout2/layout.blade.php b/resources/views/layout2/layout.blade.php
deleted file mode 100644
index fcd065d..0000000
--- a/resources/views/layout2/layout.blade.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/njum/css/magic.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-dark.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/cstms.css?v={{ filemtime("njum/css/cstms.css") }}">
-</head>
-<body>
-    @if(auth()->check())
-    @include('partials.frontendedit')
-    	@include('partials.report')
-        @include('partials.filterselect')
-    @endif
-<canvas id="bg" class=""></canvas>
-<div class="container-fluid row p-0" id="wrapper">
-    <div class="col-sm scrollable hidden-xs p-0"></div>
-        <div class="container p-0">
-                <div class="col-md p-0">
-                    @include('partials.navigation')
-                    @include('partials.annouce')
-                    @include('partials.flash')
-                    <noscript>
-<div class="alert alert-warning alert-dismissible fade show" role="alert">
-  <strong>Javascript is disabled :(</strong> be a good neckbeard and turn it on, otherwise this Layout wont work as it should. However I can offer you to either reset to a <a href="/api/user/layout?layout=1">Layout that is nojs friendly</a> or just mind your own biz and simply block this message with your adblocker for example. Anyways have a nice day.
-  </button>
-</div>
-</noscript>
-                    @yield('floatvid')
-                    @include('partials.comments')
-                </div>
-            <div class="col-sm scrollable p-0"></div>
-        </div>
-    <div class="col-sm scrollable hidden-xs p-0"></div>
-</div>
-</body>
-<script type="text/javascript" src="/njum/js/jquery.min.js"></script>
-<script type="text/javascript" src="/njum/js/jquery.timeago.js"></script>
-<script type="text/javascript" src="/njum/js/popper.min.js"></script>
-<script type="text/javascript" src="/njum/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="/njum/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" src="/js/clipboard.min.js"></script>
-<script type="text/javascript" src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
-<script src="/njum/js/sticky_video.js"></script>
-<script type="text/javascript">
-    var clipboard = new ClipboardJS('.copylink');
-
-clipboard.on('success', function(e) {
-    console.info('Action:', e.action);
-    console.info('Text:', e.text);
-    console.info('Trigger:', e.trigger);
-
-    e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
-    console.error('Action:', e.action);
-    console.error('Trigger:', e.trigger);
-});
-</script>
-</html>
diff --git a/resources/views/layout2/login.blade.php b/resources/views/layout2/login.blade.php
deleted file mode 100644
index dad386d..0000000
--- a/resources/views/layout2/login.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.flash')
-  <form action="{{action('UserController@login')}}" method="post" class="form-signin">
-        {!! csrf_field() !!}
-        <input type="text" name="identifier" placeholder="Username" class="form-control">
-        <input type="password" name="password" placeholder="Password" class="form-control">
-        <input type="checkbox" name="remember" checked> Remember me<br>
-        <button type="submit" class="btn btn-dark">Login</button>
-        <a href="{{url('register')}}" class="btn btn-success">Register</a>
-  </form>
-@endsection
diff --git a/resources/views/layout2/main.blade.php b/resources/views/layout2/main.blade.php
deleted file mode 100644
index 85cdf15..0000000
--- a/resources/views/layout2/main.blade.php
+++ /dev/null
@@ -1,41 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="items">
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <div style="position: relative;" class="main-item hasTag-{{$video->id}}">
-            @if(isset($q) && $video->hasAllTags($q))
-                <a href="/t/{{$q}}/{{$video->id}}">
-                <style>
-                    .hasTag-{{$video->id}}::after {
-                        content: "\f02b";
-                        font: normal normal normal 14px/1 FontAwesome;
-                        position: absolute;
-                        bottom: 0;
-                        left: 0;
-                        padding: 5px;
-                        color: #0bb568;
-                        text-shadow: 1px 1px 1px black;
-                        font-size: 1em;
-                        pointer-events: none;
-                    }
-                </style>
-            @else
-                <a href="/{{$video->id}}">
-            @endif
-			@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
-			    <img src="/thumbs/beta/{{$thumb}}.png">
-			@else
-			    <img src="/small_404.gif" class="nothumb" />
-			@endif
-		    </a>
-		</div>
-        @endforeach
-    </div>
-
-    <div class="page">
-        {!! $videos->render() !!}
-    </div>
-@endsection
diff --git a/resources/views/layout2/marder.blade.php b/resources/views/layout2/marder.blade.php
deleted file mode 100644
index 11ae7ad..0000000
--- a/resources/views/layout2/marder.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<h3>Hello everyone!</h3>
-
-<div class="box">
-<img src="https://marderchen.totally.rip/marderchen.lima-city.de/marderchen.gif" style="float: right;" alt="">
-  <p>Today we have sad news, a beloved friend of us and one of our most unique members died.</p>
-  <p>Some of you may remember his unique and interesting and somewhat chaotic but cool videos.</p>
-  <p>Today we mourn the loss of our friend marderchen.</p>
-  <p>We sincerely hope you are at a better place now.</p>
-  <p>We thank you for the great time we had with you, you inspired many of us and brought joy to the IRC and to the website, you will be missed old friend.</p>
-
-  <p>To say it in your words: =^_^= MEOW</p>
-
-  <p>We have archived his long gone website, make sure to check it out! It is absolutely wild (only available in German)</p>
-
-  <p><a href="https://marderchen.totally.rip/marderchen.lima-city.de/index.html">https://marderchen.totally.rip/marderchen.lima-city.de/index.html</a></p>
-
-  <p>Also make sure to check out his uploads <a href="https://w0bm.com/main?q=marderchen">https://w0bm.com/main?q=marderchen</a> and enjoy it.</p>
-
-  <p><i>- w0bm staff</i></p>
-</div>
-@endsection
-
diff --git a/resources/views/layout2/matrix.blade.php b/resources/views/layout2/matrix.blade.php
deleted file mode 100644
index f38731d..0000000
--- a/resources/views/layout2/matrix.blade.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<style type="text/css">
-    * {margin: 0; padding: 0}
-body {background: #000;overflow:hidden;}
-canvas {display: block;}
-.matrix {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    font-family: monospace;
-}
-.matrix > .inner {
-    position: absolute;
-    color: white;
-    top: 40%;
-}
-.inner {
-    background: #000000b5;
-    padding: 5px;
-}
-
-#bluepill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: blue;
-    background: blue;
-    border-radius: 5px;
-}
-
-#redpill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: red;
-    background: red;
-    border-radius: 5px;
-}
-</style>
-<div class="matrix">
-    <div class="inner">
-    <h3><p><b><i>You are a slave {{Auth::user()->username}}</i></b></p></h3>
-    <br>
-    <p>Take control over your chats, leave Discord for good!</p>
-    <p>Join [matrix] today!</p>
-    <p>Why should you consider either running a [matrix] synapse yourself or start using someone elses:</p>
-    <p>Discord is evil, it took away the freedom you and I deserve, it makes you a slave to their services,<br> makes you obey their rules, includes you in a unwanted botnet where you have no freedom at all!</p>
-    <p>It's time to break free {{Auth::user()->username}}</p>
-    <p>Choose your fate</p>
-    <span id="bluepill"><a href="https://discordapp.com/app"></a></span> <span id="redpill"><a href="https://github.com/matrix-org/synapse" target="_blank"></a></span>
-    <p><code>#!w0bm:f0ck.it</code></p>
-    <br>
-    <p><small>We are happy to help if you have any trouble setting up your synapse</small></p>
-</div>
-</div>
-<canvas></canvas>
-<audio src="/clubbed.mp3" autoplay loop></audio>
-<script type="text/javascript">
-    // Initialising the canvas
-var canvas = document.querySelector('canvas'),
-    ctx = canvas.getContext('2d');
-
-// Setting the width and height of the canvas
-canvas.width = window.innerWidth;
-canvas.height = window.innerHeight;
-
-// Setting up the letters
-var letters = 'ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ';
-letters = letters.split('');
-
-// Setting up the columns
-var fontSize = 10,
-    columns = canvas.width / fontSize;
-
-// Setting up the drops
-var drops = [];
-for (var i = 0; i < columns; i++) {
-  drops[i] = 1;
-}
-
-// Setting up the draw function
-function draw() {
-  ctx.fillStyle = 'rgba(0, 0, 0, .1)';
-  ctx.fillRect(0, 0, canvas.width, canvas.height);
-  for (var i = 0; i < drops.length; i++) {
-    var text = letters[Math.floor(Math.random() * letters.length)];
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(text, i * fontSize, drops[i] * fontSize);
-    drops[i]++;
-    if (drops[i] * fontSize > canvas.height && Math.random() > .95) {
-      drops[i] = 0;
-    }
-  }
-}
-
-// Loop the animation
-setInterval(draw, 33);
-</script>
\ No newline at end of file
diff --git a/resources/views/layout2/messages.blade.php b/resources/views/layout2/messages.blade.php
deleted file mode 100644
index 2c7aed8..0000000
--- a/resources/views/layout2/messages.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="dark-bg">
-@include('partials.msglist')
-    <div class="row">
-        <div class="col-md-6" id="list">
-            <div class="spinner">
-                <div class="cube1"></div>
-                <div class="cube2"></div>
-            </div>
-        </div>
-        <div class="col-md-6" id="message"><h4>Select a message to display content</h4></div>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout2/messages/commentanswer.blade.php b/resources/views/layout2/messages/commentanswer.blade.php
deleted file mode 100644
index 9e16805..0000000
--- a/resources/views/layout2/messages/commentanswer.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<span id="comm_answer"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment.</span>
-<span id="comm_answer"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></span>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout2/messages/commentmention.blade.php b/resources/views/layout2/messages/commentmention.blade.php
deleted file mode 100644
index ea15625..0000000
--- a/resources/views/layout2/messages/commentmention.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout2/messages/commentpreview.blade.php b/resources/views/layout2/messages/commentpreview.blade.php
deleted file mode 100644
index 46f257e..0000000
--- a/resources/views/layout2/messages/commentpreview.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-body">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="right" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small></div>
-</div>
diff --git a/resources/views/layout2/messages/moderation/commentdelete.blade.php b/resources/views/layout2/messages/moderation/commentdelete.blade.php
deleted file mode 100644
index 734b4b6..0000000
--- a/resources/views/layout2/messages/moderation/commentdelete.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator deleted your comment.</h3>
-<p>A moderator deleted your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout2/messages/moderation/commentrestore.blade.php b/resources/views/layout2/messages/moderation/commentrestore.blade.php
deleted file mode 100644
index a8cf012..0000000
--- a/resources/views/layout2/messages/moderation/commentrestore.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator restored your comment.</h3>
-<p>A moderator restored your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout2/messages/moderation/videodelete.blade.php b/resources/views/layout2/messages/moderation/videodelete.blade.php
deleted file mode 100644
index 6a6568b..0000000
--- a/resources/views/layout2/messages/moderation/videodelete.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<h3>A moderator deleted your video.</h3>
-<p>A moderator deleted your video with the ID {{$video->id}}</p>
-<span style="font-weight:bold;">Video Info:</span>
-<ul>
-    @if(isset($videoinfo['artist'])) <li><span style="font-weight:bold;">Artist:</span> {{ $videoinfo['artist'] }}</li> @endif
-    @if(isset($videoinfo['songtitle'])) <li><span style="font-weight:bold;">Songtitle:</span> {{ $videoinfo['songtitle'] }}</li> @endif
-    @if(isset($videoinfo['video_source'])) <li><span style="font-weight:bold;">Video Source:</span> {{ $videoinfo['video_source'] }}</li> @endif
-    <li><span style="font-weight:bold;">Category:</span> {{ $videoinfo['category'] }}</li>
-</ul>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
\ No newline at end of file
diff --git a/resources/views/layout2/messages/videocomment.blade.php b/resources/views/layout2/messages/videocomment.blade.php
deleted file mode 100644
index 6fd92f3..0000000
--- a/resources/views/layout2/messages/videocomment.blade.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<p class="vidcomment"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> made a comment on your video ID (<a href="{{url($video->id)}}">/{{$video->id}}</a>)</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout2/nav.blade.php b/resources/views/layout2/nav.blade.php
deleted file mode 100644
index 2ec3f72..0000000
--- a/resources/views/layout2/nav.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<ul class="nav">
-  <div class="card">
-    <a class="badge badge-sexy">{{$video->id}}</a>
-      @if(count($video->tags))
-        @foreach($video->tags as $tag)
-          @if($tag == 'sfw')
-            <a class="badge badge-success isSfw">SFW</a>
-            @elseif($tag == 'nsfw')
-            <a class="badge badge-danger isNsfw">NSFW</a>
-          @endif
-        @endforeach
-      @endif
-  </div>
-
-        @if(auth()->check())
-          @if(auth()->user()->hasFaved($video->id))
-            <form action="{{url($video->id . '/fav')}}">
-              <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-              <button type="submit" id="fav" class="btn btn-dark" fav-data="{{url($video->id . '/fav')}}"><i class="fa fa-heart fa-lg"></i></button>
-            </form>
-          @else
-            <form action="{{url($video->id . '/fav')}}">
-              <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-              <button type="submit" id="fav" class="btn btn-dark bg-toggle"><i class="fa fa-heart-o fa-lg"></i></button>
-            </form>
-          @endif
-          @else
-          @endif
-  
- <li class="nav-link" data-trigger="hover" data-toggle="popover" data-content="Toggle Videoblur" data-placement="bottom">
-    <button type="button" class="btn btn-dark" id="togglebg"><i class="fa fa-power-off fa-lg"></i></button>
-  </li>
-
-  <li class="nav-link" data-trigger="hover" data-toggle="popover" data-content="Metadata" data-placement="bottom">
-    <button type="button" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
-      <i class="fa fa-lg fa-info-circle"></i>
-    </button> 
-    <div id="popover-content" hidden>
-      @include('video-partials.popover-metadata')
-    </div>
-  </li>
-</ul>
\ No newline at end of file
diff --git a/resources/views/layout2/open.sh b/resources/views/layout2/open.sh
deleted file mode 100644
index ab6ca5a..0000000
--- a/resources/views/layout2/open.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/w0bm.com/resources/views/
-ln -sf registeropen.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout2/partials/annouce.blade.php b/resources/views/layout2/partials/annouce.blade.php
deleted file mode 100644
index 242572d..0000000
--- a/resources/views/layout2/partials/annouce.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- <div class="blahffff">
-    <a href="/change">RE: Content on w0bm</a>
-</div> -->
\ No newline at end of file
diff --git a/resources/views/layout2/partials/banmenu.blade.php b/resources/views/layout2/partials/banmenu.blade.php
deleted file mode 100644
index a1607d0..0000000
--- a/resources/views/layout2/partials/banmenu.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<form id="banmenu" method="POST" action="/api/user/{{$user->username}}/ban">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="banmenumodal" tabindex="-1" role="dialog" aria-labelledby="Ban user">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="filterModalTitle">Ban user</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="reason">Reason</label>
-                        <input class="form-control" type="text" name="reason" id="reason" placeholder="Reason">
-                    </div>
-                    <div class="form-group">
-                        <label for="duration">Duration</label>
-                        <input class="form-control" type="text" name="duration" id="duration" placeholder="Duration (-1 = permanent)">
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                    <input type="submit" class="btn btn-danger" value="BAN!">
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/resources/views/layout2/partials/comlist.php b/resources/views/layout2/partials/comlist.php
deleted file mode 100644
index 8c0f191..0000000
--- a/resources/views/layout2/partials/comlist.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<script id="comlist" type="text/x-handlebars-template">
-            {{#each data as |value key|}}
-            <div class="panel panel-default">
-                <div class="panel-body" style="word-wrap: break-word;" data-index="{{key}}" data-id="{{id}}">{{{rendered_view}}}</div>
-                <div class="panel-footer">Video: <a href="/{{video_id}}">/{{video_id}}</a> | <time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-            </div>
-            {{else}}
-            <div class="list-group-item">No comments</div>
-            {{/each}}
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-</script>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/comment.blade.php b/resources/views/layout2/partials/comment.blade.php
deleted file mode 100644
index 17f9ced..0000000
--- a/resources/views/layout2/partials/comment.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel @if($del = !is_null($comment->deleted_at)) panel-danger @else @endif video-comment-wrapper" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
-    	  <div class="umrandung_name">
-    	<div class="comment_header"><a class="{{$comment->user->username}} user_color" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time> No. <a href="#{{ $comment->id }}">{{ $comment->id }}</a>
-            <div class="dingz">
-            @if($mod)
-            @if($del)
-                <a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
-            @else
-                <a class="delete_comment" href="#{{$comment->id}}" onclick="deleteComment($(this))">[del]</a>
-                <a class="edit_comment" href="#{{$comment->id}}" onclick="editComment($(this))">[edit]</a>
-            @endif
-        @endif
-    </div>
-    </div>
-</div>
-    <div class="comment panel-body video-comment-body" author="{{$comment->user->username}}">
-        @simplemd($comment->content)
-    </div>
-</div>
diff --git a/resources/views/layout2/partials/commentform.blade.php b/resources/views/layout2/partials/commentform.blade.php
deleted file mode 100644
index a04b99e..0000000
--- a/resources/views/layout2/partials/commentform.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="sticky">
-    <div id="commentForm">
-        <form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-            {!! csrf_field() !!}
-                <div class="comment-panel panel-default">
-                    <div class="comment-panel panel-body">
-                        {!! Form::textarea('comment', null, ['placeholder' => 'Write something...', 'id' => 'cinput', 'class' => 'form-control text-light comment-entry-textarea', 'required' => 'required']) !!}
-                    </div>
-                    
-                    <div class="commentButton">
-                        <div id="comment_tools" class="commentform-panel-footer">
-                            <div class="commentToolsWrapper">
-                                <button type="submit" class="btn btn-dark btn-sm" onclick="commentBotScroll()">Post</button>
-                                <span class="emojiCollapser btn btn-dark btn-sm" data-toggle="collapse" href="#collapseEmojis" role="button" aria-expanded="false" aria-controls="collapseEmojis">🦦 Emoji Picker</span>
-                                <div class="textModifiers btn btn-dark btn-sm">
-                                    <a  class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-                                    <a  class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-                                    <a  class="krebs" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-                                    <a  class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
-                                </div>
-                                <span onclick="bottomArrow()" class="btn btn-dark btn-sm" style="cursor: pointer;"><i class="fa fa-arrow-down" aria-hidden="true"></i></span> 
-                                <a href="#" class="scrollToTop btn btn-dark btn-sm" style=""><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                            </div>
-                            <div class="collapse" id="collapseEmojis">
-                                <div class="emojiWrapper emojis">
-                                    <?php
-                                        $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.webp', GLOB_BRACE);
-                                        $files = array_map(function ($f) { return pathinfo($f); }, $files);
-                                    ?>
-                                    @foreach ($files as $file)
-                                        <a class="w0bm_emoji_anchor" title=":{{$file['filename']}}:" href="javascript:;" onclick="formatTextEmoji ('{{$file['filename']}}');"><img class="comment_emoji_small" src="//w0bm.com/images/comments/{{$file['basename']}}" loading="lazy"></a>
-                                    @endforeach
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/comments.blade.php b/resources/views/layout2/partials/comments.blade.php
deleted file mode 100644
index 15d5930..0000000
--- a/resources/views/layout2/partials/comments.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@if(Auth::check())
-<div class="commentOpener">
-    <a class="commentOpenButton" data-toggle="collapse" href="#collapseComments" role="button" aria-expanded="false" aria-controls="collapseComments">
-    See {{ $video->comments()->count() }} comments
-  </a>
-</div>
-<div class="collapse" id="collapseComments">
-  <div class=" commentwrapper comments">
-          <?php
-            if($mod = (Auth::check() && Auth::user()->can('delete_comment'))) $comments = $video->comments()->withTrashed()->get();
-            else $comments = $video->comments;
-        ?>
-        @if(count($comments) > 0)
-            @foreach($comments as $comment)
-                @include('partials.comment', ['comment' => $comment, 'mod' => $mod])
-            @endforeach
-        @else
-        <div class="panel panel-default nocomments">
-                <div class="panel-body">
-                    No comments yet! Be the first one to comment!<br />
-                </div>
-            </div>
-        @endif
-  </div>
-  @if($video->id == '30186')
-  @include('partials.thread_closed')
-  @else
-    @include('partials.commentform')
-    @endif
-</div>
-@endif
diff --git a/resources/views/layout2/partials/filterselect.blade.php b/resources/views/layout2/partials/filterselect.blade.php
deleted file mode 100644
index 8759e59..0000000
--- a/resources/views/layout2/partials/filterselect.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-head">
-		<h4 class="modal-title" id="filterModalTitle"><i class="fa fa-coffee"></i> Filter</h4>
-		<span>When entering a tag you will no longer see videos with that tag.</span>
-            </div>
-            <div class="modal-body">
-                <input id="filter" type="text" class="form-control" placeholder="Input tags…" name="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">
-                {{--<input class="form-control" type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-                <button href="/filter" type="submit" id="submitfilter" class="btn btn-dark" value="Save">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout2/partials/filtersettings.blade.php b/resources/views/layout2/partials/filtersettings.blade.php
deleted file mode 100644
index 74eb84f..0000000
--- a/resources/views/layout2/partials/filtersettings.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($video) && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id))
-        @include('partials.frontendedit')
-	@endif
-@endif
diff --git a/resources/views/layout2/partials/flash.blade.php b/resources/views/layout2/partials/flash.blade.php
deleted file mode 100644
index 73335c1..0000000
--- a/resources/views/layout2/partials/flash.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="flashcontainer">
-    <div class="flash-inner">
-        @if($errors->count() > 0)
-            @foreach($errors->all() as $error)
-                <div class="alert alert-danger alert-dismissable" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    {{ $error }}
-                </div>
-            @endforeach
-        @endif
-        @if(Session::has('error'))
-            <div class="alert alert-danger alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('error') }}
-            </div>
-        @endif
-        @if(Session::has('success'))
-            <div class="alert alert-success alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('success') }}
-            </div>
-        @endif
-        @if(Session::has('info'))
-            <div class="alert alert-info alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('info') }}
-            </div>
-        @endif
-        @if(Session::has('warning'))
-            <div class="alert alert-warning alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('warning') }}
-            </div>
-        @endif
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/footer-navigation.blade.php b/resources/views/layout2/partials/footer-navigation.blade.php
deleted file mode 100644
index c9bfa74..0000000
--- a/resources/views/layout2/partials/footer-navigation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<nav class="navbar navbar-dark bg-dark">
-	<h5>LOL</h5>
-</nav>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/frontendedit.blade.php b/resources/views/layout2/partials/frontendedit.blade.php
deleted file mode 100644
index 509dc61..0000000
--- a/resources/views/layout2/partials/frontendedit.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@if(isset($video))
-    <form id="webmedit" method="POST" action="/index/{{$video->id}}">
-        {!! csrf_field() !!}
-        <div class="modal fade" id="webmeditmodal" tabindex="-1" role="dialog" aria-labelledby="Edit webm">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title" id="filterModalTitle">Edit webm</h4>
-                    </div>
-                    <div class="modal-body frontendeditmodal">
-                        <div class="form-group">
-                        @if(auth()->check() && auth()->user()->can('delete_video'))
-                            <div class="form-group">
-                                <label for="imgsourceedit">Video Title</label>
-                                <input class="form-control" type="text" name="videotitle" id="videotitleedit" value="{{ $video->videotitle or ''}}" placeholder="Video Title">
-                            </div>
-                            <label for="interpretedit">Artist</label>
-                            <input class="form-control" type="text" name="interpret" id="interpretedit" value="{{ $video->interpret or ''}}" placeholder="Artist">
-                        </div>
-                        <div class="form-group">
-                            <label for="songtitleedit">Songtitle</label>
-                            <input class="form-control" type="text" name="songtitle" id="songtitleedit" value="{{ $video->songtitle or ''}}" placeholder="Songtitle">
-                        </div>
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Source</label>
-                            <input class="form-control" type="text" name="imgsource" id="imgsourceedit" value="{{ $video->imgsource or ''}}" placeholder="Video Source">
-                            @endif
-                        </div>
-                        @if(auth()->check() && auth()->user()->can('delete_video'))
-                        <div class="form-group">
-                            <label for="categoryselect">Category</label>
-                            <select class="form-control" name="category" id="categoryselect">
-                                @foreach(\App\Models\Category::all() as $category)
-                                <option value="{{$category->id}}" @if($video->category->id == $category->id) selected @endif>{{$category->name}}</option>
-                                @endforeach
-                            </select>
-                        </div>
-                        @endif
-                        <div class="form-group">
-                            <label for="tageditor">Add Tags</label>
-                            <div class="frontendedittags">
-                                @include('partials.tags')
-                            </div>
-                        </div>
-                        <div class="deleteit">
-                            @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#"><i class="fa fa-trash fa-lg"></i> Remove upload</a>@endif
-                        </div>
-                    </div>
-                    @if(auth()->check() && auth()->user()->can('delete_video'))
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-dark">Save changes</button>
-                    </div>
-                    @endif
-                </div>
-            </div>
-        </div>
-    </form>
-@endif
diff --git a/resources/views/layout2/partials/handlebars.php b/resources/views/layout2/partials/handlebars.php
deleted file mode 100644
index 3a70c75..0000000
--- a/resources/views/layout2/partials/handlebars.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="paginationtmpl" type="text/x-handlebars-template">
-    <nav class="mitte">
-        <ul class="pagination">
-            {{#paginate pagination type="first"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">First</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="previous"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&laquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="middle" limit="7"}}
-            <li {{#if active}}class="active"{{/if}}><a href="#" data-page="{{n}}">{{n}}</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="next"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&raquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="last"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">Last</a></li>
-            {{/paginate}}
-        </ul>
-    </nav>
-    <div class="clearfix"></div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/header.blade.php b/resources/views/layout2/partials/header.blade.php
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout2/partials/loginmodal.blade.php b/resources/views/layout2/partials/loginmodal.blade.php
deleted file mode 100644
index 91551b0..0000000
--- a/resources/views/layout2/partials/loginmodal.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="modal fade" id="loginmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            
-            <div class="login_wrapper">
-            	<div class="col-md-9">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-
-		<div class="modal-footer">
-			<p>Registration has been disabled due to multiple spammers, if you want an account, please apply for it in the <a href="/irc">IRC</a>, thanks!</p>
-        	</div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout2/partials/msglist.php b/resources/views/layout2/partials/msglist.php
deleted file mode 100644
index 703afee..0000000
--- a/resources/views/layout2/partials/msglist.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<script id="msglist" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading-messages">
-            <h3 class="panel-title">Messages</h3> <button class="btn btn-dark readall" onclick="readAll()">Read all</button>
-        </div>
-
-        <div class="list-group" id="listitems">
-            {{#each data as |value key|}}
-            <a href="#" data-index="{{key}}" data-id="{{id}}" class="list-group-item {{#unless read}}list-group-item-info{{/unless}}">{{subject}}</a>
-            {{else}}
-            <div class="list-group-item">No messages</div>
-            {{/each}}
-        </div>
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-    </div>
-</script>
-
-<script id="msgtmpl" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{{subject}}</h3>
-        </div>
-        <div class="panel-body">
-            {{{content}}}
-        </div>
-        <div class="panel-footer"><time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/navigation.blade.php b/resources/views/layout2/partials/navigation.blade.php
deleted file mode 100644
index 82e413e..0000000
--- a/resources/views/layout2/partials/navigation.blade.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top">
-    <div class="w0bm-logo">
-        <a class="navbar-brand" href="/main">
-            <img id="logo" src="https://w0bm.com/w0bm_mosh_banner_by_marderchen.gif" class="d-inline-block align-top" alt="w0bm.com">
-        </a>
-    </div>
-  	<ul class="navbar-nav mr-auto">
-      @if (!empty($__env->yieldContent('novidcontent')))
-      @else
-      
-        @endif
-        @if(Auth::check())
-        <li class="nav-link dropdown">
-        <button id="nav-user" class="btn btn-dark nav-link bg-toggle dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span>
-            @if(Auth::user()->messagesRecv()->unread()->count() < 1)
-            <span class="nomsg">|</span>@else
-            <span class="yesmg">|</span>@endif {{Auth::user()->username}}</span>
-        </button>
-          <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-  <div class="grid-menu">
-      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}/favs"><span class=""><i class="fa fa-heart"></i></span></a>
-      <a class="dropdown-item" href="{{url('messages')}}"><span class=""><i class="fa fa-envelope-square"></i> {{Auth::user()->messagesRecv()->unread()->count()}}</span></a>
-      <a class="dropdown-item" href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
-      <a class="dropdown-item" href="{{url('upload')}}">Upload</a>
-  </div>
-            <a class="dropdown-item logout" href="{{url('logout')}}">Logout</a>
-          </div>
-        @else
-   
-        @endif
-      </li>
-      @if(Auth::check())
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Links
-        </a>
-        <div class="dropdown-menu LinksGrid" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" href="/index">Index</a>
-          <a class="dropdown-item" href="/categories">Categories</a>
-          <a class="dropdown-item" href="/about">About</a>
-          <a class="dropdown-item" href="/irc">IRC</a>
-          <a class="dropdown-item" href="/rules">Rules</a>
-          <a class="dropdown-item" href="/stats">Stats</a>
-        </div>
-      </li>
-<li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Layout
-        </a>
-        <div id="layoutSwitcher" class="dropdown-menu" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" id="layout1" href="#">Atmos</a>
-        </div>
-      </li>
-
-  </ul>
-    @else
-@endif
-
-@if (\Request::is('index'))
-      <div class="search-index hidden-xs d-none d-md-block">
-        <form method="get" action="/index" class="form-inline my-2 my-lg-0">
-	    {!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
-	    <button class="search-btn btn btn-dark" type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
-        </form>
-    </div>
-@else
-      <div class="search-index hidden-xs d-none d-md-block">
-        <form method="get" action="/main" class="form-inline my-2 my-lg-0">
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
-            <button class="search-btn btn btn-dark" type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
-        </form>
-    </div>
-@endif
-</nav>
\ No newline at end of file
diff --git a/resources/views/layout2/partials/profileheader.blade.php b/resources/views/layout2/partials/profileheader.blade.php
deleted file mode 100644
index c9ebd0b..0000000
--- a/resources/views/layout2/partials/profileheader.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="page-header p-2">
-    <h3 class="{{ $user->username }}">{!! rtrim(e($user->username) . ' ' . $user->activeIcon()) !!} @if($user->disabled && isset($user->banend) && (Carbon\Carbon::now() <= $user->banend || 1 >= $user->banend->timestamp))<span style="color: grey; font-size: 15px;">(@if(Carbon\Carbon::now() <= $user->banend)Ban expires in <time class="timeago" data-toggle="tooltip" title="{{ $user->banend }}+0000" datetime="{{ $user->banend }}+0000"></time>@else permanently banned @endif)</span>@endif</h3>
-<div class="admin-settings">
-@if(auth()->check() && auth()->user()->can('edit_user'))<span id="pannade"><a href="#" data-toggle="modal" data-target="#banmenumodal"><i style="color:red;" class=""></i>[ban user]</a></span>
-@endif
-</div>
-    <span id="jointime">Joined: <time class="timeago" datetime="{{ $user->created_at }}+0000" title="{{ $user->created_at }}+0000" data-toggle="tooltip"></time></span>
-<div class="profile-info">
-    <span id="count-upload"> <a href="/user/{{$user->username}}"> <i class="fa fa-cloud-upload"></i> {{ $user->uploads()->countScoped()->count() }} Uploads</a></span>
-
-    <span id="comments-user"> <a href="/user/{{$user->username}}/comments"><i class="fa fa-commenting"></i> {{ $user->comments()->count() }} Comments</a></span>
-
-    <span id="favs-user"><a href="/user/{{$user->username}}/favs/index"><i class="fa fa-heart"></i> {{ $user->favs()->countScoped()->count() }} Favorites</a></span>
-</div>
-@if($user->isOnline())
-    user is online!!
-@endif
-</div>
diff --git a/resources/views/layout2/partials/registermodal.blade.php b/resources/views/layout2/partials/registermodal.blade.php
deleted file mode 100644
index d56589a..0000000
--- a/resources/views/layout2/partials/registermodal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="modal fade" id="registermodal" tabindex="-1" role="dialog" aria-labelledby="Register">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Register</h4>
-            </div>
-            
-            <div class="advantages">
-              <p>Registering on w0bm has some advantages...</p>
-              <p>With a account you can comment on WebMs, favor WebMs, upload WebMs, tag videos, filter out unwanted tags and watch NSFW WebMs!</p>
-            </div>
-
-            <div class="reg_wrapper">
-	   		        <div class="register">
-                  <div class="col-md-10">
-                    <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-                      {!! csrf_field() !!}
-                        <div class="form-group">
-                          <div class="reg_username">
-                            {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                          </div>
-                        </div>
-                
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                          </div>
-                        </div>
-              
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                          </div>
-                        </div>
-            
-                        <div class="form-group">
-                          <div class="recaptcha">
-                            {!! Recaptcha::render() !!}
-                          </div>
-                        </div>
-                      
-                        <div class="form-group terms">
-                          <div class="verify_rules">
-                            <p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-                          </div>
-                        
-                          <div class="submit_registration">
-                            <button type="submit" class="btn btn-primary">Register</button>
-                          </div>
-                        </div>
-                    </form>
-                  </div>
-                </div>
-            </div>
-
-            <div class="modal-footer">
-              <p>Back to <a href="#" data-toggle="modal" data-target="#loginmodal" data-dismiss="modal">Login?</a></p>
-            </div>
-    </div>
-</div>
-</div>
diff --git a/resources/views/layout2/partials/report.blade.php b/resources/views/layout2/partials/report.blade.php
deleted file mode 100644
index 07de851..0000000
--- a/resources/views/layout2/partials/report.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- created by klee -->
-@if(isset($video))
-  <form id="webmreport" method="POST" action="/report/{{$video->id}}">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="webmreportmodal" tabindex="-1" role="dialog" aria-labelledby="Report webm">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title" id="filterModalTitle">Report WebM</h4>
-          </div>
-          <div class="modal-body webmreportmodal">
-            So you want to report this webm? Tell us why:<br>
-            <br>
-            <div class="form-group">
-              <label for="reportReasons">
-                Reason(s)<br>
-                <em>(hold ctrl to select multiple)</em>
-              </label>
-              <select multiple class="form-control" id="reportReasons" name="reportReasons[]">
-                <option>Wrong rating (sfw/nsfw)</option>
-                <option>Shitpost</option>
-                <option>Low quality/effort video</option>
-                <option>Breaks a rule</option>
-                <option>Other</option>
-                <!-- breaks a rule, Wrong safe for rating -->
-              </select>
-            </div>
-            <label for="reportReasonText">Please explain a bit more detailed why you want to report this webm</label>
-            <textarea class="form-control" id="reportText" name="reportText" rows="3" required></textarea>
-            <p>Abuse of this form will be awarded with a permanent ban!</p>
-          </div>            
-          <div class="modal-footer">
-            <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-dark">Send Report</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </form>
-@endif
\ No newline at end of file
diff --git a/resources/views/layout2/partials/tags.blade.php b/resources/views/layout2/partials/tags.blade.php
deleted file mode 100644
index 26b8293..0000000
--- a/resources/views/layout2/partials/tags.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="tags">
-    <div class="tagtest">
-    @if(Auth::check())
-    <div id="tag-add">
-        <div class="row">
-            <div class="col tag-col">
-                <div class="input-group">
-                    {{--<select multiple name="tags[]" data-role="tagsinput" class="form-control"></select>--}}
-                    <input id="tags" type="text" class="form-control" placeholder="Input tags…" name="tags" data-role="tagsinput">
-                    <span class="input-group-btn"></span>
-                </div>
-            </div>
-        </div>
-    <div class="sendtags">
-        <button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-dark">Submit</button>
-    </div>          
-    </div>
-    @else
-        @endif
-    </div>
-    <label for="manage-tags">Manage Tags</label>
-    <div class="toggo tag-panel-body">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                @if($tag == 'sfw')
-                @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
-                @elseif($tag == 'nsfw')
-                @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a></span>@endif
-                @else
-                    @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
-                    @endif
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout2/partials/themechanger.blade.php b/resources/views/layout2/partials/themechanger.blade.php
deleted file mode 100644
index 2efed41..0000000
--- a/resources/views/layout2/partials/themechanger.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<li role="presentation" class="">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Theme
-    </a>
-<ul class="dropdown-menu">
-    <div id="switcher">
-        <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
-        <br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
-    <button class="glitch-css" onclick="setActiveStyleSheet('Glitch'); return false;">Glitch</button>
-    <br>    
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout2/partials/thread_closed.php b/resources/views/layout2/partials/thread_closed.php
deleted file mode 100644
index 03d2e52..0000000
--- a/resources/views/layout2/partials/thread_closed.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thread_closed">
-  <span>Thread closed! ;__;</span>
-</div>
diff --git a/resources/views/layout2/partials/uploadinfo.blade.php b/resources/views/layout2/partials/uploadinfo.blade.php
deleted file mode 100644
index 0653081..0000000
--- a/resources/views/layout2/partials/uploadinfo.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="vidinfo">
-						<button title="Toggle Background" class="hidden-xs bg-toggle" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
-							<div style='word-break: break-word;'>@if($video->interpret) <strong>Artist:</strong> {{$video->interpret}}<br>@endif
-											@if($video->songtitle) <strong>Songtitle:</strong> {{$video->songtitle}}<br>@endif
-											@if($video->imgsource) <strong>Video Source:</strong> {{$video->imgsource}} <br>
-											@endif
-											<strong>Category:</strong> {{$video->category->name}}</div>
-						<span id="uploader">uploaded by <a style="color: white" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>@if(auth()->check() && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#">[del]</a>@endif 
-	</div>
diff --git a/resources/views/layout2/partials/videoinfo.blade.php b/resources/views/layout2/partials/videoinfo.blade.php
deleted file mode 100644
index aba4c4b..0000000
--- a/resources/views/layout2/partials/videoinfo.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-			<div class="text-center">
-				@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}">🡄 first</a>
-						<a id="prev" href="{{url($related->baseurl(), [$prev->id])}}">🡄 prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next 🡆</a>
-						<a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last 🡆</a>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($video->getFirstId())}}">🡄 first</a>
-						<a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a>
-						<a class="last" href="{{url($video->getLastId())}}">last 🡆</a>
-					@endif
-				@endif
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout2/privacy.blade.php b/resources/views/layout2/privacy.blade.php
deleted file mode 100644
index 1066ee4..0000000
--- a/resources/views/layout2/privacy.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Privacy</h3>
- </div>
-
-<div class="box">
-<h5>What do we log?</h5>
-<p>We ourself don't log anything, cloudflare does log all the request that are being made to our site, we can however only access very little of it, no ips and only basic stats.</p>
-<h5>3<sup>rd</sup> party links</h5>
-<p>There are some 3rd party linkings on this website, be careful with clicking them we don't know whats inside the box blah blah blah, don't be stupid and don't trust the internet.</p>
-<p>If you encounter a malicious link shared here on w0bm.com please notify an admin in the IRC.</p>
-<p>We also use a webfont from google fonts, if you don't like that go fuck yourself or block it with umatrix.</p>
-<h5>Cookies</h5>
-<p>Yes, we use cookies if you don't like that don't come to our site! (or don't accept them in the first place)</p>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout2/profile.blade.php b/resources/views/layout2/profile.blade.php
deleted file mode 100644
index baf7fe5..0000000
--- a/resources/views/layout2/profile.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-	<div class="profilheader p-2">
-	    <a href="/{{$user->baseurl()}}/">View {{ $title }}</a>
-	</div>
-            <table class="table table-hover table-condensed">
-                <thead>
-                <tr>
-		    <th>ID</th>
-		    <th>Video Title</th>
-                    <th>Artist</th>
-                    <th>Songtitle</th>
-                    <th class="hidden-xs">Video Source</th>
-                    <th>Category</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($videos as $video)
-                    <?php
-                        $thumb = str_replace(".webm","",$video->file);
-                    ?>
-                    <tr data-thumb="{{$thumb}}">
-			<td><a href="/{{$user->baseurl()}}/{{$video->id}}">{{$video->id}}</a></td>
-			<td>{{$video->videotitle or ''}}</td>
-                        <td>{{$video->interpret or ''}}</td>
-                        <td>{{$video->songtitle or ''}}</td>
-                        <td class="hidden-xs">{{$video->imgsource or ''}}</td>
-                        <td><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            {!! $videos->render() !!}
-@endsection
diff --git a/resources/views/layout2/profilelayout.blade.php b/resources/views/layout2/profilelayout.blade.php
deleted file mode 100644
index a14c0c6..0000000
--- a/resources/views/layout2/profilelayout.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-dark.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/cstms.css?v={{ filemtime("njum/css/cstms.css") }}">
-</head>
-<body>
-    @include('partials.handlebars')
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($user) && auth()->user()->can('edit_user'))
-        @include('partials.banmenu')
-    @endif
-@endif
-    <div data-simplebar class="container-fluid">
-        <div class="container">
-            @include('partials.navigation')
-            @include('partials.annouce')
-            @yield('novidcontent')
-        </div>
-    </div>
-</body>
-<script type="text/javascript" defer src="/njum/js/jquery.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/jquery.timeago.js"></script>
-<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/handlebars.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/newscript.js"></script>
-</html>
diff --git a/resources/views/layout2/register.blade.php b/resources/views/layout2/register.blade.php
deleted file mode 100644
index bef7af1..0000000
--- a/resources/views/layout2/register.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.flash')
-    <div class="page-header">
-	<h5>Register your w0bm.com Account</h5>
-<p style="color:red;">Note: We do not reset passwords, make sure to write down your password on paper, otherwise you need create a new account or start to circlejerk in the IRC!</p>
-    </div>
-    <div class="register">
-        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-            {!! csrf_field() !!}
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Recaptcha::render() !!}
-                </div>
-	    </div>
-	    <div class="form-group terms">
-		<div style="text-align: center;">
-		<p><input type="checkbox" name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-		</div>
-		<div class="">
-                    <button type="submit" class="btn btn-primary">Register</button>
-                </div>
-            </div>
-        </form>
-    </div>
-<!--    <div class="form-group" style="
-		text-align: center;
-		background: rgba(0, 0, 0, 0.75);
-		margin-left: 5px;
-                margin-right: 5px;
-    				  ">
-	<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
-	<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
-    </div>
--->    
-@endsection
-
diff --git a/resources/views/layout2/registerclosed.blade.php b/resources/views/layout2/registerclosed.blade.php
deleted file mode 100644
index f45f3d7..0000000
--- a/resources/views/layout2/registerclosed.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@extends('layout')
-@section('content')
-<style>
-html body {
-     animation: anfall 0.2s;
-     -webkit-animation: anfall 0.2s;
-     animation-iteration-count: infinite;
-     margin: 0;
-     padding: 0;
-     height: 100%;
-     overflow: hidden;
- }
-
-@keyframes anfall {
-    0%   {background: red;}
-    25%  {background: yellow;}
-    50%  {background: blue;}
-    75%  {background: pink;}
-    100% {background: red;}
-}
-
-@-webkit-keyframes anfall {
-    0%   {background: black;}
-    25%  {background: white;}
-    50%  {background: black;}
-    75%  {background: white;}
-    100% {background: black;}
-}
-
-div.a {
-width: 50px;
-height:50px;
-}
-@endsection
diff --git a/resources/views/layout2/rules.blade.php b/resources/views/layout2/rules.blade.php
deleted file mode 100644
index 30df1ef..0000000
--- a/resources/views/layout2/rules.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header">
-        <h4>Rules for w0bm.com</h4>
-</div>
-<p>These are more or less guidelines for a friendly and peaceful together, please don't try to abuse this or push it to the limits.</p>
-<div class="box">
-<h5>General</h5>
-<ol>
-	<li>Content on this website is intended for adults (18+), we can't check your age and don't want to, but keep this in mind, this is a website by adults for adults.</li>
-	<li>No Comment or Tag spamming</li>
-	<li>No Child porn and/or underage modeling videos/links to websites</li>
-	<li>No racism, I know this can be defined however someone wants, but deep inside most of us know when it's going into the racism direction and I don't want to see that here.</li>
-	<li>Be friendly to each other!</li>
-	<li>No Terrorist Propaganda and Content!</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Uploading</h5>
-<ol>
-	<li>The focus is on videos that are catchy and fun to watch, for example <a href="/index?q=loop">loops</a> this does not mean these are the only videos we welcome, it's just our main focus, we have plenty of videos that are completely unrelated to loops or catchy stuff and are still fitting, ask yourself "does my upload fit on w0bm.com?" and if yes, you're good to go!</li>
-	<li>The Artist and Songtitle field is only for the Artist and Song information respectively, anything else in there probably doesn't belong in there, use the Tags.</li>
-	<li>I reserve the right to remove uploads that I consider not worth being on w0bm.com without comment, discussions about deleted videos will be ignored and can lead in extreme cases to a ban.</li>
-	<li>No videos with watermarks like coub.com they will be removed regardless of quality, please take the time to either recreate or censor the watermark.</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Tagging</h5>
-<ol>
-	<li><b>You have to add at least 3 tags describing the video, not doing so can lead to a ban.</b></li>
-	<li>Tags should always describe what you see in the video and maybe some additional informations</li>
-	<li>No links in the Tags, use the comment section for that!</li>
-	<li>Always give your video a rating like "sfw" or "nsfw" so people can filter.</li>
-	<li>Comments are not welcome in the Tag section</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Commenting</h5>
-<ol>
-	<li>You don't have to be polite, but you also don't have to be an asshole.</li>
-	<li>NSFW images should only be posted on NSFW videos.</li>
-	<li>Live with different opinions, and deal with it.</li>
-	<li>No scam links or links to paywall sites, no unauthorized advertisment</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Reposts</h5>
-<ul style="text-align:left;">
-<li>Tag reposts with the tag: repost also link the original and the repost in the comments, maybe some admin or moderator is going to care about it and deletes the repost.</li>
-</ul>
-</div>
-<p>These rules can change at any time!</p>
-
-<?php
-$filename = '/home/sirx/web/w0bm.com/resources/views/rules.blade.php';
-if (file_exists($filename)) {
-    echo "Last modified: " . date ("F d Y H:i:s.", filemtime($filename));
-}
-?>
-
-@include('footer')
-@endsection
diff --git a/resources/views/layout2/rulez.blade.php b/resources/views/layout2/rulez.blade.php
deleted file mode 100644
index 0ef0fdc..0000000
--- a/resources/views/layout2/rulez.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-        <h3>Rulez</h3>
-    </div>
-    <div class="dark-bg">
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout2/settings.blade.php b/resources/views/layout2/settings.blade.php
deleted file mode 100644
index 058ca9a..0000000
--- a/resources/views/layout2/settings.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="box">
-    <ul class="list-group">
-        <li class="list-group-item"><a href="/api/user/layout?layout=1">w0bm.com</a> <span class="text-end">[The default Layout]</span></li>
-        <li class="list-group-item active"><a href="/api/user/layout?layout=2">Njum</a> <span class="text-end">[More focussed on the video, also 4:3]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=3">z0mb</a> <span class="text-end">[z0r.de Layout]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=4">nojs</a> <span class="text-end">[For the nojs neckbeards, lol]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=5">Mobile</a> <span class="text-end">[The default Layout optimized for mobile usage]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=6">Marderchen</a> <span class="text-end">[Marderlayout, older version of the default layout but without async JS]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=7">2017</a> <span class="text-end">[w0bm.com from ~2017]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=8">2015</a> <span class="text-end">[The OG w0bm.com Layout]</span></li>
-</ul>
-</div>
-  @endsection
\ No newline at end of file
diff --git a/resources/views/layout2/stats.blade.php b/resources/views/layout2/stats.blade.php
deleted file mode 100644
index 4ab2f2b..0000000
--- a/resources/views/layout2/stats.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header p-2">
-        <h3>Stats</h3>
-</div>
-<div class="dark-bg">
-<div class="box">
-	<p class="user_count">Total amount of registered users: <amount>{{$user_count}}</amount></p>
-	<p class="upload_count">Total amount of uploads: <amount>{{$upload_count}}</amount></p>
-	<p class="comment_count">Total amount of comments: <amount>{{$comment_count}}</amount></p>
-	<p class="latest-video">Latest video <a href="/{{$latest_video}}">/{{$latest_video}}</a></p>
-	<p class="newest_user">Newest user <a href="/user/{{$newest_user}}">/user/{{$newest_user}}</a></p>
-</div>
-</div>
-@endsection
diff --git a/resources/views/layout2/tos.blade.php b/resources/views/layout2/tos.blade.php
deleted file mode 100644
index 2a17267..0000000
--- a/resources/views/layout2/tos.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<h5>Terms of Service</h5>
-<p>Being a member of w0bm.com can be described best with the following quote: <blockquote>„It's a privilege, not a right“</blockquote></p>
-<p>w0bm.com is a voluntary project provided to you free of charge for the sole purpose of enjoyment and amusement for you the users.</p>
-<p>You (the users) agree to read and accept the rules and behave accordingly when on w0bm.com</p>
-<p>w0bm.com can terminate accounts, comments and/or uploads at any time without any reason</p>
-<p>Hotlinking our direct video urls is not welcome, since it puts the whole collection in danger of copyright reports. Please do not share any direct links in frequently visited forums! w0bm.com may need to block hotlinking and direct url access if problems will occur, which has negative side effects for nearly everyone using this site on a daily basis.</p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout2/transparency.blade.php b/resources/views/layout2/transparency.blade.php
deleted file mode 100644
index 2b4592f..0000000
--- a/resources/views/layout2/transparency.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-<h4>Transparency</h4>
-</div>
-
-<div class="box">
-<h5>Takedown notices and other shit</h5>
-<ul>
-	<li><a href="/07072016-FSM.txt">07.07.2016 FSM Takedown Notice</a></li>
-	<li><a href="/30012019-CTIRU.txt">30.01.2019 Metropolitan Police Service Terrorist Content Takedown Notice</a></li>
-</ul>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout2/upload.blade.php b/resources/views/layout2/upload.blade.php
deleted file mode 100644
index 2fb4153..0000000
--- a/resources/views/layout2/upload.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-
-<!-- later @include('partials.flash') -->
-
-<div class="page-header p-2">
-    <h3>Upload</h3>
-</div>
-
-<div class="container p-2 dark-bg">
-        <ul class="list-group">
-            <li class="list-group-item">
-                @include('partials.flash')
-                <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-                    <a id="dragndrop-link" href="#">
-                        <span style="display: table; width: 100%; height: 100%;">
-                            <span id="dragndrop-text">
-                                <i class="fa fa-cloud-upload"></i>
-                                    Drop or select WebM!
-                            </span>
-                        </span>
-                    </a>
-                </div>
-            </li>
-
-            <li class="list-group-item">{!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}</li>
-            <li class="list-group-item">{!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}</li>
-            <li class="list-group-item">{!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}</li>
-            <li class="list-group-item">{!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}</li>
-            <li class="list-group-item">
-                <?php 
-                    $categories = [];
-                    foreach(App\Models\Category::all() as $cat)
-                    $categories[$cat->id] = $cat->name;
-                ?>
-                {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-            </li>
-            <li class="list-group-item">
-                {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw" class="badge badge-danger">NSFW?</label>
-                {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'row', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}
-            </li>
-            <li class="list-group-item">
-                <div class="uploadButton">
-                    <button id="btn-upload" type="button" class="btn btn-dark btn-sm"><span class="laz0r">Fire the laz0r</span>
-                        <span class="" id="laz0r-fire"></span>
-                        <span class="hidden-xs" id="shoop-laz0r"></span>
-                    </button>
-                    <p>Before you fire the laz0r make sure you have read the <a href="/rules">Rules</a>! <br><i>With great power comes great responsibility</i></p>
-		            <p><b>10</b> uploads <b>every 12 hours.</b> – Maximum filesize: <b>40MB.</b> – Only <b>.webm (vp8/vp9) with sound</b> allowed. Need <a href="/webm">help?</a></p>
-                </div>
-            </li>
-        </ul>
-</div>
-
-        <input name="file" type="file" hidden accept=".webm"></input>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout2/vendor/.gitkeep b/resources/views/layout2/vendor/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout2/video-partials/disqus.blade.php b/resources/views/layout2/video-partials/disqus.blade.php
deleted file mode 100644
index 7cee7e9..0000000
--- a/resources/views/layout2/video-partials/disqus.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="disqus_thread"></div>
-<script>
-
-/**
-*  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-*  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
-/*
-var disqus_config = function () {
-this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
-};
-*/
-(function() { // DON'T EDIT BELOW THIS LINE
-var d = document, s = d.createElement('script');
-s.src = 'https://w0bm.disqus.com/embed.js';
-s.setAttribute('data-timestamp', +new Date());
-(d.head || d.body).appendChild(s);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-                            
\ No newline at end of file
diff --git a/resources/views/layout2/video-partials/legacy-metadata.blade.php b/resources/views/layout2/video-partials/legacy-metadata.blade.php
deleted file mode 100644
index 99739fc..0000000
--- a/resources/views/layout2/video-partials/legacy-metadata.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<ul class="nav justify-content-center">
-<div class="monchichi">
-<li class="safe-for-rating legacy-item">
-      <a class="badge video-id">{{$video->id}}</a>
-      <a class="badge video-rating {{$sfw ? 'sfw' : 'nsfw'}}">{{$sfw ? "sfw" : "nsfw"}}</a>
-</li>
-  <li class="legacy-item">
-   @if(auth()->check())
-@if(auth()->user()->hasFaved($video->id))
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark" fav-data="{{url($video->id . '/fav')}}"><i class="fa fa-heart fa-lg"></i></button>
-  </form>
-@else
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark bg-toggle"><i class="fa fa-heart-o fa-lg"></i></button>
-  </form>
-@endif
-@else
-@endif
-  </li>
-  <li class="legacy-item">
-    <button class="copylink" data-clipboard-text="{{url($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
-  </li>
-  <li class="legacy-item">
-        <button type="button" id="infobox" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
-      <i class="fa fa-lg fa-info-circle"></i>
-    </button> 
-  </li>
-  <li class="legacy-item">
-        <div id="popover-content" hidden>
-      @include('video-partials.popover-metadata')
-    </div>
-  </li>
-  <li class="legacy-item">
-    <button type="button" class="btn btn-dark" id="togglebg"><i class="fa fa-power-off fa-lg"></i></button>
-  </li>
-  <li class="legacy-item">
-
-<button id="webm_edit" class="btn btn-dark" data-toggle="modal" data-target="#webmeditmodal"><i class="fa fa-edit fa-lg"></i></button>
-
-	<li class="legacy-item">
-		<button id="webm_report" class="btn btn-dark" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-warning fa-md"></i></button>
-	</li>
-  </div>
-</ul>
\ No newline at end of file
diff --git a/resources/views/layout2/video-partials/legacy-videonav.blade.php b/resources/views/layout2/video-partials/legacy-videonav.blade.php
deleted file mode 100644
index 1c661b9..0000000
--- a/resources/views/layout2/video-partials/legacy-videonav.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="row videonavigation">
-@if($related)
-					@if(($prev = $video->getPrev($related, $isTag)) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), $video->getFirstId($related,$isTag))}}"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), [$prev->id])}}"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@endif
-					<a href="{{url($isTag ? '/t/' . $related : $related->baseurl())}}">{!!$isTag ? $related:$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related,$isTag)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last <i class="fa  fa-arrow-right"></i></a></div>
-					@else
-						| <a id="next" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), [$next->id])}}">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), $video->getLastId($related,$isTag))}}">last <i class="fa  fa-arrow-right"></i></a></div>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($video->getFirstId())}}"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($prev->id)}}"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last 🡆</a></div>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($video->getLastId())}}">last <i class="fa  fa-arrow-right"></i></a></div>
-					@endif
-				@endif
-</div>
\ No newline at end of file
diff --git a/resources/views/layout2/video-partials/popover-metadata.blade.php b/resources/views/layout2/video-partials/popover-metadata.blade.php
deleted file mode 100644
index a8dc152..0000000
--- a/resources/views/layout2/video-partials/popover-metadata.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="popover-metadata">
-              <div class="filesize">
-      <span class="dlwebm badge badge-secondary"><a class='file_size' href='{{ '/b/' . $video->file }}' download>{{ HumanReadable::bytesToHuman($video->filesize()) }}</a></span>
-    </div>
-	@if($video->videotitle) <div class="artist">
-      <strong>Videotitle:</strong> {{$video->videotitle}}
-    </div>@endif
-    @if($video->interpret) <div class="artist">
-      <strong>Artist:</strong> {{$video->interpret}}
-    </div>@endif
-    @if($video->songtitle) <div class="songtitle">
-      <strong>Songtitle:</strong> {{$video->songtitle}}
-    </div>@endif
-    @if($video->imgsource) <div class="source">
-      <strong>Video Source:</strong> @simplemd($video->imgsource)
-    </div>@endif
-    <div class="category">
-        <strong>Category:</strong> <a class="text-white" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-    </div>
-    <div class="uploader">
-      <strong>Uploader:</strong> <a class="text-white" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span></a>
-    </div>
-    <div class="added">
-    	<strong>Added:</strong> <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
-    </div>
-</div>
diff --git a/resources/views/layout2/video-partials/video-details.blade.php b/resources/views/layout2/video-partials/video-details.blade.php
deleted file mode 100644
index ea9ec27..0000000
--- a/resources/views/layout2/video-partials/video-details.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="details bg-dark sticky-top">
-    @if (!empty($__env->yieldContent('novidcontent')))
-    {{-- nix --}}
-    @else   
-    @endif
-    @if(Auth::check())
-    <div class="details_user">
-    @if(Auth::user()->messagesRecv()->unread()->count() < 1)
-        <span class="nomsg">|</span> <span><a href="{{url('messages')}}">[{{Auth::user()->messagesRecv()->unread()->count()}}]</a></span>@else
-        <span class="yesmg">|</span> <span><a href="{{url('messages')}}">[{{Auth::user()->messagesRecv()->unread()->count()}}]</a></span>@endif</span>
-        <a href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-        <a href="{{url('user', Auth::user()->username)}}/favs"><span class=""><i class="fa fa-heart"></i></span></a>
-        <a href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
-        <a href="{{url('upload')}}">Upload</a>
-        <a class="logout" href="{{url('logout')}}">Logout</a>
-    </div>
-    @else
-    {{-- nix --}}
-    @endif
-	
-    @if($video->videotitle)
-	<div class="videoTitle">
-		{{$video->videotitle}}
-	</div>
-	@endif
-</div>
\ No newline at end of file
diff --git a/resources/views/layout2/video-partials/video-fav.blade.php b/resources/views/layout2/video-partials/video-fav.blade.php
deleted file mode 100644
index 8488b1c..0000000
--- a/resources/views/layout2/video-partials/video-fav.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-	<button title="Toggle Background" class="hidden-xs bg-toggle power" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
\ No newline at end of file
diff --git a/resources/views/layout2/video-partials/video-matadata-overlay.blade.php b/resources/views/layout2/video-partials/video-matadata-overlay.blade.php
deleted file mode 100644
index ce6e361..0000000
--- a/resources/views/layout2/video-partials/video-matadata-overlay.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="video-metadata-overlay">
-		@if($video->interpret) <div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div>@endif
-		@if($video->songtitle) <div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div>@endif
-		@if($video->imgsource) <div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div>@endif
-		<div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div>
-		<div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div>
-</div>
diff --git a/resources/views/layout2/video-partials/video-metadata.blade.php b/resources/views/layout2/video-partials/video-metadata.blade.php
deleted file mode 100644
index a6f10b7..0000000
--- a/resources/views/layout2/video-partials/video-metadata.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="video-metadata">
-	<ul class="list-group list-group-horizontal indexedit">
-		@if($video->interpret) <li class="list-group-item"><div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div></li>@endif
-		@if($video->songtitle) <li class="list-group-item"><div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div></li>@endif
-		@if($video->imgsource) <li class="list-group-item"><div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div></li>@endif
-		<li class="list-group-item"><div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div></li>
-		<li class="list-group-item"><div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div></li>
-		</ul>
-		gfgf
-					 <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@if(auth()->check() && auth()->user()->can("delete_video"))<a class="delete_video" href="#">[del]</a>@endif 
-</div>
-
-      <div class="tags">
-    <div id="tag-display" class="tag-panel-body">
-        @if(count($video->tags))
-            @foreach($video->tags as $tag)
-                <span class="badge badge-dark"><a href="/index?q={{$tag->normalized}}" class="dark-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can("edit_video")) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
-            @endforeach
-        @else
-            No tags yet ...
-        @endif
-    </div>
-    
-</div>
diff --git a/resources/views/layout2/video-partials/videocontrols.blade.php b/resources/views/layout2/video-partials/videocontrols.blade.php
deleted file mode 100644
index 97f437a..0000000
--- a/resources/views/layout2/video-partials/videocontrols.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-		<div class="row videonavigation">
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col"><a class="first" href="#" style="visibility: hidden;">🡄 first</a></div>
-
-					@else
-						<div class="col"><a class="first" href="{{url($video->getFirstId())}}">🡄 first</a></div>
-						<div class="col"><a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a></div>
-						<div class="col"><a class="last" href="{{url($video->getLastId())}}">last 🡆</a></div>
-					@endif
-				
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout2/video.blade.php b/resources/views/layout2/video.blade.php
deleted file mode 100644
index 0e0c588..0000000
--- a/resources/views/layout2/video.blade.php
+++ /dev/null
@@ -1,49 +0,0 @@
-@extends('layout')
-@section('video')
-<?php $related = $related ?? null; ?>
-    <div class="video-content onLoad">
-    	<div class="video">
-    		<div class="embed-responsive embed-responsive-16by9">
-				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="/b{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('testvideo')
-<?php $related = $related ?? null; ?>
-    <div class="page">
-    	<div class="video-wrap embed-responsive embed-responsive-16by9">
-    		<div class="video">
-				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="/b{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('floatvid')
-		<div class="video-titlebar">
-		@if($video->videotitle)
-		<b>{{$video->videotitle}}</b>
-			@else <b><u>No Title</u></b>
-		@endif
-		uploaded by <small>{!! $video->user->displayName() !!}</small>
-		</div>
-        <div class="video-wrap embed-responsive embed-responsive-16by9" id="sticky-container">
-            @if($video->id == '27204')
-                <iframe style="height:100%!important; min-height: auto!important;" src="https://w0bm.com/loop/index.html"></iframe>
-            @else
-            <video class="video scrollable" loop id="video" controls>
-                <source src="/b{{ "/" . $video->file }}">
-            </video>
-            @endif
-        </div>
-        @include('video-partials.legacy-videonav')
-        @include('video-partials.legacy-metadata')
-@endsection
diff --git a/resources/views/layout2/webm.blade.php b/resources/views/layout2/webm.blade.php
deleted file mode 100644
index d21bac0..0000000
--- a/resources/views/layout2/webm.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header">
-        <h3>WebM Support</h3>
-        <p>How 2 make a webm</p>
-</div>
-<div class="box">
-<h4>Chad <small>(not afraid of using the command line)</small></h4>
-<img src="/images/gigachad.png" style="float:left;width:150px;" alt="gigachad">
-<pre><code>#The based white man way
-
-ffmpeg -i virgin.mp4 chad.webm #single file, very simple
-
-#You can add this to your .bashrc
-
-function mkwebmbatch() {
-        for i in *.$1;
-                do name=`basename "$i" .$1`
-                echo "$name"
-                ffmpeg -i "$i" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$PWD/${name}.webm"
-        done
-}
-
-function mkwebm() {
-	filename=$(basename -- "$1")
-	extension="${filename##*.}"
-	filename="${filename%.*}"
-	name=`basename "$filename" .$extension`
-	echo "$name"
-	ffmpeg -i "$1" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$HOME/Videos/converts/$name.webm"
-}
-
-function stillvid() {
-	#stillvid image.jpg music.mp3 $3.<webm>
-	ffmpeg -i "$1" -i "$2" -c:a libvorbis -auto-alt-ref 0 -c:v libvpx $3.webm 
-}
-
-#Notable mentions
-
-* https://github.com/ekisu/mpv-webm
-
-* https://github.com/Kagami/webm.py
-
-# If using webm.py a good line to get a high quality video would be
-
-# (assuming you have it in your path)
-webm -i virgin.mp4 -l 40 chad.webm #this will produce a vp9 webm with decent image quality
-</code></pre>
-</div>
-<h1 style="text-align:center;">VS</h1>
-<div class="box">
-<h4>Virgin</h4>
-<img src="/images/virgin.png" style="float:left;width:150px;" alt="gigachad">
-<ul>
-   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a></li>
-   <li><a href="https://gitgud.io/nixx/WebMConverter">WebMConverter by nixx!</a></li>
-</ul>
-</div>
-@endsection
diff --git a/resources/views/layout3/about.blade.php b/resources/views/layout3/about.blade.php
deleted file mode 100644
index 46ae990..0000000
--- a/resources/views/layout3/about.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-{!!$blah!!}
-@endsection
-
diff --git a/resources/views/layout3/categories.blade.php b/resources/views/layout3/categories.blade.php
deleted file mode 100644
index 892e2fd..0000000
--- a/resources/views/layout3/categories.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header">
-        <h3>Categories</h3>
-    </div>
-    <div class="" id="categories">
-        @foreach($categories as $category)
-            <div id="category_box_{{$category->shortname}}" class="col-sm-6 col-md-4 category">
-                <div class="thumbnail">
-                    <img src="{{ asset('/images/cat/' . $category->shortname . '.webp') }}" alt="{{$category->name}}">
-                    <div class="caption">
-                        <h3>{{$category->name}} <small>{{$category->videos()->count()}}</small></h3>
-                        <p>{{$category->description}}</p>
-                        <p><a href="{{$category->shortname}}" class="btn btn-primary" role="button">View</a></p>
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-@endsection
diff --git a/resources/views/layout3/closedreg.php b/resources/views/layout3/closedreg.php
deleted file mode 100644
index dcf75af..0000000
--- a/resources/views/layout3/closedreg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h1>Registration closed - check back later</h1>
-@endsection
diff --git a/resources/views/layout3/comments.blade.php b/resources/views/layout3/comments.blade.php
deleted file mode 100644
index a523214..0000000
--- a/resources/views/layout3/comments.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-@include('partials.comlist')
-<h3>Comments</h3>
-@if(Auth::check())
-
-<div class="row jkh">
-    <div class="col-md" id="list">
-        <div class="spinner">
-            <div class="cube1"></div>
-            <div class="cube2"></div>
-        </div>
-    </div>
-    <!--<div class="col-md-6" id="message"><h4>Select a comment to display content</h4></div>-->
-</div>
-
-@else
-<div class="row jkh">
-        <i>Not logged in. Please log in to view comments!</i>
-</div>
-@endif
-@endsection
-
diff --git a/resources/views/layout3/contact.blade.php b/resources/views/layout3/contact.blade.php
deleted file mode 100644
index 0f3706c..0000000
--- a/resources/views/layout3/contact.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Professional Support</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<h4>Contact</h4>
-<ul>
-<li>Contact via IRC: <a href="https://webirc.n0xy.net/?join=%23w0bm">#w0bm on n0xy.net</a></li>
-</ul>
-
-
-<div class="wrap-collabsible">
-  <input id="collapsible" class="toggle" type="checkbox">
-  <label for="collapsible" class="lbl-toggle">More Info & Email Contact</label>
-  <div class="collapsible-content">
-    <div class="content-inner">
-      <p>
-	<span>Need something? Let's talk then!</span>
-      </p>
-      <p>Email: <a href="mailto:admin@w0bm.com">admin [ät] w0bm [dotto] com</a>
-    </div>
-  </div>
-</div>
-
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout3/contact/create.blade.php b/resources/views/layout3/contact/create.blade.php
deleted file mode 100644
index ce73100..0000000
--- a/resources/views/layout3/contact/create.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@extends('layouts.app')
-
-@section('jumbotron')
-    <div class="jumbotron">
-        <div class="container">
-            <h1>Contact HackerPair</h1>
-            <h2>Your message will be delivered to our clandestine team</h2>
-        </div>
-    </div>
-@endsection
-
-@section('content')
-
-    <div class="row" style="margin-top: 25px;">
-
-        <div class="col-md-4 col-sm-12">
-
-            <div class="card">
-                <div class="card-body">
-                    <div class="card-title map">
-                        <gmap-map
-                                :center="{lat: 38.871026, lng: -77.055959}"
-                                :zoom="13"
-                                :options="{styles: mapStyles, streetViewControl: false, zoomControl: false, mapTypeControl: false}"
-                                map-type-id="roadmap"
-                                style="width: 100%; height: 300px;"
-                        >
-                        </gmap-map>
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-building" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Group 9
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map-signs" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-calendar" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                support@hackerpair.com
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <div class="col-md-8 col-sm-12">
-
-            <p>
-                Send us your questions, comments, and suggestions and someone will be in touch within
-                24 hours.
-            </p>
-
-            {!! Form::open(['route' => 'contact.store']) !!}
-
-            <div class="form-group">
-                {!! Form::label('name', 'Your Name') !!}
-                {!! Form::text('name', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('email', 'E-mail Address') !!}
-                {!! Form::text('email', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('msg', 'Message') !!}
-                {!! Form::textarea('msg', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-            </div>
-
-            {!! Form::submit('Submit', ['class' => 'btn btn-info']) !!}
-
-            {!! Form::close() !!}
-            <br />
-        </div>
-
-    </div>
-
-@endsection
diff --git a/resources/views/layout3/deleted.blade.php b/resources/views/layout3/deleted.blade.php
deleted file mode 100644
index 1c48390..0000000
--- a/resources/views/layout3/deleted.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<p>Video deleted by admin</p>
-<p>Given reason: </p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout3/emails/activation.blade.php b/resources/views/layout3/emails/activation.blade.php
deleted file mode 100644
index e66f02f..0000000
--- a/resources/views/layout3/emails/activation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Hello {{$username}}</h3>
-<p>Welcome to <a href="https://w0bm.com">w0bm.com</a>.</p>
-<p>To activate your account please click this <a href="https://w0bm.com/activate/{{$activation_token}}">link</a>.</p>
diff --git a/resources/views/layout3/emails/report.blade.php b/resources/views/layout3/emails/report.blade.php
deleted file mode 100644
index cceac1e..0000000
--- a/resources/views/layout3/emails/report.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-
-  <div style="width:100%;font-family:verdana;">
-
-    <h1>webm got reported!</h1>
-
-    <div>
-      <b>Link:</b>
-      <a href="{{$videoURL}}">{{$videoURL}}</a>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%;border:1px solid black;border-collapse:collapse;">
-        <thead>
-          <tr style="border:1px solid black; padding:5px;">
-            <th style="background-color:#bbbbbb;border-right:1px solid black;">Report Reasons</th>
-            <th style="background-color:#bbbbbb;">Report Text</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td style="padding:10px;border-right:1px solid #bbbbbb;">
-              <ul>
-                {!! $reportReasons !!}
-              </ul>
-            </td>
-            <td style="padding:10px;">
-              {{$reportText}}
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%; border-collapse:collapse;border:1px solid black;">
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;width:200px;">Username</th>
-          <td>{!! $username !!}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Time reported</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">IP:</th>
-          <td></td>
-        </tr>-->
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video ID</th>
-          <td>{{$videoID}}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Title</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Tags</th>
-          <td></td>
-        </tr>-->
-      </table>
-    </div>
-
-    <br>
-    <hr>
-
-    <!--
-    <div>
-      <h3>Debug Output:</h3>
-      <div style="color:green;font-family:consolas;background-color:black;">
-        <pre>
-          {{$debugOutput}}
-        </pre>
-      </div>
-    </div>
-    -->
-
-  </div>
-
-
-</html>
\ No newline at end of file
diff --git a/resources/views/layout3/errors/404.blade.php b/resources/views/layout3/errors/404.blade.php
deleted file mode 100644
index 3a97175..0000000
--- a/resources/views/layout3/errors/404.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="notfound">
-<h1>404 - NOT FOUND</h1>
-<img id="notfound-img" src="/404.gif">
-</div>
-@endsection
diff --git a/resources/views/layout3/errors/500.blade.php b/resources/views/layout3/errors/500.blade.php
deleted file mode 100644
index 7eee8e0..0000000
--- a/resources/views/layout3/errors/500.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<style>
-.sf-reset .block > pre {
-    background-color: #000000;
-    padding: 10px 28px;
-    margin-bottom: 20px;
-    -webkit-border-bottom-right-radius: 0;
-    -webkit-border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    border-bottom: 1px solid #1faeac;
-    border-right: 1px solid #1faeac;
-    border-left: 1px solid #1faeac;
-    border-top: 1px solid #1faeac;
-    word-wrap: break-word;
-    color: green;
-}
-</style>
-
-	<h5>Oh shit! Something went wrong!</h5>
-        <div id="sf-resetcontent" class="sf-reset box">
-		<h6>Please don't send this fucking text to an admin, we have other problems.</h6>
-            <?php
-                $iv = openssl_random_pseudo_bytes(16);
-            ?>
-            @if(!env('APP_DEBUG'))
-            <div class="block">
-                {{bin2hex($iv)}}<br>
-                {{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
-            </div>
-            @else
-            <div class="block">
-                <pre>{{$exception}}</pre>
-            </div>
-            @endif
-
-        </div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout3/errors/503.blade.php b/resources/views/layout3/errors/503.blade.php
deleted file mode 100644
index 4f63d68..0000000
--- a/resources/views/layout3/errors/503.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-	<title>Please Stand By we are just fucking this up</title>
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-		font-family: 'Lato';
-		background-color: #161618;
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Short maintenance, brb!</div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/layout3/footer.blade.php b/resources/views/layout3/footer.blade.php
deleted file mode 100644
index 954fee4..0000000
--- a/resources/views/layout3/footer.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<a href="/">click here to get redirected, you have been successfully logged in!</a>
-@endsection
diff --git a/resources/views/layout3/index.blade.php b/resources/views/layout3/index.blade.php
deleted file mode 100644
index bb48b43..0000000
--- a/resources/views/layout3/index.blade.php
+++ /dev/null
@@ -1,80 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header">
-    <h3 id="index">Index</h3>
-        
-        <form method="get" class="d-block d-sm-none">
-    <button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    <table class="table table-hover table-condensed">
-        <thead>
-        <tr>
-        <th>ID</th>
-        <th>Video Title</th>
-            <th>Artist</th>
-            <th>Songtitle</th>
-            <th class="hidden-xs">Video Source</th>
-            <th>Category</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <tr data-thumb="{{$thumb}}" class="indexedit" data-vid="{{$video->id}}">
-                <td>
-                    @if($edit = auth()->check() && auth()->user()->can('edit_video'))
-                        <form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
-                    @endif
-                    <span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
-                    @if($edit)
-                        <input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
-                    @endif
-        </td>
-                <td>
-                    <span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="videotitle" value="{{$video->videotitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vinterpret">{{$video->interpret or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="interpret" value="{{$video->interpret or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vsongtitle">{{$video->songtitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="songtitle" value="{{$video->songtitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td class="hidden-xs">
-                    <span class="vinfo vimgsource">{{$video->imgsource or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="imgsource" value="{{$video->imgsource or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vcategory"><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></span>
-                    @if($edit)
-                        <select class="form-control" name="category" form="edit_{{$video->id}}">
-                            @foreach($categories as $cat)
-                                <option value="{{$cat->id}}" @if($cat->shortname === $video->category->shortname) selected @endif>{{$cat->name}}</option>
-                            @endforeach
-                        </select>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-
-    <div class="">
-        {!! $videos->render() !!}
-    </div>
-
-@endsection
diff --git a/resources/views/layout3/layout.blade.php b/resources/views/layout3/layout.blade.php
deleted file mode 100644
index 1e57534..0000000
--- a/resources/views/layout3/layout.blade.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/bootstrap-dark.css?v={{ filemtime("z0mb/css/bootstrap-dark.css") }}">
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/cstms.css?v={{ filemtime("z0mb/css/cstms.css") }}">
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/z0mb.css?v={{ filemtime("z0mb/css/z0mb.css") }}">
-</head>
-<body>
-        @if(auth()->check())
-        @include('partials.report')
-        @include('partials.filterselect')
-    @endif
-
-    @if(auth()->check())
-        @if(auth()->user()->can('delete_video'))
-            @include('partials.frontendedit')
-        @endif
-    @endif
-
-<div class="container-fluid row p-0" id="wrapper">
-    <div class="col-sm p-0 linkeLeiste">
-        <div class="zeugs">
-            @if(auth()->check() && (auth()->user()->can("edit_video") || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can("delete_video"))<a class="delete_video" href="#">[del]</a>@endif
-        </div>
-                <div id="zomgmenu">
-                <a href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-                <a href="{{url('messages')}}" style="font-size: 10px;">[ {{Auth::user()->messagesRecv()->unread()->count()}} ]</a>
-                <a href="#" data-toggle="modal" style="font-size: 10px;" data-target="#filterselectmodal">[ filter ]</a>
-                <a style="font-size: 10px;" href="{{url('logout')}}">[ logout ]</a> |
-                <a href="{{url('upload')}}">[ upload ]</a> |
-                               @if(auth()->check())
-@if(auth()->user()->hasFaved($video->id))
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <a href="{{url($video->id . '/fav')}}">❤️ [ faved ]</a>
-@else
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <a href="{{url($video->id . '/fav')}}">🖤 [ fav ]</a>
-@endif
-@else
-@endif
-<br>
-                <a href="/">Random</a> |
-                <a href="/main">index</a> |
-                <a href="/categories">categories</a> |
-                <a href="irc://irc.n0xy.net/w0bm">IRC</a> |
-                <a href="/about">About</a> |
-                <div class="layoutkek">
-                <li role="presentation" class="layoutChanger" id="layoutSwitcher">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Layout
-    </a>
-<ul class="dropdown-menu">
-    <div class="layoutblah">
-        <button id="layout1">w0bm.com</button>
-        <br>
-        <button id="layout2">Njum</button>
-    </div>
-</ul>
-</li>
-</div>
-</div>
-</div>
-        <div class="container p-0">
-                <div class="col-md p-0">
-                    @yield('floatvid')
-                    @include('partials.flash')
-                    @include('partials.comments')
-                </div>
-            <div class="col-sm p-0"></div>
-        </div>
-        <wip>
-        </wip>
-    <div class="col-sm scrollable hidden-xs p-0"></div>
-</div>
-</body>
-<script type="text/javascript" defer src="/z0mb/js/jquery.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/jquery.timeago.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/popper.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/bootstrap.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/blahscript.js?v={{ filemtime("z0mb/js/newscript.js") }}"></script>
-</html>
diff --git a/resources/views/layout3/main.blade.php b/resources/views/layout3/main.blade.php
deleted file mode 100644
index c96cf84..0000000
--- a/resources/views/layout3/main.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="items">
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <div class="main-item">
-            <a href="/{{$video->id}}">
-@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
-    <img src="/thumbs/beta/{{$thumb}}.png">
-@else
-    <img src="/small_404.gif" class="nothumb" />
-@endif
-</a>
-</div>
-        @endforeach
-    </div>
-
-    <div class="page">
-        {!! $videos->render() !!}
-    </div>
-@endsection
diff --git a/resources/views/layout3/marder.blade.php b/resources/views/layout3/marder.blade.php
deleted file mode 100644
index 7d53282..0000000
--- a/resources/views/layout3/marder.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<h3>Hello everyone!</h3>
-
-<div class="box">
-<img src="https://marderchen.totally.rip/marderchen.lima-city.de/marderchen.gif" style="float: right;" alt="">
-  <p>Today we have sad news, a beloved friend of us and one of our most unique members died.</p>
-  <p>Some of you may remember his unique and interesting and somewhat chaotic but cool videos.</p>
-  <p>Today we mourn the loss of our friend marderchen.</p>
-  <p>We sincerely hope you are at a better place now.</p>
-  <p>We thank you for the great time we had with you, you inspired many of us and brought joy to the IRC and to the website, you will be missed old friend.</p>
-
-  <p>To say it in your words: =^_^= MEOW</p>
-
-  <p>We have archived his long gone website, make sure to check it out! It is absolutely wild (only available in German)</p>
-
-  <p><a href="https://marderchen.totally.rip/marderchen.lima-city.de/index.html">https://marderchen.totally.rip/marderchen.lima-city.de/index.html</a></p>
-
-  <p>Also make sure to check out his uploads <a href="https://w0bm.com/main?q=marderchen">https://w0bm.com/main?q=marderchen</a> and enjoy it.</p>
-
-  <p><i>- w0bm staff</i></p>
-</div>
-@endsection
-
diff --git a/resources/views/layout3/matrix.blade.php b/resources/views/layout3/matrix.blade.php
deleted file mode 100644
index f38731d..0000000
--- a/resources/views/layout3/matrix.blade.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<style type="text/css">
-    * {margin: 0; padding: 0}
-body {background: #000;overflow:hidden;}
-canvas {display: block;}
-.matrix {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    font-family: monospace;
-}
-.matrix > .inner {
-    position: absolute;
-    color: white;
-    top: 40%;
-}
-.inner {
-    background: #000000b5;
-    padding: 5px;
-}
-
-#bluepill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: blue;
-    background: blue;
-    border-radius: 5px;
-}
-
-#redpill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: red;
-    background: red;
-    border-radius: 5px;
-}
-</style>
-<div class="matrix">
-    <div class="inner">
-    <h3><p><b><i>You are a slave {{Auth::user()->username}}</i></b></p></h3>
-    <br>
-    <p>Take control over your chats, leave Discord for good!</p>
-    <p>Join [matrix] today!</p>
-    <p>Why should you consider either running a [matrix] synapse yourself or start using someone elses:</p>
-    <p>Discord is evil, it took away the freedom you and I deserve, it makes you a slave to their services,<br> makes you obey their rules, includes you in a unwanted botnet where you have no freedom at all!</p>
-    <p>It's time to break free {{Auth::user()->username}}</p>
-    <p>Choose your fate</p>
-    <span id="bluepill"><a href="https://discordapp.com/app"></a></span> <span id="redpill"><a href="https://github.com/matrix-org/synapse" target="_blank"></a></span>
-    <p><code>#!w0bm:f0ck.it</code></p>
-    <br>
-    <p><small>We are happy to help if you have any trouble setting up your synapse</small></p>
-</div>
-</div>
-<canvas></canvas>
-<audio src="/clubbed.mp3" autoplay loop></audio>
-<script type="text/javascript">
-    // Initialising the canvas
-var canvas = document.querySelector('canvas'),
-    ctx = canvas.getContext('2d');
-
-// Setting the width and height of the canvas
-canvas.width = window.innerWidth;
-canvas.height = window.innerHeight;
-
-// Setting up the letters
-var letters = 'ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ';
-letters = letters.split('');
-
-// Setting up the columns
-var fontSize = 10,
-    columns = canvas.width / fontSize;
-
-// Setting up the drops
-var drops = [];
-for (var i = 0; i < columns; i++) {
-  drops[i] = 1;
-}
-
-// Setting up the draw function
-function draw() {
-  ctx.fillStyle = 'rgba(0, 0, 0, .1)';
-  ctx.fillRect(0, 0, canvas.width, canvas.height);
-  for (var i = 0; i < drops.length; i++) {
-    var text = letters[Math.floor(Math.random() * letters.length)];
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(text, i * fontSize, drops[i] * fontSize);
-    drops[i]++;
-    if (drops[i] * fontSize > canvas.height && Math.random() > .95) {
-      drops[i] = 0;
-    }
-  }
-}
-
-// Loop the animation
-setInterval(draw, 33);
-</script>
\ No newline at end of file
diff --git a/resources/views/layout3/messages.blade.php b/resources/views/layout3/messages.blade.php
deleted file mode 100644
index 06bc591..0000000
--- a/resources/views/layout3/messages.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.msglist')
-    <div class="row">
-        <div class="col-md-6" id="list">
-            <div class="spinner">
-                <div class="cube1"></div>
-                <div class="cube2"></div>
-            </div>
-        </div>
-        <div class="col-md-6" id="message"><h4>Select a message to display content</h4></div>
-    </div>
-@endsection
diff --git a/resources/views/layout3/messages/commentanswer.blade.php b/resources/views/layout3/messages/commentanswer.blade.php
deleted file mode 100644
index 5fa7616..0000000
--- a/resources/views/layout3/messages/commentanswer.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout3/messages/commentmention.blade.php b/resources/views/layout3/messages/commentmention.blade.php
deleted file mode 100644
index ea15625..0000000
--- a/resources/views/layout3/messages/commentmention.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout3/messages/commentpreview.blade.php b/resources/views/layout3/messages/commentpreview.blade.php
deleted file mode 100644
index 46f257e..0000000
--- a/resources/views/layout3/messages/commentpreview.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-body">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="right" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small></div>
-</div>
diff --git a/resources/views/layout3/messages/moderation/commentdelete.blade.php b/resources/views/layout3/messages/moderation/commentdelete.blade.php
deleted file mode 100644
index 734b4b6..0000000
--- a/resources/views/layout3/messages/moderation/commentdelete.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator deleted your comment.</h3>
-<p>A moderator deleted your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout3/messages/moderation/commentrestore.blade.php b/resources/views/layout3/messages/moderation/commentrestore.blade.php
deleted file mode 100644
index a8cf012..0000000
--- a/resources/views/layout3/messages/moderation/commentrestore.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator restored your comment.</h3>
-<p>A moderator restored your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout3/messages/moderation/videodelete.blade.php b/resources/views/layout3/messages/moderation/videodelete.blade.php
deleted file mode 100644
index 6a6568b..0000000
--- a/resources/views/layout3/messages/moderation/videodelete.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<h3>A moderator deleted your video.</h3>
-<p>A moderator deleted your video with the ID {{$video->id}}</p>
-<span style="font-weight:bold;">Video Info:</span>
-<ul>
-    @if(isset($videoinfo['artist'])) <li><span style="font-weight:bold;">Artist:</span> {{ $videoinfo['artist'] }}</li> @endif
-    @if(isset($videoinfo['songtitle'])) <li><span style="font-weight:bold;">Songtitle:</span> {{ $videoinfo['songtitle'] }}</li> @endif
-    @if(isset($videoinfo['video_source'])) <li><span style="font-weight:bold;">Video Source:</span> {{ $videoinfo['video_source'] }}</li> @endif
-    <li><span style="font-weight:bold;">Category:</span> {{ $videoinfo['category'] }}</li>
-</ul>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
\ No newline at end of file
diff --git a/resources/views/layout3/messages/videocomment.blade.php b/resources/views/layout3/messages/videocomment.blade.php
deleted file mode 100644
index 48e43c4..0000000
--- a/resources/views/layout3/messages/videocomment.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>New comment on your video <a href="{{url($video->id)}}">/{{$video->id}}</a></h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> made a comment on your video.</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout3/partials/banmenu.blade.php b/resources/views/layout3/partials/banmenu.blade.php
deleted file mode 100644
index a1607d0..0000000
--- a/resources/views/layout3/partials/banmenu.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<form id="banmenu" method="POST" action="/api/user/{{$user->username}}/ban">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="banmenumodal" tabindex="-1" role="dialog" aria-labelledby="Ban user">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="filterModalTitle">Ban user</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="reason">Reason</label>
-                        <input class="form-control" type="text" name="reason" id="reason" placeholder="Reason">
-                    </div>
-                    <div class="form-group">
-                        <label for="duration">Duration</label>
-                        <input class="form-control" type="text" name="duration" id="duration" placeholder="Duration (-1 = permanent)">
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                    <input type="submit" class="btn btn-danger" value="BAN!">
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/resources/views/layout3/partials/comlist.php b/resources/views/layout3/partials/comlist.php
deleted file mode 100644
index 8c0f191..0000000
--- a/resources/views/layout3/partials/comlist.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<script id="comlist" type="text/x-handlebars-template">
-            {{#each data as |value key|}}
-            <div class="panel panel-default">
-                <div class="panel-body" style="word-wrap: break-word;" data-index="{{key}}" data-id="{{id}}">{{{rendered_view}}}</div>
-                <div class="panel-footer">Video: <a href="/{{video_id}}">/{{video_id}}</a> | <time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-            </div>
-            {{else}}
-            <div class="list-group-item">No comments</div>
-            {{/each}}
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-</script>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/comment.blade.php b/resources/views/layout3/partials/comment.blade.php
deleted file mode 100644
index 6547f98..0000000
--- a/resources/views/layout3/partials/comment.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="card @if($del = !is_null($comment->deleted_at)) panel-danger @else panel-default @endif" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
-    <div class="comment panel-body" author="{{$comment->user->username}}">
-        <div class="Avatar">
-            <span class="avatarBox"><img src="/images/z0mbotter.png"></span>
-        </div>
-        <a class="{{$comment->user->username}} user_name" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a>
-        <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a>
-                @if($mod)
-            @if($del)
-                <a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
-            @else
-                <a class="delete_comment" href="#" onclick="deleteComment($(this))">[D]</a>
-                {{-- <a class="edit_comment" href="#" onclick="editComment($(this))">[E]</a> --}}
-            @endif
-        @endif
-        <div class="commentContent">
-                    @simplemd($comment->content)
-        </div>
-    </div>
-    <div class="panel-footer">
-    </div>
-</div>
diff --git a/resources/views/layout3/partials/commentform.blade.php b/resources/views/layout3/partials/commentform.blade.php
deleted file mode 100644
index 0fe27ef..0000000
--- a/resources/views/layout3/partials/commentform.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="sticky">
-    <div id="commentForm">
-        <form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-            {!! csrf_field() !!}
-                <div class="comment-panel panel-default">
-                    <div class="comment-panel panel-body">
-                        {!! Form::textarea('comment', null, ['placeholder' => 'Write something...', 'id' => 'cinput', 'class' => 'form-control text-light comment-entry-textarea', 'required' => 'required']) !!}
-                    </div>
-                    
-                    <div class="commentButton">
-                        <div id="comment_tools" class="commentform-panel-footer">
-                            <div class="commentToolsWrapper">
-                                <button type="submit" class="btn btn-dark btn-sm" onclick="commentBotScroll()">Post</button>
-                                <span class="emojiCollapser btn btn-dark btn-sm" data-toggle="collapse" href="#collapseEmojis" role="button" aria-expanded="false" aria-controls="collapseEmojis">🦦 Emoji Picker</span>
-                                <div class="textModifiers btn btn-dark btn-sm">
-                                    <a  class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-                                    <a  class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-                                    <a  class="krebs" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-                                    <a  class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
-                                </div>
-                                <span onclick="bottomArrow()" class="btn btn-dark btn-sm" style="cursor: pointer;"><i class="fa fa-arrow-down" aria-hidden="true"></i></span> 
-                                <a href="#" class="scrollToTop btn btn-dark btn-sm" style=""><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                            </div>
-                            <div class="collapse" id="collapseEmojis">
-                                <div class="emojiWrapper emojis">
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/comments.blade.php b/resources/views/layout3/partials/comments.blade.php
deleted file mode 100644
index 3293a56..0000000
--- a/resources/views/layout3/partials/comments.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@if(Auth::check())
-<div class="commentOpener">
-    <a class="commentOpenButton" data-toggle="collapse" href="#collapseComments" role="button" aria-expanded="false" aria-controls="collapseComments">
-    {{ $video->comments()->count() }} comments
-  </a>
-</div>
-<div class="collapse" id="collapseComments">
-  @if($video->id == '30186')
-  @include('partials.thread_closed')
-  @else
-    @include('partials.commentform')
-    @endif
-  <div class=" commentwrapper comments">
-          <?php
-            if($mod = (Auth::check() && Auth::user()->can('delete_comment'))) $comments = $video->comments()->withTrashed()->get();
-            else $comments = $video->comments;
-        ?>
-        @if(count($comments) > 0)
-            @foreach($comments as $comment)
-                @include('partials.comment', ['comment' => $comment, 'mod' => $mod])
-            @endforeach
-        @else
-        <div class="card">
-                <div class="">
-                    No comments yet! Be the first one to comment!<br />
-                </div>
-            </div>
-        @endif
-  </div>
-</div>
-@endif
diff --git a/resources/views/layout3/partials/disqusw0bm.blade.php b/resources/views/layout3/partials/disqusw0bm.blade.php
deleted file mode 100644
index 331aa7c..0000000
--- a/resources/views/layout3/partials/disqusw0bm.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="disqus_thread"></div>
-<script>
-
-/**
-*  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-*  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
-/*
-var disqus_config = function () {
-this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
-};
-*/
-(function() { // DON'T EDIT BELOW THIS LINE
-var d = document, s = d.createElement('script');
-s.src = 'https://EXAMPLE.disqus.com/embed.js';
-s.setAttribute('data-timestamp', +new Date());
-(d.head || d.body).appendChild(s);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/filterselect.blade.php b/resources/views/layout3/partials/filterselect.blade.php
deleted file mode 100644
index 3d2925f..0000000
--- a/resources/views/layout3/partials/filterselect.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="topper">
-            		<h4 class="modal-title" id="filterModalTitle">Add Tags to filter out</h4>
-		<p>When entering a tag you will no longer see videos with that tag.</p>
-            </div>
-            <div class="modal-body">
-                <input id="filter" type="text" class="form-control" placeholder="Input tags…" name="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">
-                {{--<input class="form-control" type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-                <button href="/filter" type="submit" id="submitfilter" class="btn btn-dark" value="Save">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout3/partials/filtersettings.blade.php b/resources/views/layout3/partials/filtersettings.blade.php
deleted file mode 100644
index 74eb84f..0000000
--- a/resources/views/layout3/partials/filtersettings.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($video) && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id))
-        @include('partials.frontendedit')
-	@endif
-@endif
diff --git a/resources/views/layout3/partials/flash.blade.php b/resources/views/layout3/partials/flash.blade.php
deleted file mode 100644
index 73335c1..0000000
--- a/resources/views/layout3/partials/flash.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="flashcontainer">
-    <div class="flash-inner">
-        @if($errors->count() > 0)
-            @foreach($errors->all() as $error)
-                <div class="alert alert-danger alert-dismissable" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    {{ $error }}
-                </div>
-            @endforeach
-        @endif
-        @if(Session::has('error'))
-            <div class="alert alert-danger alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('error') }}
-            </div>
-        @endif
-        @if(Session::has('success'))
-            <div class="alert alert-success alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('success') }}
-            </div>
-        @endif
-        @if(Session::has('info'))
-            <div class="alert alert-info alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('info') }}
-            </div>
-        @endif
-        @if(Session::has('warning'))
-            <div class="alert alert-warning alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('warning') }}
-            </div>
-        @endif
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/footer-navigation.blade.php b/resources/views/layout3/partials/footer-navigation.blade.php
deleted file mode 100644
index c9bfa74..0000000
--- a/resources/views/layout3/partials/footer-navigation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<nav class="navbar navbar-dark bg-dark">
-	<h5>LOL</h5>
-</nav>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/frontendedit.blade.php b/resources/views/layout3/partials/frontendedit.blade.php
deleted file mode 100644
index 7b9e42a..0000000
--- a/resources/views/layout3/partials/frontendedit.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-@if(isset($video))
-    <form id="webmedit" method="POST" action="/index/{{$video->id}}">
-        {!! csrf_field() !!}
-        <div class="modal fade" id="webmeditmodal" tabindex="-1" role="dialog" aria-labelledby="Edit webm">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title" id="filterModalTitle">Edit webm</h4>
-                    </div>
-                    <div class="modal-body frontendeditmodal">
-                        <div class="form-group">
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Title</label>
-                            <input class="form-control" type="text" name="videotitle" id="videotitleedit" value="{{ $video->videotitle or ''}}" placeholder="Video Title">
-                        </div>
-                            <label for="interpretedit">Artist</label>
-                            <input class="form-control" type="text" name="interpret" id="interpretedit" value="{{ $video->interpret or ''}}" placeholder="Artist">
-                        </div>
-                        <div class="form-group">
-                            <label for="songtitleedit">Songtitle</label>
-                            <input class="form-control" type="text" name="songtitle" id="songtitleedit" value="{{ $video->songtitle or ''}}" placeholder="Songtitle">
-                        </div>
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Source</label>
-                            <input class="form-control" type="text" name="imgsource" id="imgsourceedit" value="{{ $video->imgsource or ''}}" placeholder="Video Source">
-
-                        </div>
-                        <div class="form-group">
-                            <label for="categoryselect">Category</label>
-                            <select class="form-control" name="category" id="categoryselect">
-                                @foreach(\App\Models\Category::all() as $category)
-                                <option value="{{$category->id}}" @if($video->category->id == $category->id) selected @endif>{{$category->name}}</option>
-                                @endforeach
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="tageditor">Add Tags</label>
-                                @include('partials.tags')
-                        </div>
-                        <div class="deleteit">
-                            @endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#"><i class="fa fa-trash fa-lg"></i> Remove upload</a>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-@endif
diff --git a/resources/views/layout3/partials/handlebars.php b/resources/views/layout3/partials/handlebars.php
deleted file mode 100644
index 3a70c75..0000000
--- a/resources/views/layout3/partials/handlebars.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="paginationtmpl" type="text/x-handlebars-template">
-    <nav class="mitte">
-        <ul class="pagination">
-            {{#paginate pagination type="first"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">First</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="previous"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&laquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="middle" limit="7"}}
-            <li {{#if active}}class="active"{{/if}}><a href="#" data-page="{{n}}">{{n}}</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="next"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&raquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="last"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">Last</a></li>
-            {{/paginate}}
-        </ul>
-    </nav>
-    <div class="clearfix"></div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/header.blade.php b/resources/views/layout3/partials/header.blade.php
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout3/partials/loginmodal.blade.php b/resources/views/layout3/partials/loginmodal.blade.php
deleted file mode 100644
index 91551b0..0000000
--- a/resources/views/layout3/partials/loginmodal.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="modal fade" id="loginmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            
-            <div class="login_wrapper">
-            	<div class="col-md-9">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-
-		<div class="modal-footer">
-			<p>Registration has been disabled due to multiple spammers, if you want an account, please apply for it in the <a href="/irc">IRC</a>, thanks!</p>
-        	</div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout3/partials/msglist.php b/resources/views/layout3/partials/msglist.php
deleted file mode 100644
index 703afee..0000000
--- a/resources/views/layout3/partials/msglist.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<script id="msglist" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading-messages">
-            <h3 class="panel-title">Messages</h3> <button class="btn btn-dark readall" onclick="readAll()">Read all</button>
-        </div>
-
-        <div class="list-group" id="listitems">
-            {{#each data as |value key|}}
-            <a href="#" data-index="{{key}}" data-id="{{id}}" class="list-group-item {{#unless read}}list-group-item-info{{/unless}}">{{subject}}</a>
-            {{else}}
-            <div class="list-group-item">No messages</div>
-            {{/each}}
-        </div>
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-    </div>
-</script>
-
-<script id="msgtmpl" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{{subject}}</h3>
-        </div>
-        <div class="panel-body">
-            {{{content}}}
-        </div>
-        <div class="panel-footer"><time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout3/partials/navigation.blade.php b/resources/views/layout3/partials/navigation.blade.php
deleted file mode 100644
index e4f9067..0000000
--- a/resources/views/layout3/partials/navigation.blade.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark rounded-bottom sticky-top">
-    <div class="w0bm-logo">
-        <a class="navbar-brand" href="/">
-            <img  data-toggle="popover" data-trigger="hover" data-placement="left" data-content="0tter 5h1t" id="logo" src="https://w0bm.com/w0bm_mosh_banner_by_marderchen.gif" class="d-inline-block align-top" alt="w0bm.com">
-        </a>
-    </div>
-  	<ul class="navbar-nav mr-auto">
-      @if (!empty($__env->yieldContent('novidcontent')))
-      @else
-      
-        @endif
-        @if(Auth::check())
-        <li class="nav-link dropdown">
-        <button id="nav-user" class="btn btn-dark nav-link bg-toggle dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span><i class="fa fa-user fa-lg"></i> {{Auth::user()->username}}</span>
-        </button>
-          <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-  <div class="">
-    <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-      <a class="dropdown-item" href="{{url('messages')}}"><span class=""><i class="fa fa-envelope-square"></i> {{Auth::user()->messagesRecv()->unread()->count()}}</span></a>
-      <a class="dropdown-item" href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
-      <a class="dropdown-item" href="{{url('upload')}}">Upload</a>
-  </div>
-            <a class="dropdown-item" href="{{url('logout')}}">Logout</a>
-          </div>
-        @else
-   
-        @endif
-      </li>
-      @if(Auth::check())
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Links
-        </a>
-        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" href="/index">Index</a>
-          <a class="dropdown-item" href="/about">About</a>
-          <a class="dropdown-item" href="/stats">Stats</a>
-        </div>
-      </li>
-<li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Layout
-        </a>
-        <div id="layoutSwitcher" class="dropdown-menu" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" id="layout1" href="#">w0bm.com</a>
-          <a class="dropdown-item" id="layout2" href="#">Njum</a>
-          <a class="dropdown-item" id="layout4" href="#">nojsz0mbie</a>
-          <a class="dropdown-item" id="layout5" href="#">m0bile</a>
-        </div>
-      </li>
-
-  </ul>
-    @else
-@endif
-
-      <div class="search-index hidden-xs d-none d-md-block">
-        <form method="get" action="/index" class="form-inline my-2 my-lg-0">
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control mr-sm-2 search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
-            <button class="btn btn-dark" type="submit">Search</button>
-        </form>
-    </div>
-
-</nav>
diff --git a/resources/views/layout3/partials/profileheader.blade.php b/resources/views/layout3/partials/profileheader.blade.php
deleted file mode 100644
index e1524c5..0000000
--- a/resources/views/layout3/partials/profileheader.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h3 class="{{ $user->username }}">{!! rtrim(e($user->username) . ' ' . $user->activeIcon()) !!} @if($user->disabled && isset($user->banend) && (Carbon\Carbon::now() <= $user->banend || 1 >= $user->banend->timestamp))<span style="color: grey; font-size: 15px;">(@if(Carbon\Carbon::now() <= $user->banend)Ban expires in <time class="timeago" data-toggle="tooltip" title="{{ $user->banend }}+0000" datetime="{{ $user->banend }}+0000"></time>@else permanently banned @endif)</span>@endif</h3>
-<div class="admin-settings">
-@if(auth()->check() && auth()->user()->can('edit_user'))<span id="pannade"><a href="#" data-toggle="modal" data-target="#banmenumodal"><i style="color:red;" class=""></i>[ban user]</a></span>
-@endif
-</div>
-    <span id="jointime">Joined: <time class="timeago" datetime="{{ $user->created_at }}+0000" title="{{ $user->created_at }}+0000" data-toggle="tooltip"></time></span>
-<div class="profile-info">
-    <span id="count-upload"> <a href="/user/{{$user->username}}"> <i class="fa fa-cloud-upload"></i> {{ $user->uploads()->countScoped()->count() }} Uploads</a></span>
-
-    <span id="comments-user"> <a href="/user/{{$user->username}}/comments"><i class="fa fa-commenting"></i> {{ $user->comments()->count() }} Comments</a></span>
-
-    <span id="favs-user"><a href="/user/{{$user->username}}/favs/index"><i class="fa fa-heart"></i> {{ $user->favs()->countScoped()->count() }} Favorites</a></span>
-</div>
-</div>
diff --git a/resources/views/layout3/partials/registermodal.blade.php b/resources/views/layout3/partials/registermodal.blade.php
deleted file mode 100644
index d56589a..0000000
--- a/resources/views/layout3/partials/registermodal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="modal fade" id="registermodal" tabindex="-1" role="dialog" aria-labelledby="Register">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Register</h4>
-            </div>
-            
-            <div class="advantages">
-              <p>Registering on w0bm has some advantages...</p>
-              <p>With a account you can comment on WebMs, favor WebMs, upload WebMs, tag videos, filter out unwanted tags and watch NSFW WebMs!</p>
-            </div>
-
-            <div class="reg_wrapper">
-	   		        <div class="register">
-                  <div class="col-md-10">
-                    <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-                      {!! csrf_field() !!}
-                        <div class="form-group">
-                          <div class="reg_username">
-                            {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                          </div>
-                        </div>
-                
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                          </div>
-                        </div>
-              
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                          </div>
-                        </div>
-            
-                        <div class="form-group">
-                          <div class="recaptcha">
-                            {!! Recaptcha::render() !!}
-                          </div>
-                        </div>
-                      
-                        <div class="form-group terms">
-                          <div class="verify_rules">
-                            <p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-                          </div>
-                        
-                          <div class="submit_registration">
-                            <button type="submit" class="btn btn-primary">Register</button>
-                          </div>
-                        </div>
-                    </form>
-                  </div>
-                </div>
-            </div>
-
-            <div class="modal-footer">
-              <p>Back to <a href="#" data-toggle="modal" data-target="#loginmodal" data-dismiss="modal">Login?</a></p>
-            </div>
-    </div>
-</div>
-</div>
diff --git a/resources/views/layout3/partials/report.blade.php b/resources/views/layout3/partials/report.blade.php
deleted file mode 100644
index 172ff4e..0000000
--- a/resources/views/layout3/partials/report.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- created by klee -->
-@if(isset($video))
-  <form id="webmreport" method="POST" action="/report/{{$video->id}}">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="webmreportmodal" tabindex="-1" role="dialog" aria-labelledby="Report webm">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title" id="filterModalTitle">Report WebM</h4>
-          </div>
-          <div class="modal-body webmreportmodal">
-            So you want to report this webm? Tell us why:<br>
-            <br>
-            <div class="form-group">
-              <label for="reportReasons">
-                Reason(s)<br>
-                <em>(hold ctrl to select multiple)</em>
-              </label>
-              <select multiple class="form-control" id="reportReasons" name="reportReasons[]">
-                <option>Wrong rating (sfw/nsfw)</option>
-                <option>Shitpost</option>
-                <option>Low quality/effort video</option>
-                <option>Breaks a rule</option>
-                <option>Other</option>
-                <!-- breaks a rule, Wrong safe for rating -->
-              </select>
-            </div>
-            <label for="reportReasonText">Please explain a bit more detailed why you want to report this webm</label>
-            <textarea class="form-control" id="reportText" name="reportText" rows="3" required></textarea>
-            <p>Abuse of this form will be awarded with a permanent ban!</p>
-          </div>            
-          <div class="modal-footer">
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-primary">Send Report</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </form>
-@endif
\ No newline at end of file
diff --git a/resources/views/layout3/partials/tags-light.blade.php b/resources/views/layout3/partials/tags-light.blade.php
deleted file mode 100644
index 07b3a6c..0000000
--- a/resources/views/layout3/partials/tags-light.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="tags">
-      @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                @if($tag == 'sfw')
-                <span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="badge badge-success">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-success" href="#"><i class="fa fa-times"></i></a></span>@endif
-                @elseif($tag == 'nsfw')
-                <span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="badge badge-danger">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-danger" href="#"><i class="fa fa-times"></i></a></span>@endif
-                @else
-                    <span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge badge-secondary">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-secondary" href="#"><i class="fa fa-times"></i></a></span>@endif
-                    @endif
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-</div>
diff --git a/resources/views/layout3/partials/tags.blade.php b/resources/views/layout3/partials/tags.blade.php
deleted file mode 100644
index ea14f49..0000000
--- a/resources/views/layout3/partials/tags.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="tags">
-    <div class="tagtest">
-    @if(Auth::check())
-    <div id="tag-add">
-        <div class="row">
-            <div class="col tag-col">
-                <div class="input-group">
-                    {{--<select multiple name="tags[]" data-role="tagsinput" class="form-control"></select>--}}
-                    <input id="tags" type="text" class="form-control" placeholder="Input tags…" name="tags" data-role="tagsinput">
-                    <span class="input-group-btn"></span>
-                </div>
-            </div>
-        </div>
-    <div class="sendtags">
-        <button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-primary">Submit</button>
-    </div>          
-    </div>
-    @else
-        @endif
-    </div>
-    <label for="manage-tags">Manage Tags</label>
-    <div class="toggo tag-panel-body">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                @if($tag == 'sfw')
-                <span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="badge badge-success">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-success" href="#"><i class="fa fa-times"></i></a></span>@endif
-                @elseif($tag == 'nsfw')
-                <span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="badge badge-danger">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-danger" href="#"><i class="fa fa-times"></i></a></span>@endif
-                @else
-                    <span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge badge-secondary">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-secondary" href="#"><i class="fa fa-times"></i></a></span>@endif
-                    @endif
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout3/partials/themechanger.blade.php b/resources/views/layout3/partials/themechanger.blade.php
deleted file mode 100644
index 2efed41..0000000
--- a/resources/views/layout3/partials/themechanger.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<li role="presentation" class="">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Theme
-    </a>
-<ul class="dropdown-menu">
-    <div id="switcher">
-        <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
-        <br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
-    <button class="glitch-css" onclick="setActiveStyleSheet('Glitch'); return false;">Glitch</button>
-    <br>    
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout3/partials/thread_closed.php b/resources/views/layout3/partials/thread_closed.php
deleted file mode 100644
index 03d2e52..0000000
--- a/resources/views/layout3/partials/thread_closed.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thread_closed">
-  <span>Thread closed! ;__;</span>
-</div>
diff --git a/resources/views/layout3/partials/uploadinfo.blade.php b/resources/views/layout3/partials/uploadinfo.blade.php
deleted file mode 100644
index 0653081..0000000
--- a/resources/views/layout3/partials/uploadinfo.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="vidinfo">
-						<button title="Toggle Background" class="hidden-xs bg-toggle" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
-							<div style='word-break: break-word;'>@if($video->interpret) <strong>Artist:</strong> {{$video->interpret}}<br>@endif
-											@if($video->songtitle) <strong>Songtitle:</strong> {{$video->songtitle}}<br>@endif
-											@if($video->imgsource) <strong>Video Source:</strong> {{$video->imgsource}} <br>
-											@endif
-											<strong>Category:</strong> {{$video->category->name}}</div>
-						<span id="uploader">uploaded by <a style="color: white" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>@if(auth()->check() && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#">[del]</a>@endif 
-	</div>
diff --git a/resources/views/layout3/partials/videoinfo.blade.php b/resources/views/layout3/partials/videoinfo.blade.php
deleted file mode 100644
index aba4c4b..0000000
--- a/resources/views/layout3/partials/videoinfo.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-			<div class="text-center">
-				@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}">🡄 first</a>
-						<a id="prev" href="{{url($related->baseurl(), [$prev->id])}}">🡄 prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next 🡆</a>
-						<a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last 🡆</a>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($video->getFirstId())}}">🡄 first</a>
-						<a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a>
-						<a class="last" href="{{url($video->getLastId())}}">last 🡆</a>
-					@endif
-				@endif
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout3/profile.blade.php b/resources/views/layout3/profile.blade.php
deleted file mode 100644
index cf02c5b..0000000
--- a/resources/views/layout3/profile.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-	<div class="profilheader">
-	    <a href="/{{$user->baseurl()}}/">View {{ $title }}</a>
-	</div>
-            <table class="table table-hover table-condensed">
-                <thead>
-                <tr>
-		    <th>ID</th>
-		    <th>Video Title</th>
-                    <th>Artist</th>
-                    <th>Songtitle</th>
-                    <th class="hidden-xs">Video Source</th>
-                    <th>Category</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($videos as $video)
-                    <?php
-                        $thumb = str_replace(".webm","",$video->file);
-                    ?>
-                    <tr data-thumb="{{$thumb}}">
-			<td><a href="/{{$user->baseurl()}}/{{$video->id}}">{{$video->id}}</a></td>
-			<td>{{$video->videotitle or ''}}</td>
-                        <td>{{$video->interpret or ''}}</td>
-                        <td>{{$video->songtitle or ''}}</td>
-                        <td class="hidden-xs">{{$video->imgsource or ''}}</td>
-                        <td><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            {!! $videos->render() !!}
-@endsection
diff --git a/resources/views/layout3/profilelayout.blade.php b/resources/views/layout3/profilelayout.blade.php
deleted file mode 100644
index 8671ebe..0000000
--- a/resources/views/layout3/profilelayout.blade.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/bootstrap-dark.css?v={{ filemtime("z0mb/css/bootstrap-dark.css") }}">
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/cstms.css?v={{ filemtime("z0mb/css/cstms.css") }}">
-    <link rel="stylesheet" type="text/css" href="/z0mb/css/z0mb.css?v={{ filemtime("z0mb/css/z0mb.css") }}">
-</head>
-<body>
-    @include('partials.handlebars')
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($user) && auth()->user()->can('edit_user'))
-        @include('partials.banmenu')
-    @endif
-@endif
-    <div data-simplebar class="container-fluid">
-                                   <div id="zomgmenu">
-                <a href="/">Random</a> |
-                <a href="/index">index</a> |
-                <a href="/categories">categories</a> |
-                <a href="irc://irc.n0xy.net/w0bm">IRC</a> |
-                <a href="/about">About</a> |
-                <div class="layoutkek">
-                <li role="presentation" class="layoutChanger" id="layoutSwitcher">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Layout
-    </a>
-<ul class="dropdown-menu">
-    <div class="layoutblah">
-        <button id="layout1">w0bm.com</button>
-        <br>
-        <button id="layout2">Njum</button>
-    </div>
-</ul>
-</li>
-</div>
-
-                <br>
-                <a href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-                <a href="{{url('messages')}}" style="font-size: 10px;">[ {{Auth::user()->messagesRecv()->unread()->count()}} ]</a> 
-                <a href="#" data-toggle="modal" style="font-size: 10px;" data-target="#filterselectmodal">[ filter ]</a>
-                <a style="font-size: 10px;" href="{{url('logout')}}">[ logout ]</a> |
-                <a href="{{url('upload')}}">[ upload ]</a>
-</div>
-        <div class="container">
-            @yield('novidcontent')
-        </div>
-    </div>
-</body>
-<script type="text/javascript" defer src="/z0mb/js/jquery.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/jquery.timeago.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/popper.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/bootstrap.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/handlebars.min.js"></script>
-<script type="text/javascript" defer src="/z0mb/js/newscript.js?v={{ filemtime("z0mb/js/newscript.js") }}"></script>
-</html>
\ No newline at end of file
diff --git a/resources/views/layout3/rulez.blade.php b/resources/views/layout3/rulez.blade.php
deleted file mode 100644
index 0f293b0..0000000
--- a/resources/views/layout3/rulez.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header">
-        <h3>Rulez</h3>
-    </div>
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout3/settings.blade.php b/resources/views/layout3/settings.blade.php
deleted file mode 100644
index 13fbab4..0000000
--- a/resources/views/layout3/settings.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
- @extends('profilelayout')
-@section('content')
-<h4>Layouts</h4>
-<div class="box">
-    <h5>Change how you experience w0bm.com</h5>
-  <ul class="layout-ul">
-    <li><a class="nav-link layout1" style="font-size: 10px;" href="/api/user/layout?layout=1">w0bm</a>The default look</li>
-    <li><a class="nav-link layout2" style="font-size: 10px;" href="/api/user/layout?layout=2">Njum</a>Alternative approach</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=3">z0mb</a>z0r.de layout + theme</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=4">nojs</a>The nojs layout (broken)</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=5">Mobile</a>The mobile optimized default layout</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=6">Marderchen</a>This is marders Layout, it has no async js</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=7">2017</a>The layout from 2017</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=8">2015</a>The OG w0bm</li>
-  </ul>
-</div>
-  @endsection
\ No newline at end of file
diff --git a/resources/views/layout3/stats.blade.php b/resources/views/layout3/stats.blade.php
deleted file mode 100644
index d705daf..0000000
--- a/resources/views/layout3/stats.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header">
-        <h3>Stats</h3>
-</div>
-<div class="box">
-	<p class="user_count">Total amount of registered users: <amount>{{$user_count}}</amount></p>
-	<p class="upload_count">Total amount of uploads: <amount>{{$upload_count}}</amount></p>
-	<p class="comment_count">Total amount of comments: <amount>{{$comment_count}}</amount></p>
-	<p class="latest-video">Latest video <a href="/{{$latest_video}}">/{{$latest_video}}</a></p>
-	<p class="newest_user">Newest user <a href="/user/{{$newest_user}}">/user/{{$newest_user}}</a></p>
-	<p class="dirsize">Total size of w0bm: <amount>{{$dirsize}}</amount></p>
-</div>
-@endsection
diff --git a/resources/views/layout3/upload.blade.php b/resources/views/layout3/upload.blade.php
deleted file mode 100644
index 3f8052c..0000000
--- a/resources/views/layout3/upload.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="container">
- <ul class="list-group">
-        <div class="uploadheader">
-        <h3 id="upheader">Upload</h3>
-    </div>
-        <li class="list-group-item">
-            @include('partials.flash')
-                                        <button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
-            <span class="" id="laz0r-fire"></span>
-            <span class="hidden-xs" id="shoop-laz0r"></span>
-            </button>
-        <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-            <a id="dragndrop-link" href="#">
-                <span style="display: table; width: 100%; height: 100%;">
-                    <span id="dragndrop-text">
-                        <i class="fa fa-cloud-upload"></i>
-                        Drop or select WebM!
-                    </span>
-                </span>
-            </a>
-        </div>
-    </li>
-    <li class="list-group-item">{!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}</li>
-    <li class="list-group-item">{!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}</li>
-    <li class="list-group-item">{!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}</li>
-    <li class="list-group-item">{!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}</li>
-    <li class="list-group-item">
-        <?php 
-            $categories = [];
-            foreach(App\Models\Category::all() as $cat)
-            $categories[$cat->id] = $cat->name;
-        ?>
-        {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-    </li>
-    <li class="list-group-item">
-            {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw" class="badge badge-danger">NSFW?</label>
-        {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'row', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}</li>
-    <li class="list-group-item">
-    </li>
-  </ul>
-</div>
-
-        <input name="file" type="file" hidden accept=".webm"></input>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout3/vendor/.gitkeep b/resources/views/layout3/vendor/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout3/video-partials/disqus.blade.php b/resources/views/layout3/video-partials/disqus.blade.php
deleted file mode 100644
index 7cee7e9..0000000
--- a/resources/views/layout3/video-partials/disqus.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="disqus_thread"></div>
-<script>
-
-/**
-*  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-*  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
-/*
-var disqus_config = function () {
-this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
-};
-*/
-(function() { // DON'T EDIT BELOW THIS LINE
-var d = document, s = d.createElement('script');
-s.src = 'https://w0bm.disqus.com/embed.js';
-s.setAttribute('data-timestamp', +new Date());
-(d.head || d.body).appendChild(s);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-                            
\ No newline at end of file
diff --git a/resources/views/layout3/video-partials/legacy-metadata.blade.php b/resources/views/layout3/video-partials/legacy-metadata.blade.php
deleted file mode 100644
index 03cff33..0000000
--- a/resources/views/layout3/video-partials/legacy-metadata.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<ul class="nav justify-content-center">
-<li class="safe-for-rating">
-      <a class="badge badge-sexy">{{$video->id}}</a>
-      @if(count($video->tags))
-        @foreach($video->tags as $tag)
-          @if($tag == 'sfw')
-            <a class="badge badge-success isSfw">SFW</a>
-            @elseif($tag == 'nsfw')
-            <a class="badge badge-danger isNsfw">NSFW</a>
-          @endif
-        @endforeach
-      @endif
-</li>
-  <li class="legacy-item">
-   @if(auth()->check())
-@if(auth()->user()->hasFaved($video->id))
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark" fav-data="{{url($video->id . '/fav')}}"><i class="fa fa-heart fa-lg"></i></button>
-  </form>
-@else
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark bg-toggle"><i class="fa fa-heart-o fa-lg"></i></button>
-  </form>
-@endif
-@else
-@endif
-  </li>
-  <li class="legacy-item">
-        <button type="button" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
-      <i class="fa fa-lg fa-info-circle"></i>
-    </button> 
-  </li>
-  <li class="legacy-item">
-        <div id="popover-content" hidden>
-      @include('video-partials.popover-metadata')
-    </div>
-  </li>
-  <li class="legacy-item">
-    <button type="button" class="btn btn-dark" id="togglebg"><i class="fa fa-power-off fa-lg"></i></button>
-  </li>
-  <li class="legacy-item">
-    @if(auth()->check())
-@if(auth()->user()->can('delete_video'))
-<button id="webm_edit" class="btn btn-dark" data-toggle="modal" data-target="#webmeditmodal"><i class="fa fa-edit fa-lg"></i></button>
-@endif
-@endif
-	<li class="legacy-item">
-		<button id="webm_report" class="btn btn-dark" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-bug fa-md"></i></button>
-	</li>
-</ul>
diff --git a/resources/views/layout3/video-partials/legacy-videonav.blade.php b/resources/views/layout3/video-partials/legacy-videonav.blade.php
deleted file mode 100644
index d465a85..0000000
--- a/resources/views/layout3/video-partials/legacy-videonav.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="row">
-@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"> « first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"> «  prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}"> «  first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($related->baseurl(), [$prev->id])}}"> «  prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next  » </a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last  » </a></div>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next  » </a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last  » </a></div>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"> «  first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"> «  prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($video->getFirstId())}}"> «  first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($prev->id)}}"> «  prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next  » </a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last 🡆</a></div>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next  » </a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($video->getLastId())}}">last  » </a></div>
-					@endif
-				@endif
-</div>
\ No newline at end of file
diff --git a/resources/views/layout3/video-partials/popover-metadata.blade.php b/resources/views/layout3/video-partials/popover-metadata.blade.php
deleted file mode 100644
index a837915..0000000
--- a/resources/views/layout3/video-partials/popover-metadata.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="popover-metadata">
-	@if($video->videotitle) <div class="artist">
-      <strong>Videotitle:</strong> {{$video->videotitle}}
-    </div>@endif
-    @if($video->interpret) <div class="artist">
-      <strong>Artist:</strong> {{$video->interpret}}
-    </div>@endif
-    @if($video->songtitle) <div class="songtitle">
-      <strong>Songtitle:</strong> {{$video->songtitle}}
-    </div>@endif
-    @if($video->imgsource) <div class="source">
-      <strong>Video Source:</strong> {{$video->imgsource}}
-    </div>@endif
-    <div class="category">
-        <strong>Category:</strong> <a class="text-white" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-    </div>
-    <div class="uploader">
-      <strong>Uploader:</strong> <a class="text-white" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span></a>
-    </div>
-    <div class="added">
-    	<strong>Added:</strong> <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
-    </div>
-          {{-- <div class="filesize">
-      <span class="badge badge-secondary">{{ HumanReadable::bytesToHuman($video->filesize()) }}</span>
-    </div> --}}
-    <hr>
-        <div class="toggo tag-panel-body">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                @if($tag == 'sfw')
-                <span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
-                @elseif($tag == 'nsfw')
-                <span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
-                @else
-                    <span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
-                    @endif
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout3/video-partials/video-fav.blade.php b/resources/views/layout3/video-partials/video-fav.blade.php
deleted file mode 100644
index 8488b1c..0000000
--- a/resources/views/layout3/video-partials/video-fav.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-	<button title="Toggle Background" class="hidden-xs bg-toggle power" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
\ No newline at end of file
diff --git a/resources/views/layout3/video-partials/video-matadata-overlay.blade.php b/resources/views/layout3/video-partials/video-matadata-overlay.blade.php
deleted file mode 100644
index ce6e361..0000000
--- a/resources/views/layout3/video-partials/video-matadata-overlay.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="video-metadata-overlay">
-		@if($video->interpret) <div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div>@endif
-		@if($video->songtitle) <div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div>@endif
-		@if($video->imgsource) <div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div>@endif
-		<div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div>
-		<div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div>
-</div>
diff --git a/resources/views/layout3/video-partials/video-metadata.blade.php b/resources/views/layout3/video-partials/video-metadata.blade.php
deleted file mode 100644
index c21d20d..0000000
--- a/resources/views/layout3/video-partials/video-metadata.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="video-metadata">
-	<ul class="list-group list-group-horizontal indexedit">
-		@if($video->interpret) <li class="list-group-item"><div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div></li>@endif
-		@if($video->songtitle) <li class="list-group-item"><div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div></li>@endif
-		@if($video->imgsource) <li class="list-group-item"><div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div></li>@endif
-		<li class="list-group-item"><div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div></li>
-		<li class="list-group-item"><div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div></li>
-		</ul>
-					 @if(auth()->check() && (auth()->user()->can("edit_video") || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can("delete_video"))<a class="delete_video" href="#">[del]</a>@endif 
-</div>
-
-      <div class="tags">
-    <div id="tag-display" class="tag-panel-body">
-        @if(count($video->tags))
-            @foreach($video->tags as $tag)
-                <span class="badge badge-dark"><a href="/index?q={{$tag->normalized}}" class="dark-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can("edit_video")) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
-            @endforeach
-        @else
-            No tags yet ...
-        @endif
-    </div>
-    
-</div>
diff --git a/resources/views/layout3/video-partials/videocontrols.blade.php b/resources/views/layout3/video-partials/videocontrols.blade.php
deleted file mode 100644
index 97f437a..0000000
--- a/resources/views/layout3/video-partials/videocontrols.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-		<div class="row videonavigation">
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col"><a class="first" href="#" style="visibility: hidden;">🡄 first</a></div>
-
-					@else
-						<div class="col"><a class="first" href="{{url($video->getFirstId())}}">🡄 first</a></div>
-						<div class="col"><a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a></div>
-						<div class="col"><a class="last" href="{{url($video->getLastId())}}">last 🡆</a></div>
-					@endif
-				
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout3/video.blade.php b/resources/views/layout3/video.blade.php
deleted file mode 100644
index ddf014d..0000000
--- a/resources/views/layout3/video.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-@extends('layout')
-@section('video')
-<?php $related = $related ?? null; ?>
-    <div class="video-content">
-    	<div class="video">
-    		<div class="embed-responsive embed-responsive-16by9">
-				<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="@if(env('APP_DEBUG')){{"/b"}}@else{{"//" . (substr($_SERVER["HTTP_HOST"], 0, 3) === "v4." ? "v4." : "") . "w0bm.com"}}@endif{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('testvideo')
-<?php $related = $related ?? null; ?>
-    <div class="page">
-    	<div class="video-wrap embed-responsive embed-responsive-16by9">
-    		<div class="video">
-				<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="//b.w0bm.com/b{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('floatvid')
-        <div class="video-wrap embed-responsive embed-responsive-16by9 rounded" id="sticky-container">
-            <video class="video scrollable" controls autoplay loop id="video">
-                <source src="/b{{ "/" . $video->file }}">
-            </video>
-        </div>
-        @include('video-partials.legacy-videonav')      
-@endsection
diff --git a/resources/views/layout5/about.blade.php b/resources/views/layout5/about.blade.php
deleted file mode 100644
index 621289c..0000000
--- a/resources/views/layout5/about.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-@extends('profilelayout')
-@section('content')
-{!!$blah!!}
-@include('footer')
-@endsection
-
diff --git a/resources/views/layout5/advertise.blade.php b/resources/views/layout5/advertise.blade.php
deleted file mode 100644
index 88f86c9..0000000
--- a/resources/views/layout5/advertise.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-        <h4>Advertise anything!</h4>
-</div>
-<h5>How to advertise?</h5>
-<h6>Deutsch</h6>
-<ul>
-<li>Wenn du bei uns werben möchtest musst du lediglich einen Werbebanner per Mail einsenden, Beispiele unten auf der Seite. Bitte beachte, dass wir kommerzielle Werbung nur gegen Geld akzeptieren! Mail: admin@w0bm.com</li>
-<li>Wenn du etwas bewerben möchtest, solltest du darauf achten, dass dein beworbener Inhalt mit unserer Zielgruppe die aus deutsch und englischsprachigen Leuten besteht übereinstimmt, andere Sprachen werden für die Werberotation nicht akzeptiert.</li>
-<li>Des weiteren ist das werben auf w0bm.com erst einmal kostenlos, dies gilt jedoch nur für Non Profit orientierte Werbung und im allgemeinen für ehrliche Werbung, bei Werbung die Gewinn für den werbenden verspricht nehmen wir 15€ für 3 Wochen Werberotation.</li>
-<li>Der Inhalt der Werbung ist erst einmal egal solange es nichts illegales ist.</li>
-<li>Ja, wir akzeptieren Porno Werbung!</li>
-</ul>
-<h6>English</h6>
-<ul>
-<li>If you want to advertise with us you only have to send in a banner via mail, examples are at the bottom of this site. Please note that we only accept commercial ads in exchange for money! Mail: admin@w0bm.com</li>
-<li>If you want to advertise something, please note that your content needs to match with our target group (germand and english people). Any other language related ads will not be accepted for the banner rotation!</li>
-<li>Furthermore is the advertising on w0bm.com free as in gratis if your ad is non profit and honorable, for ads with commercial profits in mind we take 15€ for 3 Weeks in our rotation.</li>
-<li>The content of you ad is unimportant as long as it is nothing illegal.</li>
-<li>Yes, we accept porn advertising!</li>
-</ul>
-
-<h6>Example:</h6>
-<p>Exact banner size is: 342x50</p>
-<img src="https://files.nogf.club/images/bannerexample.png">
-<img src="https://files.nogf.club/images/9gagarmy.png">
-
-@include('footer')
-@endsection
diff --git a/resources/views/layout5/banned.blade.php b/resources/views/layout5/banned.blade.php
deleted file mode 100644
index d626301..0000000
--- a/resources/views/layout5/banned.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">YOU ARE BANNED!</h3>
-  </div>
-
-  <div class="panel-body">
-    <div style="border:0;" class="panel panel-default">
-      <div class="panel-body">
-        @if($perm)
-        <p>Your ban is permanent fool and will <b>NOT</b> expire!</p>
-        <video class="banwidth" autoplay loop src="https://b.w0bm.com/1515965864.webm">You are banned</video>
-        @else
-        <p class="banned">Reason: {{ $user->banreason }}</p>
-        <p class="banned">Your ban will expire in {{ $user->banend->diffForHumans(null, true) }}</p>
-        <img class="banwidth" src="otter-ban.png">
-        @endif
-      </div>
-    </div>
-    <p>If you think you were banned by accident or dindu nuffin to deserve the ban contact an administrator in the <a href="/irc">IRC</a></p>
-  </div>
-</div>
-@endsection
diff --git a/resources/views/layout5/categories.blade.php b/resources/views/layout5/categories.blade.php
deleted file mode 100644
index 63e7232..0000000
--- a/resources/views/layout5/categories.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h3>Categories</h3>
-    </div>
-    <div class="" id="categories">
-        @foreach($categories as $category)
-            <div class="col-sm-6 col-md-4 category">
-                <div class="thumbnail">
-                    <img src="{{ asset('/images/cat/' . $category->shortname . '.webp') }}" alt="{{$category->name}}">
-                    <div class="caption">
-                        <h3>{{$category->name}} <small>{{$category->videos()->count()}}</small></h3>
-                        <p>{{$category->description}}</p>
-                        <p><a href="{{$category->shortname}}" class="btn btn-primary" role="button">View</a></p>
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-@endsection
diff --git a/resources/views/layout5/clippy.blade.php b/resources/views/layout5/clippy.blade.php
deleted file mode 100644
index a2d3cd2..0000000
--- a/resources/views/layout5/clippy.blade.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<script src="/js/jquery-1.7.js"></script>
-<script src="/js/clippy.js"></script>
diff --git a/resources/views/layout5/close.sh b/resources/views/layout5/close.sh
deleted file mode 100644
index def7523..0000000
--- a/resources/views/layout5/close.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /srv/m.w0bm.com/resources/views/
-ln -sf registerclosed.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout5/closedreg.php b/resources/views/layout5/closedreg.php
deleted file mode 100644
index dcf75af..0000000
--- a/resources/views/layout5/closedreg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h1>Registration closed - check back later</h1>
-@endsection
diff --git a/resources/views/layout5/comments.blade.php b/resources/views/layout5/comments.blade.php
deleted file mode 100644
index bc805b2..0000000
--- a/resources/views/layout5/comments.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.profileheader')
-@include('partials.comlist')
-<h3>Comments</h3>
-@if(Auth::check())
-<div class="row jkh">
-    <div class="col-md" id="list">
-        <div class="spinner">
-            <div class="cube1"></div>
-            <div class="cube2"></div>
-        </div>
-    </div>
-    <!--<div class="col-md-6" id="message"><h4>Select a comment to display content</h4></div>-->
-</div>
-
-@else
-<div class="row jkh">
-	<i>Not logged in. Please log in to view comments!</i>
-</div>
-@endif
-@endsection
diff --git a/resources/views/layout5/community.blade.php b/resources/views/layout5/community.blade.php
deleted file mode 100644
index 79e60e2..0000000
--- a/resources/views/layout5/community.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>w0bm.com Community</h3>
- </div>
-
-<div class="box">
-<img src="/irccat.gif" alt="irc cat" style="float: right; width: 25%; height: 25%;">
-<h5>IRC</h5>
-<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
-<p>Don't have a desktop  client? Why not join our Network via webirc? <a href="https://webirc.n0xy.net/?join=%23w0bm" target="about_blank">>>webirc.n0xy.net</a></p>
-<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
-
-<div style="font-size: 9px;">
-<h6>Discord</h6>
-<p>It's dead lol <a href="https://discord.gg/SuF66vb">https://discord.gg/SuF66vb</a></p>
-</div>
-</div>
-@include('footer')
-@endsection
-
diff --git a/resources/views/layout5/contact.blade.php b/resources/views/layout5/contact.blade.php
deleted file mode 100644
index 4a3347d..0000000
--- a/resources/views/layout5/contact.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Professional Support</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<h4>Contact</h4>
-<ul>
-<li>Contact via IRC: <a href="https://webirc.n0xy.net/?join=%23w0bm">#w0bm on n0xy.net</a></li>
-</ul>
-
-
-<div class="wrap-collabsible">
-  <input id="collapsible" class="toggle" type="checkbox">
-  <label for="collapsible" class="lbl-toggle">More Info & Email Contact</label>
-  <div class="collapsible-content">
-    <div class="content-inner">
-      <p>
-        <span>Need something? Let's talk then!</span>
-      </p>
-      <p>Email: <a href="mailto:admin@w0bm.com">admin [ät] w0bm [dotto] com</a>
-    </div> 
- </div>
-</div>
-
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout5/emails/activation.blade.php b/resources/views/layout5/emails/activation.blade.php
deleted file mode 100644
index e66f02f..0000000
--- a/resources/views/layout5/emails/activation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Hello {{$username}}</h3>
-<p>Welcome to <a href="https://w0bm.com">w0bm.com</a>.</p>
-<p>To activate your account please click this <a href="https://w0bm.com/activate/{{$activation_token}}">link</a>.</p>
diff --git a/resources/views/layout5/errors/404.blade.php b/resources/views/layout5/errors/404.blade.php
deleted file mode 100644
index 28fd198..0000000
--- a/resources/views/layout5/errors/404.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="notfound">
-<h1>404 - NOT FOUND</h1>
-<img id="notfound-img" src="/404.gif">
-</div>
-@endsection
diff --git a/resources/views/layout5/errors/500.blade.php b/resources/views/layout5/errors/500.blade.php
deleted file mode 100644
index 241188c..0000000
--- a/resources/views/layout5/errors/500.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@extends('profilelayout')
-@section('content')
-	<h5>Oh shit! Something went wrong!</h5>
-        <div id="sf-resetcontent" class="sf-reset box">ihfit
-		<h6>Please don't send this fucking text to an admin, we have other problems.f fdfd</h6>
-            <?php
-                $iv = openssl_random_pseudo_bytes(16);
-            ?>
-            @if(!env('APP_DEBUG'))
-            <div class="block">
-                {{bin2hex($iv)}}<br>
-                {{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
-            </div>
-            @else
-            <div class="block">
-                <pre>{{$exception}}</pre>
-            </div>
-            @endif
-
-        </div>
-@endsection
diff --git a/resources/views/layout5/errors/503.blade.php b/resources/views/layout5/errors/503.blade.php
deleted file mode 100644
index 835d8c3..0000000
--- a/resources/views/layout5/errors/503.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-	<title>Please Stand By we are just fucking this up</title>
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-		font-family: 'Lato';
-		background-color: #161618;
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Don't worry, we will be right back!</div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/layout5/footer.blade.php b/resources/views/layout5/footer.blade.php
deleted file mode 100644
index 9af9287..0000000
--- a/resources/views/layout5/footer.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<nav class="navbar-fixed-bottom">
-  <div class="container futter">
-    <a href="/about">About</a> | <a href="/rules">Rules</a> | <a href="/contact">Contact</a> | <a href="/privacy">Privacy</a> | <a href="/stats">Stats</a>
-    <p>Inspired by <a href="http://z0r.de">z0r.de</a> | © 2015 – {{ date('Y') }} w0bm.com</p>
-  </div>
-</nav>
diff --git a/resources/views/layout5/help.blade.php b/resources/views/layout5/help.blade.php
deleted file mode 100644
index 6ec5ce1..0000000
--- a/resources/views/layout5/help.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="page-header">
-        <h2></h2>
-</div>
-@endsection
-
diff --git a/resources/views/layout5/index.blade.php b/resources/views/layout5/index.blade.php
deleted file mode 100644
index e3b5142..0000000
--- a/resources/views/layout5/index.blade.php
+++ /dev/null
@@ -1,77 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="page-header">
-	<h3 id="index">Index <small>{{ $number_of_results }} results</small></h3>
-        <form method="get">
-	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    <div class="">
-        {!! $videos->render() !!}
-    </div>
-    <table class="table table-hover table-condensed">
-        <thead>
-        <tr>
-	    <th>ID</th>
-	    <th>Video Title</th>
-            <th>Artist</th>
-            <th>Songtitle</th>
-            <th class="hidden-xs">Video Source</th>
-            <th>Category</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <tr data-thumb="{{$thumb}}" class="indexedit" data-vid="{{$video->id}}">
-                <td>
-                    @if($edit = auth()->check() && auth()->user()->can('edit_video'))
-                        <form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
-                    @endif
-                    <span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
-                    @if($edit)
-                        <input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
-                    @endif
-		</td>
-                <td>
-                    <span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="videotitle" value="{{$video->videotitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vinterpret">{{$video->interpret or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="interpret" value="{{$video->interpret or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vsongtitle">{{$video->songtitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="songtitle" value="{{$video->songtitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td class="hidden-xs">
-                    <span class="vinfo vimgsource">{{$video->imgsource or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="imgsource" value="{{$video->imgsource or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vcategory"><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></span>
-                    @if($edit)
-                        <select class="form-control" name="category" form="edit_{{$video->id}}">
-                            @foreach($categories as $cat)
-                                <option value="{{$cat->id}}" @if($cat->shortname === $video->category->shortname) selected @endif>{{$cat->name}}</option>
-                            @endforeach
-                        </select>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-@endsection
diff --git a/resources/views/layout5/irc.blade.php b/resources/views/layout5/irc.blade.php
deleted file mode 100644
index 0e63a94..0000000
--- a/resources/views/layout5/irc.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>IRC/[matrix]</h3>
- </div>
-
-<div class="irc-content">
-{{--<div class="webchat">
-	@if(auth()->check())
-	<iframe src="https://webirc.n0xy.net?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe> 
-	@else
-	<iframe src="https://webirc.n0xy.net?join=%23w0bm&"></iframe>
-	@endif
-</div>--}}
-<div class="irc-matrix-info">
-	<h5>IRC</h5>
-<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
-<p><a href="https://webirc.n0xy.net/?join=%23w0bm" target="about_blank">webirc.n0xy.net</a></p>
-<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
-<h5>[matrix]</h5>
-<h6>#w0bm on the [matrix] network</h6>
-<p><a href="https://matrix.to/#/#!w0bm:f0ck.it?via=f0ck.it&via=matrix.org&via=f0.gg">#!w0bm:f0ck.it</a></p>
-<p>Alternatively you can use the Element web client hosted at <a href="https://element.f0ck.it">f0ck.it</a> to connect to our channel, it has some modifications to make chatting more comfy: <br><small>Note: Registrations are disabled, you can still use this client with every homeserver you have an account on!</small></p>
-<ul>
-    <li>w0bm.com Stylesheet</li>
-    <li>Greentexting</li>
-</ul>
-<a href="https://spyware.neocities.org/articles/discord.html" target="_blank"><img src="/images/shitcord.gif" alt="discord-no-way"></a><br><a href="/matrix">Additional Redpill</a>
-</div>
-</div>
-@include('footer')
-@endsection
-
diff --git a/resources/views/layout5/kek.blade.php b/resources/views/layout5/kek.blade.php
deleted file mode 100644
index a10030b..0000000
--- a/resources/views/layout5/kek.blade.php
+++ /dev/null
@@ -1,51 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h1>Register</h1>
-    </div>
-    <div class="row">
-        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-            {!! csrf_field() !!}
-            <div class="form-group">
-                <label for="username" class="col-sm-2 control-label">Username</label>
-                <div class="col-sm-10">
-                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="email" class="col-sm-2 control-label">Email</label>
-                <div class="col-sm-10">
-                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="email_confirmation" class="col-sm-2 control-label">Email Confirmation</label>
-                <div class="col-sm-10">
-                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">Password</label>
-                <div class="col-sm-10">
-                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password_confirmation" class="col-sm-2 control-label">Password Confirmation</label>
-                <div class="col-sm-10">
-                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                    {!! Recaptcha::render() !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                    <button type="submit" class="btn btn-primary">Register</button>
-                </div>
-            </div>
-        </form>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout5/layout.blade.php b/resources/views/layout5/layout.blade.php
deleted file mode 100644
index 83a480a..0000000
--- a/resources/views/layout5/layout.blade.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-<html class="chrome-extension://clngdbkpkpeebahjckkjfobafhncgmne/edit.html" lang="de">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="theme-color" content="#161618">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1">
-    <meta charset="UTF-8">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <meta name="Description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">
-    <meta property="og:site_name" content="w0bm.com" />
-    <meta property="og:title" content="@if(!empty($video->interpret)){{$video->interpret}} – {{$video->songtitle}}@else() NO DATA AVAILABLE ;__; @endif">
-    <meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">
-    <meta property="og:image" content="@if(isset($video))https://w0bm.com/thumbs/{{str_replace(".webm","",$video->file)}}.gif"@endif/>
-    <meta property="og:video" content="@if(isset($video))https://b.w0bm.com/{{ $video->file }} @endif">
-    <meta property="og:url" content="@if(isset($video))https://w0bm.com/{{ $video->id }}@endif">
-    <meta property="og:video:secure_url" content="@if(isset($video))https://b.w0bm.com/{{ $video->file }} @endif">
-    <meta property="og:video:type" content="video/webm">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="favicon" href="favicon.ico" type="image/ico">
-    <link rel="stylesheet" href="/mobile/css/style.css">
-    <link rel="stylesheet" href="/mobile/css/w0bmfonts.css">
-    <link rel="stylesheet" href="/mobile/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/mobile/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" href="/mobile/css/video-js.min.css">
-    <link rel="stylesheet" href="/mobile/css/simplebar.css" />
-    <link rel="stylesheet" href="/mobile/css/vjsnew.css?v=1.1.1">
-    <link rel="stylesheet" href="/mobile/css/w0bmcustom.css?v={{ filemtime("mobile/css/w0bmcustom.css") }}">
-    <link rel="alternate stylesheet" href="mobile/css/chilledblue.css?v={{ filemtime("mobile/css/chilledblue.css") }}" title="Chilledblue">
-    <link rel="alternate stylesheet" href="mobile/css/xayd.css?v={{ filemtime("mobile/css/xayd.css") }}" title="Xayd">
-    <link rel="alternate stylesheet" href="mobile/css/epilepsie.css?v={{ filemtime("mobile/css/epilepsie.css") }}" title="Epilepsie">
-    <script src="/mobile/js/styleswitcher.js"></script>
-</head>
-<body>
-<div class="mobilefool"></div>
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($video) && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id))
-        @include('partials.frontendedit')
-	@endif
-@endif
-@if(auth()->check())
-@include('partials.navigation')
-
-<div class="wrapper">
-    @yield('aside')
-    <div style="width: auto; overflow: hidden; position: relative;">
-	<noscript><div class="no-js">Javascript is disabled, enable to use all of w0bms features!</div></noscript>
-        <div class=" container">
-	    @yield('content')
-	</div>
-
-    </div>
-</div>
-@else
-<div class="wrapper">
-<div class="container">
-<a href="#" data-toggle="modal" data-target="#loginmodal"><video id="video-login" style="width: 100%;" autoplay loop src="https://w0bm.com/b/3.webm"></video></a>
-@include('partials.loginmodal')
-</div>
-</div>
-</div>	
-@endif
-<script src="/mobile/js/jquery.min.js"></script>
-<script src="/mobile/js/bootstrap.min.js"></script>
-<script src="/mobile/js/bootstrap-tagsinput.min.js"></script>
-<script src="/mobile/js/isotope.pkgd.min.js"></script>
-<script src="/mobile/js/imagesloaded.pkgd.min.js"></script>
-<script src="/mobile/js/jquery.timeago.js"></script>
-<script src="/mobile/js/jquery.detectmobilebrowser.js"></script>
-<script src="/mobile/js/video.min.js"></script>
-<script src="/mobile/js/raven.min.js"></script>
-<script src="/mobile/js/simplebar.js"></script>
-<script src="/mobile/js/clipboard.min.js"></script>
-<script>
-var clipboard = new ClipboardJS('.copylink');
-
-clipboard.on('success', function(e) {
-    console.info('Action:', e.action);
-    console.info('Text:', e.text);
-    console.info('Trigger:', e.trigger);
-
-    e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
-    console.error('Action:', e.action);
-    console.error('Trigger:', e.trigger);
-});
-</script>
-<script src="/mobile/js/w0bmscript.js?v={{ filemtime("mobile/js/w0bmscript.js") }}"></script>
-</body>
-</html>
diff --git a/resources/views/layout5/list.blade.php b/resources/views/layout5/list.blade.php
deleted file mode 100644
index 804dd01..0000000
--- a/resources/views/layout5/list.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>List of other WebM-websites</h3>
- </div>
-
-<div class="box">
-	<p>This list is made to list all the different WebM sites out there, if you know any other sites that are not listed here feel free to <a href="/contact">contact</a> me!</p>
-	<p id="careful">We have no influence on content on these sites!</p>
-	<ol>
-		<li><a href="https://webm.rrerr.net/">webm.rrerr.net</a> is a very comfy and simple webm indexer also <a href="https://github.com/nilsding/webm-index">open source</a> software and easy to setup!</li>
-		<li><a href="https://randomtube.xyz">randomtube.xyz</a> is a frontpage for WebMs posted on <a href="https://2ch.hk/b">2ch.hk/b/</a> (a russian imageboard) and it's also <a href="https://github.com/yuriygr/randomtube">open source</a> <nsfw></nsfw></li>
-		<li><a href="https://webm-tv-webm-tv.7e14.starter-us-west-2.openshiftapps.com/">webm-tv</a> is also a frontpage for WebMs posted on 2ch, also <a href="https://github.com/Karasiq/webm-tv">open source</a> <nsfw></nsfw></li>
-		<li><a href="https://eyy.co/">eyy.co</a> is a simple random WebM index</li>
-		<li><a href="http://issoutv.com/">issoutv.com</a> is a french WebM site.</li>
-		<li><a href="http://webm.land/">webm.land</a> is a place where one can upload and share WebMs, has a public gallery.</li>
-		<li><a href="http://webmshare.com/">webmshare.com</a> is the better looking and working brother of webm.land, has 6 pubic gallerys with all kinds of different videos.</li>
-		<li><a href="https://kongoucheats.com">kongoucheats.com</a> is a nice and simple webm page where you can upload and watch webms <nsfw></nsfw></a></li>
-		<li><a href="https://p90.zone">p90.zone</a> is a terrible collection of webms</li>
-	</ol>
-	<code style="float:right;">Last modified: 02.01.2019</code>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout5/login.blade.php b/resources/views/layout5/login.blade.php
deleted file mode 100644
index 5986971..0000000
--- a/resources/views/layout5/login.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h5>Legacy Login</h5>
-        <p>This login form works without Javascript</p>
-    </div>
-
-
-  <div style="width:20%;" class="">
-  <form action="{{action('UserController@login')}}" method="post" class="form-signin">
-        {!! csrf_field() !!}
-        <input type="text" name="identifier" placeholder="Username" class="form-control">
-        <input type="password" name="password" placeholder="Password" class="form-control">
-        <input type="checkbox" name="remember"> Remember me<br>
-        <button type="submit" class="btn btn-primary">Login</button>
-        <a href="{{url('register')}}" class="btn btn-success">Register</a>
-  </div>
-  </form>
-@endsection
diff --git a/resources/views/layout5/main.blade.php b/resources/views/layout5/main.blade.php
deleted file mode 100644
index 6d1bf35..0000000
--- a/resources/views/layout5/main.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="page-header">
-        <form method="get">
-	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-
-    <div class="items">
-    	@foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <div class="main-item">
-            <a href="/{{$video->id}}">
-            {{-- MUSS UNBEDINGT NOCH ANGEPASST WERDEN!!! --}}
-            @if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
-    			<img src="/thumbs/beta/{{$thumb}}.png">
-				@else
-    			<img src="/small_404.gif" class="nothumb">
-			@endif
-			</a>
-			</div>
-        @endforeach
-    </div>
-    <div class="page">
-        {!! $videos->render() !!}
-    </div>
-@endsection
diff --git a/resources/views/layout5/map.blade.php b/resources/views/layout5/map.blade.php
deleted file mode 100644
index b632e26..0000000
--- a/resources/views/layout5/map.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-        <h4>w0bm.com Worldmap <i style="color:#1FB2B0" class="fa fa-globe"></i></h4>
-    </div>
-<iframe id="map" marginwidth="0" marginheight="0" width="100%" height="100%" scrolling=no allowtransparency=true frameborder="0" framespacing="0" name="map" src="https://www.zeemaps.com/pub?group=2187306&simpleadd=1" style="overflow:hidden; height:50em; width:100%"></iframe>
-@endsection
-
diff --git a/resources/views/layout5/marder.blade.php b/resources/views/layout5/marder.blade.php
deleted file mode 100644
index 250e794..0000000
--- a/resources/views/layout5/marder.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('layout')
-@section('content')
-<h3>Hello everyone!</h3>
-
-<div class="box">
-<img src="https://marderchen.totally.rip/marderchen.lima-city.de/marderchen.gif" style="float: right;" alt="">
-  <p>Today we have sad news, a beloved friend of us and one of our most unique members died.</p>
-  <p>Some of you may remember his unique and interesting and somewhat chaotic but cool videos.</p>
-  <p>Today we mourn the loss of our friend marderchen.</p>
-  <p>We sincerely hope you are at a better place now.</p>
-  <p>We thank you for the great time we had with you, you inspired many of us and brought joy to the IRC and to the website, you will be missed old friend.</p>
-
-  <p>To say it in your words: =^_^= MEOW</p>
-
-  <p>We have archived his long gone website, make sure to check it out! It is absolutely wild (only available in German)</p>
-
-  <p><a href="https://marderchen.totally.rip/marderchen.lima-city.de/index.html">https://marderchen.totally.rip/marderchen.lima-city.de/index.html</a></p>
-
-  <p>Also make sure to check out his uploads <a href="https://w0bm.com/main?q=marderchen">https://w0bm.com/main?q=marderchen</a> and enjoy it.</p>
-
-  <p><i>- w0bm staff</i></p>
-</div>
-@endsection
-
diff --git a/resources/views/layout5/matrix.blade.php b/resources/views/layout5/matrix.blade.php
deleted file mode 100644
index f38731d..0000000
--- a/resources/views/layout5/matrix.blade.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<style type="text/css">
-    * {margin: 0; padding: 0}
-body {background: #000;overflow:hidden;}
-canvas {display: block;}
-.matrix {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    font-family: monospace;
-}
-.matrix > .inner {
-    position: absolute;
-    color: white;
-    top: 40%;
-}
-.inner {
-    background: #000000b5;
-    padding: 5px;
-}
-
-#bluepill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: blue;
-    background: blue;
-    border-radius: 5px;
-}
-
-#redpill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: red;
-    background: red;
-    border-radius: 5px;
-}
-</style>
-<div class="matrix">
-    <div class="inner">
-    <h3><p><b><i>You are a slave {{Auth::user()->username}}</i></b></p></h3>
-    <br>
-    <p>Take control over your chats, leave Discord for good!</p>
-    <p>Join [matrix] today!</p>
-    <p>Why should you consider either running a [matrix] synapse yourself or start using someone elses:</p>
-    <p>Discord is evil, it took away the freedom you and I deserve, it makes you a slave to their services,<br> makes you obey their rules, includes you in a unwanted botnet where you have no freedom at all!</p>
-    <p>It's time to break free {{Auth::user()->username}}</p>
-    <p>Choose your fate</p>
-    <span id="bluepill"><a href="https://discordapp.com/app"></a></span> <span id="redpill"><a href="https://github.com/matrix-org/synapse" target="_blank"></a></span>
-    <p><code>#!w0bm:f0ck.it</code></p>
-    <br>
-    <p><small>We are happy to help if you have any trouble setting up your synapse</small></p>
-</div>
-</div>
-<canvas></canvas>
-<audio src="/clubbed.mp3" autoplay loop></audio>
-<script type="text/javascript">
-    // Initialising the canvas
-var canvas = document.querySelector('canvas'),
-    ctx = canvas.getContext('2d');
-
-// Setting the width and height of the canvas
-canvas.width = window.innerWidth;
-canvas.height = window.innerHeight;
-
-// Setting up the letters
-var letters = 'ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ';
-letters = letters.split('');
-
-// Setting up the columns
-var fontSize = 10,
-    columns = canvas.width / fontSize;
-
-// Setting up the drops
-var drops = [];
-for (var i = 0; i < columns; i++) {
-  drops[i] = 1;
-}
-
-// Setting up the draw function
-function draw() {
-  ctx.fillStyle = 'rgba(0, 0, 0, .1)';
-  ctx.fillRect(0, 0, canvas.width, canvas.height);
-  for (var i = 0; i < drops.length; i++) {
-    var text = letters[Math.floor(Math.random() * letters.length)];
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(text, i * fontSize, drops[i] * fontSize);
-    drops[i]++;
-    if (drops[i] * fontSize > canvas.height && Math.random() > .95) {
-      drops[i] = 0;
-    }
-  }
-}
-
-// Loop the animation
-setInterval(draw, 33);
-</script>
\ No newline at end of file
diff --git a/resources/views/layout5/messages.blade.php b/resources/views/layout5/messages.blade.php
deleted file mode 100644
index af58dd1..0000000
--- a/resources/views/layout5/messages.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.msglist')
-	<div class="page-header">
-        <h3>Messages</h3>
-    </div>
-    <div class="">
-        <div class="col-md-6" id="list">
-            <div class="spinner">
-                <div class="cube1"></div>
-                <div class="cube2"></div>
-            </div>
-        </div>
-        <div class="col-md-6" id="message"><h4>Select a message to display content</h4></div>
-    </div>
-@endsection
diff --git a/resources/views/layout5/messages/commentanswer.blade.php b/resources/views/layout5/messages/commentanswer.blade.php
deleted file mode 100644
index 9400a32..0000000
--- a/resources/views/layout5/messages/commentanswer.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment on the following video: <a href="{{($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
diff --git a/resources/views/layout5/messages/commentmention.blade.php b/resources/views/layout5/messages/commentmention.blade.php
deleted file mode 100644
index d9c5a8d..0000000
--- a/resources/views/layout5/messages/commentmention.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment on the following video: <a href="{{($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
diff --git a/resources/views/layout5/messages/commentpreview.blade.php b/resources/views/layout5/messages/commentpreview.blade.php
deleted file mode 100644
index 46f257e..0000000
--- a/resources/views/layout5/messages/commentpreview.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-body">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="right" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small></div>
-</div>
diff --git a/resources/views/layout5/messages/moderation/commentdelete.blade.php b/resources/views/layout5/messages/moderation/commentdelete.blade.php
deleted file mode 100644
index 734b4b6..0000000
--- a/resources/views/layout5/messages/moderation/commentdelete.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator deleted your comment.</h3>
-<p>A moderator deleted your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout5/messages/moderation/commentrestore.blade.php b/resources/views/layout5/messages/moderation/commentrestore.blade.php
deleted file mode 100644
index a8cf012..0000000
--- a/resources/views/layout5/messages/moderation/commentrestore.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator restored your comment.</h3>
-<p>A moderator restored your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout5/messages/moderation/videodelete.blade.php b/resources/views/layout5/messages/moderation/videodelete.blade.php
deleted file mode 100644
index 6a6568b..0000000
--- a/resources/views/layout5/messages/moderation/videodelete.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<h3>A moderator deleted your video.</h3>
-<p>A moderator deleted your video with the ID {{$video->id}}</p>
-<span style="font-weight:bold;">Video Info:</span>
-<ul>
-    @if(isset($videoinfo['artist'])) <li><span style="font-weight:bold;">Artist:</span> {{ $videoinfo['artist'] }}</li> @endif
-    @if(isset($videoinfo['songtitle'])) <li><span style="font-weight:bold;">Songtitle:</span> {{ $videoinfo['songtitle'] }}</li> @endif
-    @if(isset($videoinfo['video_source'])) <li><span style="font-weight:bold;">Video Source:</span> {{ $videoinfo['video_source'] }}</li> @endif
-    <li><span style="font-weight:bold;">Category:</span> {{ $videoinfo['category'] }}</li>
-</ul>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
\ No newline at end of file
diff --git a/resources/views/layout5/messages/videocomment.blade.php b/resources/views/layout5/messages/videocomment.blade.php
deleted file mode 100644
index 10d0747..0000000
--- a/resources/views/layout5/messages/videocomment.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>New comment on your video <a href="{{($video->id)}}">/{{$video->id}}</a></h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> made a comment on your video.</p>
-@include('messages.commentpreview')
diff --git a/resources/views/layout5/open.sh b/resources/views/layout5/open.sh
deleted file mode 100644
index f8331f6..0000000
--- a/resources/views/layout5/open.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-cd /srv/m.w0bm.com/resources/views/
-ln -sf registeropen.blade.php register.blade.php
-php ../../artisan view:clear
-echo "mobile REG OPEN"
-cd /srv/m.w0bm.com/resources/views/
-ln -sf registeropen.blade.php register.blade.php
-php ../../artisan view:clear
-echo "main reg open"
diff --git a/resources/views/layout5/partials/banmenu.blade.php b/resources/views/layout5/partials/banmenu.blade.php
deleted file mode 100644
index a1607d0..0000000
--- a/resources/views/layout5/partials/banmenu.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<form id="banmenu" method="POST" action="/api/user/{{$user->username}}/ban">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="banmenumodal" tabindex="-1" role="dialog" aria-labelledby="Ban user">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="filterModalTitle">Ban user</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="reason">Reason</label>
-                        <input class="form-control" type="text" name="reason" id="reason" placeholder="Reason">
-                    </div>
-                    <div class="form-group">
-                        <label for="duration">Duration</label>
-                        <input class="form-control" type="text" name="duration" id="duration" placeholder="Duration (-1 = permanent)">
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                    <input type="submit" class="btn btn-danger" value="BAN!">
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/resources/views/layout5/partials/comlist.php b/resources/views/layout5/partials/comlist.php
deleted file mode 100644
index acb20a2..0000000
--- a/resources/views/layout5/partials/comlist.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<script id="comlist" type="text/x-handlebars-template">
-            {{#each data as |value key|}}
-            <div class="panel panel-default">
-                <div class="panel-body" style="word-wrap: break-word;" data-index="{{key}}" data-id="{{id}}">{{{rendered_view}}}</div>
-                <div class="panel-footer">Video: <a href="/{{video_id}}">/{{video_id}}</a> | <time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-            </div>
-            {{else}}
-            <div class="list-group-item">No comments</div>
-            {{/each}}
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-</script>
diff --git a/resources/views/layout5/partials/comment.blade.php b/resources/views/layout5/partials/comment.blade.php
deleted file mode 100644
index 8ba27ee..0000000
--- a/resources/views/layout5/partials/comment.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="panel @if($del = !is_null($comment->deleted_at)) panel-danger @else panel-default @endif" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
-    <div class="panel-body" author="{{$comment->user->username}}">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a class="{{$comment->user->username}}" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small>
-        @if($mod)
-            @if($del)
-                <a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
-            @else
-                <a class="delete_comment" href="#{{$comment->id}}" onclick="deleteComment($(this))">[del]</a>
-                <a class="edit_comment" href="#{{$comment->id}}" onclick="editComment($(this))">[edit]</a>
-            @endif
-        @endif
-    </div>
-</div>
diff --git a/resources/views/layout5/partials/commentform.blade.php b/resources/views/layout5/partials/commentform.blade.php
deleted file mode 100644
index b813a7e..0000000
--- a/resources/views/layout5/partials/commentform.blade.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<div id="commentForm" class="hidden-xs">
-<form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-    {!! csrf_field() !!}
-    <div class="panel panel-default">
-        <div class="panel-body">
-            {!! Form::textarea('comment', null, ['placeholder' => 'Write something', 'id' => 'cinput', 'class' => 'form-control', 'required' => 'required']) !!}
-        </div>
-    <div class="panel-footer"><button type="submit" class="btn btn-primary btn-sm">Post</button>
-       <a style="font-size: 14px; margin-left: 7px;" class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-       <a style="font-size: 14px;" class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-       <a style="font-size: 14px;" class="anim" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-       <a style="font-size: 14px; color: white;" class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
-        <div tabindex="0" class="onclick-menu">
-            <ul class="onclick-menu-content">
-                <li>Protips:</li>
-                <li>Do not stack them like this <code>[rb][reich]I am funny ;)))[/reich][/rb]</code></li>
-                <li>This will look like shit and also it wont work.</li>
-                <li>Hit Enter 2x to make a normal paragraph. (Yes we are retarded)</li>
-                <li>Link to a video on w0bm.com is easy but 99% of you do it wrong! <br> <code>Blah Blah Blah /1337</code> this will not resolve the full link, just paste the full link in there like this: <code>Blah Blah Blah https://w0bm.com/1337</code> and this will result in the following: <p>Blah Blah Blah <a href="https://w0bm.com/1337">/1337</a></li>
-                <li>See <a href="/about#format">/about</a> for additional formatting options</li>
-            </ul>
-          </div>
-    <div class="emoji-shit">
-    <div class="header"><span>😂</span></div>
-    </div>
-    </div>
-    <div style="display: none;" id="parent" class="emojis-box">
-        <div data-simplebar data-simplebar-auto-hide="false" id="child" class="emojis">
-            <?php
-                $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.webp', GLOB_BRACE);
-                $files = array_map(function ($f) { return pathinfo($f); }, $files);
-            ?>
-
-            @foreach ($files as $file)
-                <a title=":{{$file['filename']}}:" href="javascript:;" onclick="formatTextEmoji ('{{$file['filename']}}');"><img class="comment_emoji_small" src="//w0bm.com/images/comments/{{$file['basename']}}"></a>
-            @endforeach
-        </div>
-    </div>
-    </div>
-</form>
-</div>
diff --git a/resources/views/layout5/partials/comments.blade.php b/resources/views/layout5/partials/comments.blade.php
deleted file mode 100644
index d4f2a1a..0000000
--- a/resources/views/layout5/partials/comments.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@if(Auth::check())
-@if($video->id == '30186')
-@include('partials.thread_closed')
-@else
-@include('partials.commentform')
-@endif
-@endif
-
-@if(Auth::check())
-<div class="comments hidden-xs">
-    <div class="commentwrapper">
-        <?php
-            if($mod = (Auth::check() && Auth::user()->can('delete_comment'))) $comments = $video->comments()->withTrashed()->get();
-            else $comments = $video->comments;
-        ?>
-        @if(count($comments) > 0)
-            @foreach($comments as $comment)
-                @include('partials.comment', ['comment' => $comment, 'mod' => $mod])
-            @endforeach
-	    @else
-	    <div class="panel panel-default nocomments">
-                <div class="panel-body">
-                    No comments yet …<br />
-                </div>
-            </div>
-        @endif
-    </div>
-</div>
-@else
-<div class="panel panel-default nocomments">
-	<div class="panel-body">
-		<i>Not logged in. Please log in to view comments!</i>
-	</div>
-</div>
-	@endif
diff --git a/resources/views/layout5/partials/filterselect.blade.php b/resources/views/layout5/partials/filterselect.blade.php
deleted file mode 100644
index b17cbde..0000000
--- a/resources/views/layout5/partials/filterselect.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Add Tags to filter for</h4>
-            </div>
-            <div class="modal-body">
-                <input id="filter" type="text" class="form-control" placeholder="Input tags…" name="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">
-                {{--<input type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                <button href="/filter" type="submit" id="submitfilter" class="btn btn-primary" value="Save">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout5/partials/flash.blade.php b/resources/views/layout5/partials/flash.blade.php
deleted file mode 100644
index f15929e..0000000
--- a/resources/views/layout5/partials/flash.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="flashcontainer">
-    <div class="flash-inner">
-        @if($errors->count() > 0)
-            @foreach($errors->all() as $error)
-                <div class="alert alert-danger alert-dismissable" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    {{ $error }}
-                </div>
-            @endforeach
-        @endif
-        @if(Session::has('error'))
-            <div class="alert alert-danger alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('error') }}
-            </div>
-        @endif
-        @if(Session::has('success'))
-            <div class="alert alert-success alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('success') }}
-            </div>
-        @endif
-        @if(Session::has('info'))
-            <div class="alert alert-info alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('info') }}
-            </div>
-        @endif
-        @if(Session::has('warning'))
-            <div class="alert alert-warning alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('warning') }}
-            </div>
-        @endif
-    </div>
-</div>
diff --git a/resources/views/layout5/partials/frontendedit.blade.php b/resources/views/layout5/partials/frontendedit.blade.php
deleted file mode 100644
index 20f7c50..0000000
--- a/resources/views/layout5/partials/frontendedit.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-@if(isset($video))
-    <form id="webmedit" method="POST" action="/index/{{$video->id}}">
-        {!! csrf_field() !!}
-        <div class="modal fade" id="webmeditmodal" tabindex="-1" role="dialog" aria-labelledby="Edit webm">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title" id="filterModalTitle">Edit webm</h4>
-                    </div>
-                    <div class="modal-body frontendeditmodal">
-                        <div class="form-group">
-                            <label for="interpretedit">Artist</label>
-                            <input class="form-control" type="text" name="interpret" id="interpretedit" value="{{ $video->interpret or ''}}" placeholder="Artist">
-                        </div>
-                        <div class="form-group">
-                            <label for="songtitleedit">Songtitle</label>
-                            <input class="form-control" type="text" name="songtitle" id="songtitleedit" value="{{ $video->songtitle or ''}}" placeholder="Songtitle">
-                        </div>
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Source</label>
-                            <input class="form-control" type="text" name="imgsource" id="imgsourceedit" value="{{ $video->imgsource or ''}}" placeholder="Video Source">
-
-                        </div>
-                        <div class="form-group">
-                            <label for="categoryselect">Category</label>
-                            <select class="form-control" name="category" id="categoryselect">
-                                @foreach(\App\Models\Category::all() as $category)
-                                <option value="{{$category->id}}" @if($video->category->id == $category->id) selected @endif>{{$category->name}}</option>
-                                @endforeach
-                            </select>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <input type="submit" class="btn btn-primary" value="Save">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-@endif
diff --git a/resources/views/layout5/partials/handlebars.php b/resources/views/layout5/partials/handlebars.php
deleted file mode 100644
index 3a70c75..0000000
--- a/resources/views/layout5/partials/handlebars.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="paginationtmpl" type="text/x-handlebars-template">
-    <nav class="mitte">
-        <ul class="pagination">
-            {{#paginate pagination type="first"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">First</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="previous"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&laquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="middle" limit="7"}}
-            <li {{#if active}}class="active"{{/if}}><a href="#" data-page="{{n}}">{{n}}</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="next"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&raquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="last"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">Last</a></li>
-            {{/paginate}}
-        </ul>
-    </nav>
-    <div class="clearfix"></div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout5/partials/header.blade.php b/resources/views/layout5/partials/header.blade.php
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout5/partials/layoutchanger.blade.php b/resources/views/layout5/partials/layoutchanger.blade.php
deleted file mode 100644
index 73b2ccb..0000000
--- a/resources/views/layout5/partials/layoutchanger.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<li role="presentation" class="layoutChanger" id="layoutSwitcher">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Layout
-    </a>
-<ul class="dropdown-menu">
-    <div class="layoutblah">
-        <button class="layoutbutton" id="layout1">w0bm.com</button>
-        <br>
-        <button class="layoutbutton" id="layout2">Njum</button>
-        <br> 
-        <button class="layoutbutton" id="layout3">z0mb</button>
-        <br>
-        <button class="layoutbutton" id="layout4">z0mbie</button>
-    </div>
-</ul>
-</li>
\ No newline at end of file
diff --git a/resources/views/layout5/partials/loginmodal.blade.php b/resources/views/layout5/partials/loginmodal.blade.php
deleted file mode 100644
index 8bd0e04..0000000
--- a/resources/views/layout5/partials/loginmodal.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="modal fade" id="loginmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            
-            <div class="login_wrapper">
-            	<div class="col-md-9">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout5/partials/msglist.php b/resources/views/layout5/partials/msglist.php
deleted file mode 100644
index fbacfc0..0000000
--- a/resources/views/layout5/partials/msglist.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<script id="msglist" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Messages</h3> <button class="btn btn-primary pull-right readall" onclick="readAll()">Read all</button>
-        </div>
-
-        <div class="list-group" id="listitems">
-            {{#each data as |value key|}}
-            <a href="#" data-index="{{key}}" data-id="{{id}}" class="list-group-item {{#unless read}}list-group-item-info{{/unless}}">{{subject}}</a>
-            {{else}}
-            <div class="list-group-item">No messages</div>
-            {{/each}}
-        </div>
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-    </div>
-</script>
-
-<script id="msgtmpl" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{{subject}}</h3>
-        </div>
-        <div class="panel-body">
-            {{{content}}}
-        </div>
-        <div class="panel-footer"><time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-    </div>
-</script>
diff --git a/resources/views/layout5/partials/navigation.blade.php b/resources/views/layout5/partials/navigation.blade.php
deleted file mode 100644
index 8c7f7b3..0000000
--- a/resources/views/layout5/partials/navigation.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<nav class="navbar navbar-inverse navbar-static-top">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/main">
-		<img src="{{ asset('logo.svg') }}" alt="w0bm.com">
-	    </a>
-        </div>
-
-        <div class=" collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav navbar-left">
-                <li><a href="{{url('categories')}}"><i class="fa fa-clone"></i> Categories</a></li>
-                <li><a href="{{url('index')}}"><i class="fa fa-list"></i> Index</a></li>
-	    </ul>
-            @if(Auth::check())
-                <ul class="nav navbar-nav navbar-right">
-		    <li><a href="{{url('messages')}}"><i class="fa fa-envelope"></i> <span class="badge">{{Auth::user()->messagesRecv()->unread()->count()}}</span></a></li>
-                    <li><a href="#" data-toggle="modal" data-target="#filterselectmodal"><i class="fa fa-filter"></i> Filter</a></li>
-                    <li><a href="{{url('upload')}}"><i class="fa fa-cloud-upload"></i> Upload</a></li>
-                    <li><a href="{{url('user', Auth::user()->username)}}"><i class="fa fa-user"></i> {{Auth::user()->username}}</a></li>
-                    <li><a href="{{url('logout')}}"><i class="fa fa-sign-out"></i> Logout</a></li>
-                </ul>
-            @else
-		<!-- Hier war mal der Login Kot -->
-		<ul class="nav navbar-nav navbar-right">
-		<li><a href="#" data-toggle="modal" data-target="#loginmodal"><i class="fa fa-sign-in"></i> Login</a></li>
-		@include('partials.loginmodal')
-		</ul>
-            @endif
-        </div>
-    </div>
-</nav>
diff --git a/resources/views/layout5/partials/profileheader.blade.php b/resources/views/layout5/partials/profileheader.blade.php
deleted file mode 100644
index e1524c5..0000000
--- a/resources/views/layout5/partials/profileheader.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h3 class="{{ $user->username }}">{!! rtrim(e($user->username) . ' ' . $user->activeIcon()) !!} @if($user->disabled && isset($user->banend) && (Carbon\Carbon::now() <= $user->banend || 1 >= $user->banend->timestamp))<span style="color: grey; font-size: 15px;">(@if(Carbon\Carbon::now() <= $user->banend)Ban expires in <time class="timeago" data-toggle="tooltip" title="{{ $user->banend }}+0000" datetime="{{ $user->banend }}+0000"></time>@else permanently banned @endif)</span>@endif</h3>
-<div class="admin-settings">
-@if(auth()->check() && auth()->user()->can('edit_user'))<span id="pannade"><a href="#" data-toggle="modal" data-target="#banmenumodal"><i style="color:red;" class=""></i>[ban user]</a></span>
-@endif
-</div>
-    <span id="jointime">Joined: <time class="timeago" datetime="{{ $user->created_at }}+0000" title="{{ $user->created_at }}+0000" data-toggle="tooltip"></time></span>
-<div class="profile-info">
-    <span id="count-upload"> <a href="/user/{{$user->username}}"> <i class="fa fa-cloud-upload"></i> {{ $user->uploads()->countScoped()->count() }} Uploads</a></span>
-
-    <span id="comments-user"> <a href="/user/{{$user->username}}/comments"><i class="fa fa-commenting"></i> {{ $user->comments()->count() }} Comments</a></span>
-
-    <span id="favs-user"><a href="/user/{{$user->username}}/favs/index"><i class="fa fa-heart"></i> {{ $user->favs()->countScoped()->count() }} Favorites</a></span>
-</div>
-</div>
diff --git a/resources/views/layout5/partials/registermodal.blade.php b/resources/views/layout5/partials/registermodal.blade.php
deleted file mode 100644
index d56589a..0000000
--- a/resources/views/layout5/partials/registermodal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="modal fade" id="registermodal" tabindex="-1" role="dialog" aria-labelledby="Register">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Register</h4>
-            </div>
-            
-            <div class="advantages">
-              <p>Registering on w0bm has some advantages...</p>
-              <p>With a account you can comment on WebMs, favor WebMs, upload WebMs, tag videos, filter out unwanted tags and watch NSFW WebMs!</p>
-            </div>
-
-            <div class="reg_wrapper">
-	   		        <div class="register">
-                  <div class="col-md-10">
-                    <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-                      {!! csrf_field() !!}
-                        <div class="form-group">
-                          <div class="reg_username">
-                            {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                          </div>
-                        </div>
-                
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                          </div>
-                        </div>
-              
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                          </div>
-                        </div>
-            
-                        <div class="form-group">
-                          <div class="recaptcha">
-                            {!! Recaptcha::render() !!}
-                          </div>
-                        </div>
-                      
-                        <div class="form-group terms">
-                          <div class="verify_rules">
-                            <p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-                          </div>
-                        
-                          <div class="submit_registration">
-                            <button type="submit" class="btn btn-primary">Register</button>
-                          </div>
-                        </div>
-                    </form>
-                  </div>
-                </div>
-            </div>
-
-            <div class="modal-footer">
-              <p>Back to <a href="#" data-toggle="modal" data-target="#loginmodal" data-dismiss="modal">Login?</a></p>
-            </div>
-    </div>
-</div>
-</div>
diff --git a/resources/views/layout5/partials/tags.blade.php b/resources/views/layout5/partials/tags.blade.php
deleted file mode 100644
index 21c4b50..0000000
--- a/resources/views/layout5/partials/tags.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="tags-mobile">
-    <div class="tagtest">
-    @if(Auth::check())
-    <ul class="nav navbar-nav info-nav" style="float: none;">
-    <label for="tag-add-toggle">
-    <li id="tagadder" class="addtagsy">+ Add Tag <i class="fa fa-tag" aria-hidden="true"></i> </li>
-    </label>    
-    <li class="addtagsy"><a href="/irc">IRC </a></li>
-    <li class="addtagsy"><a href="/about">About </a></li>
-    <li class="addtagsy"><a href="/contact">Contact </a></li>
-    <li class="addtagsy"><a href="/rules">Rules </a></li>
-    </ul>
-    <input type="checkbox" id="tag-add-toggle">
-    <div id="tag-add">
-    <div class="input-group" style="margin-top: 4px;">
-        {{--<select multiple name="tags[]" data-role="tagsinput" class="form-control"></select>--}}
-            <input id="tags" type="text" class="form-control" placeholder="Input tags…" name="tags" data-role="tagsinput">
-            <span class="input-group-btn">
-		<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="form-control btn-primary">Submit</button>
-	    </span>
-    </div>
-        </div>
-	@else
-	<ul class="nav navbar-nav info-nav" style="float: none;">
-            <li class="addtagsy"><a href="/irc">IRC </a></li>
-            <li class="addtagsy"><a href="/about">About </a></li>
-	    <li class="addtagsy"><a href="/contact">Contact </a></li>
-	    <li class="addtagsy"><a href="/rules">Rules </a></li>
-	</ul>
-        @endif
-
-    </div>
-    <div class="toggo tag-panel-body" style="">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                    <span class="label label-default"><a href="/main?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout5/partials/themechanger.blade.php b/resources/views/layout5/partials/themechanger.blade.php
deleted file mode 100644
index 121f811..0000000
--- a/resources/views/layout5/partials/themechanger.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<li role="presentation" class="">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Theme
-    </a>
-<ul class="dropdown-menu">
-    <div id="switcher">
-        <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
-        <br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout5/partials/thread_closed.php b/resources/views/layout5/partials/thread_closed.php
deleted file mode 100644
index 03d2e52..0000000
--- a/resources/views/layout5/partials/thread_closed.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thread_closed">
-  <span>Thread closed! ;__;</span>
-</div>
diff --git a/resources/views/layout5/privacy.blade.php b/resources/views/layout5/privacy.blade.php
deleted file mode 100644
index 346ddd4..0000000
--- a/resources/views/layout5/privacy.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Privacy</h3>
- </div>
-
-<div class="box">
-<h5>What do we log?</h5>
-<p>Our webserver does not log access log requests, we may log error logs from time to time if something breaks.</p>
-<h5>3<sup>rd</sup> party links</h5>
-<p>There are some 3rd party linkings on this website, be careful with clicking them we don't know whats inside the box blah blah blah, don't be stupid and don't trust the internet.</p>
-<p>If you encounter a malicious link shared here on w0bm.com please notify an admin in the <a href="/irc">IRC</a></p>
-<p>If you find a bug or a vulnerability, please notify an admin in the <a href="/irc">IRC</a></p>
-<h5>Cookies</h5>
-<p>Yes, we use cookies and if you don't like that don't come to our site! (or don't accept them in the first place) You can see the details of the cookies in your browser.</p>
-<p>Spoiler: They are all relevant for the website to function properly!</p>
-<ul>
-<p>The following cookies are being set by the website:</p>
-<li><code>remember_&lt;token&gt;</code> Well, it's used to remember you and so you don't have to re-login after like 5 minutes</li>
-<li><code>style</code> This one is used to store your style preference</li>
-<li><code>w0bm_session</code> Your session id</li>
-<li><code>XSRF-TOKEN</code> The XSRF Token</li>
-</ul>
-</div>
-@if(auth()->check())
-@include('footer')
-@else
-@endif
-@endsection
diff --git a/resources/views/layout5/profile.blade.php b/resources/views/layout5/profile.blade.php
deleted file mode 100644
index c1c0e10..0000000
--- a/resources/views/layout5/profile.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.profileheader')
-	<div class="profilheader">
-	    <a href="/{{$user->baseurl()}}/">View {{ $title }}</a>
-	</div>
-            <table class="table table-hover table-condensed">
-                <thead>
-                <tr>
-                    <th>ID</th>
-                    <th>Artist</th>
-                    <th>Songtitle</th>
-                    <th class="hidden-xs">Video Source</th>
-                    <th>Category</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($videos as $video)
-                    <?php
-                        $thumb = str_replace(".webm","",$video->file);
-                    ?>
-                    <tr data-thumb="{{$thumb}}">
-                        <td><a href="/{{$user->baseurl()}}/{{$video->id}}">{{$video->id}}</a></td>
-                        <td>{{$video->interpret or ''}}</td>
-                        <td>{{$video->songtitle or ''}}</td>
-                        <td class="hidden-xs">{{$video->imgsource or ''}}</td>
-                        <td><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            {!! $videos->render() !!}
-@endsection
diff --git a/resources/views/layout5/profilelayout.blade.php b/resources/views/layout5/profilelayout.blade.php
deleted file mode 100644
index ad584a3..0000000
--- a/resources/views/layout5/profilelayout.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<html lang="de">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="theme-color" content="#161618">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1">
-    <meta charset="UTF-8">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>w0bm.com - WebMs with sound!</title>
-    <link rel="stylesheet" href="{{ asset('css/style.css') }}">
-    <link rel="stylesheet" href="{{ asset('css/jquery.mCustomScrollbar.min.css') }}">
-    <link rel="favicon"
-      type="image/ico"
-      href="favicon.ico" />
-    <link rel="stylesheet" href="/css/w0bmfonts.css">
-    <link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}">
-    <link rel="stylesheet" href="/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" href="/css/w0bmcustom.css?v={{ filemtime("css/w0bmcustom.css") }}">
-    <link rel="alternate stylesheet" href="/css/chilledblue.css?v={{ filemtime("css/chilledblue.css") }}" title="Chilledblue">
-    <link rel="alternate stylesheet" href="/css/xayd.css?v={{ filemtime("css/xayd.css") }}" title="Xayd">
-    <link rel="alternate stylesheet" href="/css/epilepsie.css?v={{ filemtime("css/epilepsie.css") }}" title="Epilepsie">
-    <script src="/js/styleswitcher.js"></script>
-    <link rel="stylesheet" type="text/css" href="/css/clippy.css">
-</head>
-<body>
-@include('partials.handlebars')
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($user) && auth()->user()->can('edit_user'))
-        @include('partials.banmenu')
-    @endif
-@endif
-<canvas id="bg" @if(!Session::get('background', true)) style="display: none;"@endif></canvas>
-@if(auth()->check())
-@include('partials.navigation')
-
-<div class="wrapper">
-    @yield('aside')
-    <div style="width: auto; overflow: hidden; position: relative;">
-	<div class="fucklaravel">
-	    <noscript><div class="no-js-profile">Javascript is disabled, enable to use all of w0bms features!</div></noscript>
-            @yield('content')
-        </div>
-    </div>
-
-</div>
-@else
-	<div class="not-logged-in">
-<h5>ERR 77</h5>
-<p>Please <a href="#" data-toggle="modal" data-target="#loginmodal"><i class="fa fa-sign-in"></i> Login</a></p>
-@include('partials.loginmodal')
-</div>
-@endif
-<script src="/js/jquery.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/bootstrap-tagsinput.min.js"></script>
-<script src="/js/isotope.pkgd.min.js"></script>
-<script src="/js/imagesloaded.pkgd.min.js"></script>
-<script src="/js/handlebars.min.js"></script>
-<script src="/js/jquery.timeago.js"></script>
-<script src="/mobile/js/w0bmscript.js?v={{ filemtime("js/w0bmscript.js") }}"></script>
-</body>
-</html>
diff --git a/resources/views/layout5/register.blade.php b/resources/views/layout5/register.blade.php
deleted file mode 100644
index f45f3d7..0000000
--- a/resources/views/layout5/register.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@extends('layout')
-@section('content')
-<style>
-html body {
-     animation: anfall 0.2s;
-     -webkit-animation: anfall 0.2s;
-     animation-iteration-count: infinite;
-     margin: 0;
-     padding: 0;
-     height: 100%;
-     overflow: hidden;
- }
-
-@keyframes anfall {
-    0%   {background: red;}
-    25%  {background: yellow;}
-    50%  {background: blue;}
-    75%  {background: pink;}
-    100% {background: red;}
-}
-
-@-webkit-keyframes anfall {
-    0%   {background: black;}
-    25%  {background: white;}
-    50%  {background: black;}
-    75%  {background: white;}
-    100% {background: black;}
-}
-
-div.a {
-width: 50px;
-height:50px;
-}
-@endsection
diff --git a/resources/views/layout5/registerclosed.blade.php b/resources/views/layout5/registerclosed.blade.php
deleted file mode 100644
index f45f3d7..0000000
--- a/resources/views/layout5/registerclosed.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@extends('layout')
-@section('content')
-<style>
-html body {
-     animation: anfall 0.2s;
-     -webkit-animation: anfall 0.2s;
-     animation-iteration-count: infinite;
-     margin: 0;
-     padding: 0;
-     height: 100%;
-     overflow: hidden;
- }
-
-@keyframes anfall {
-    0%   {background: red;}
-    25%  {background: yellow;}
-    50%  {background: blue;}
-    75%  {background: pink;}
-    100% {background: red;}
-}
-
-@-webkit-keyframes anfall {
-    0%   {background: black;}
-    25%  {background: white;}
-    50%  {background: black;}
-    75%  {background: white;}
-    100% {background: black;}
-}
-
-div.a {
-width: 50px;
-height:50px;
-}
-@endsection
diff --git a/resources/views/layout5/registeropen.blade.php b/resources/views/layout5/registeropen.blade.php
deleted file mode 100644
index 338864f..0000000
--- a/resources/views/layout5/registeropen.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-	<h5>Register your w0bm.com Account</h5>
-<p style="color:red;">Note: We do not reset passwords, make sure to write down your password on paper, otherwise you need create a new account or start to circlejerk in the IRC!</p>
-    </div>
-    <div class="register">
-        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-            {!! csrf_field() !!}
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                </div>
-            </div>
-            <!--<div class="form-group">
-                <div class="">
-                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
-                </div>
-            </div>-->
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Recaptcha::render() !!}
-                </div>
-	    </div>
-	    <div class="form-group terms">
-		<div style="text-align: center;">
-		<p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-		</div>
-		<div class="">
-                    <button type="submit" class="btn btn-primary">Register</button>
-                </div>
-            </div>
-        </form>
-    </div>
-<!--    <div class="form-group" style="
-		text-align: center;
-		background: rgba(0, 0, 0, 0.75);
-		margin-left: 5px;
-                margin-right: 5px;
-    				  ">
-	<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
-	<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
-    </div>
--->    
-@endsection
-
diff --git a/resources/views/layout5/rules.blade.php b/resources/views/layout5/rules.blade.php
deleted file mode 100644
index 6dc1288..0000000
--- a/resources/views/layout5/rules.blade.php
+++ /dev/null
@@ -1,57 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-        <h4>Rules for w0bm.com</h4>
-</div>
-<div class="box">
-<h5>General</h5>
-<ol>
-	<li>Content on this website is intended for adults (18+), we can't check your age and don't want to, but keep this in mind, this is a website by adults for adults.</li>
-	<li>No Comment or Tag spamming</li>
-	<li>No Child porn and/or underage modeling videos/links to websites</li>
-	<li>Be friendly to each other! No harrassing etc.</li>
-	<li>No Terrorist Propaganda and Content!</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Uploading</h5>
-<ol>
-	<li>The focus is on videos that are catchy and fun to watch, for example <a href="/index?q=loop">loops</a> this does not mean these are the only videos we welcome, it's just our main focus, we have plenty of videos that are completely unrelated to loops or catchy stuff and are still fitting, ask yourself "does my upload fit on w0bm.com?" and if yes, you're good to go!</li>
-	<li>The Artist and Songtitle field is only for the Artist and Song information respectively, anything else in there probably doesn't belong in there, use the Tags.</li>
-	<li>I reserve the right to remove uploads that I consider not worth being on w0bm.com without comment, discussions about deleted videos will be ignored and can lead in extreme cases to a ban.</li>
-	<li>No videos with watermarks like coub.com they will be removed regardless of quality, please take the time to either recreate or censor the watermark.</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Tagging</h5>
-<ol>
-	<li>Try at least adding 3 tags to your upload, theres always something to describe, even if you do it later on, please do it.</li>
-	<li>Tags should always describe what you see in the video and maybe some additional informations</li>
-	<li>No links in the Tags, use the comment section for that!</li>
-	<li>Always give your video a rating like "sfw" or "nsfw" so people can filter and please be strict about this in the future!</li>
-	<li>Comments are not welcome in the Tag section</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Commenting</h5>
-<ol>
-	<li>NSFW images should only be posted on NSFW videos.</li>
-	<li>Live with different opinions, and deal with it.</li>
-	<li>No scam links or links to paywall sites, no unauthorized advertisment</li>
-	<li>No spam</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Reposts</h5>
-<ul style="text-align:left;">
-<li>Tag reposts with the tag: repost also link the original and the repost in the comments, maybe some admin or moderator is going to care about it and deletes the repost.</li>
-</ul>
-</div>
-<p>These rules can change at any time!</p>
-
-@include('footer')
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout5/rulez.blade.php b/resources/views/layout5/rulez.blade.php
deleted file mode 100644
index aaf5b2d..0000000
--- a/resources/views/layout5/rulez.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h3>Rulez</h3>
-    </div>
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout5/settings.blade.php b/resources/views/layout5/settings.blade.php
deleted file mode 100644
index 13fbab4..0000000
--- a/resources/views/layout5/settings.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
- @extends('profilelayout')
-@section('content')
-<h4>Layouts</h4>
-<div class="box">
-    <h5>Change how you experience w0bm.com</h5>
-  <ul class="layout-ul">
-    <li><a class="nav-link layout1" style="font-size: 10px;" href="/api/user/layout?layout=1">w0bm</a>The default look</li>
-    <li><a class="nav-link layout2" style="font-size: 10px;" href="/api/user/layout?layout=2">Njum</a>Alternative approach</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=3">z0mb</a>z0r.de layout + theme</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=4">nojs</a>The nojs layout (broken)</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=5">Mobile</a>The mobile optimized default layout</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=6">Marderchen</a>This is marders Layout, it has no async js</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=7">2017</a>The layout from 2017</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=8">2015</a>The OG w0bm</li>
-  </ul>
-</div>
-  @endsection
\ No newline at end of file
diff --git a/resources/views/layout5/stats.blade.php b/resources/views/layout5/stats.blade.php
deleted file mode 100644
index fc0348f..0000000
--- a/resources/views/layout5/stats.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-        <h3>Stats</h3>
-</div>
-<div class="box">
-	<p class="user_count">Total amount of registered users: <amount>{{$user_count}}</amount></p>
-	<p class="upload_count">Total amount of uploads: <amount>{{$upload_count}}</amount></p>
-	<p class="comment_count">Total amount of comments: <amount>{{$comment_count}}</amount></p>
-	<p class="latest-video">Latest video <a href="/{{$latest_video}}">/{{$latest_video}}</a></p>
-	<p class="newest_user">Newest user <a href="/user/{{$newest_user}}">/user/{{$newest_user}}</a></p>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout5/upload.blade.php b/resources/views/layout5/upload.blade.php
deleted file mode 100644
index 4780e3a..0000000
--- a/resources/views/layout5/upload.blade.php
+++ /dev/null
@@ -1,76 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="uploadheader">
-        <h3 id="upheader">Upload m0bile</h3>
-    </div>
-    <div class="wrapper">
-        <div class="ulcontainer" style="white-space: nowrap; padding: 0px; height: 100%;">
-	    <div class="form-group">
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}
-                </div>
-            </div>
-                <div class="">
-                    {!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    <?php
-                        $categories = [];
-                        foreach(App\Models\Category::all() as $cat)
-                            $categories[$cat->id] = $cat->name;
-                    ?>
-                    {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="blah">
-                    {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw">NSFW?</label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="ultags">
-                    {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'form-control', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}
-                </div>
-	    </div>
-<div class="form-group">
-    @include('partials.flash')
-    <br>
-        <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-            <a id="dragndrop-link" href="#">
-                <span style="display: table; width: 100%; height: 100%;">
-                    <span id="dragndrop-text">
-                        <i class="fa fa-cloud-upload"></i><br>
-                        Drop or select WebM!
-                    </span>
-                </span>
-            </a>
-        </div>
-</div>
-
-            <div class="form-group">
-                <div class="col-md-12">
-                    <button id="btn-upload" type="button" style="width: 100%; height: 40px;" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
-			<span class="" id="laz0r-fire"></span>
-			<span class="hidden-xs" id="shoop-laz0r"></span>
-		    </button>
-		    <p style="text-align:center; padding-top: 5px; white-space: normal;">Before you fire the laz0r make sure you have read the <a href="/rules">Rules</a>! <br><i>With great power comes great responsibility</i></p>
-		    <p style="text-align:center; padding-top: 5px; white-space: normal;"><span id="big">10</span> uploads <span id="big">every 12 hours.</span> – Maximum filesize: <span id="big">40MB.</span> – Only <span id="big">.webm (vp8/vp9) with sound</span> allowed. Need <a href="/webm">help?</a></p>
-                </div>
-            </div>
-        <input name="file" type="file" class="hidden" accept=".webm"></input>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout5/vendor/.gitkeep b/resources/views/layout5/vendor/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout5/video.blade.php b/resources/views/layout5/video.blade.php
deleted file mode 100644
index 5343ea1..0000000
--- a/resources/views/layout5/video.blade.php
+++ /dev/null
@@ -1,116 +0,0 @@
-@extends('layout')
-@section('content')
-<?php $related = $related ?? null; ?>
-    <div class="vertical-align">
-	<div class="wrapper">
-            <div class="embed-responsive embed-responsive-16by9">
-                <video id="video" loop controls preload="auto" crossorigin="anonymous">
-			<source src="{{ "//w0bm.com/b/" . $video->file }}">
-			<!-- rip fapple! <source src="//fapple.w0bm.com/{{str_replace(".webm","",$video->file)}}.mp4"> -->
-		</video>
-		    	@if($video->category->name === 'Anime' || $video->category->name === 'Otomad')
-		    	<div class="anime-thumb-opener hidden-xs"><i title="Generate Anime Thumbnail!" class="fa fa-file-image-o"></i></div>
-				<div style="display: none;" class="anime-thumb">
-				<span>Anime Thumbnail Generator v1.0 Alpha</span><br>
-				<img id="thumbnail_img" alt="Pause video to create thumb!"/><br>
-				<span>Right click <code>Copy Image</code> and paste it on <a href="https://trace.moe">trace.moe</a></span>
-				<canvas height="540" width="960" style="display: none;" id="thecanvas"></canvas>
-				<script src="/js/animethumbnailer.js"></script>
-			</div>
-		@endif
-	    </div>
-            	<?php
-			//$shortfile = str_replace(".webm", "" ,$video->file);
-			//$mp4 = shell_exec("curl https://fapple.w0bm.com/api/v1/{{$shortfile}} | jq -r .size");
-		?>
-			<div class="text-center" style="position: unset;">
-				@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<a class="first" href="#" style="visibility: hidden;">← first</a>
-						<a id="prev" href="#" style="visibility: hidden;">← prev</a> |
-					@else
-						<a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}">← first</a>
-						<a id="prev" href="{{url($related->baseurl(), [$prev->id])}}">← prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next →</a>
-						<a class="last" href="#" style="visibility: hidden;">last →</a>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next →</a>
-						<a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last →</a>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<a class="first" href="#" style="visibility: hidden;">← first</a>
-						<a id="prev" href="#" style="visibility: hidden;">← prev</a> |
-					@else
-						<a class="first" href="{{url($video->getFirstId())}}">← first</a>
-						<a id="prev" href="{{url($prev->id)}}">← prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next →</a>
-						<a class="last" href="#" style="visibility: hidden;">last →</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next →</a>
-						<a class="last" href="{{url($video->getLastId())}}">last →</a>
-					@endif
-				@endif
-			</div>
-			@include('partials.tags')
-			<div class="vidinfo">
-						<button title="Toggle comments" class="toggle-comments" id="toggle"><i class="fa fa-comments"></i> <span id="commentAmount">{{ $video->comments()->count() }}</span></button>	
-						<button class="copylink" data-clipboard-text="https://w0bm.com/{{($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
-						<div class="dropdown">
-							<button class="fa fa-download"
-								id="dlbutton"
-                                style="cursor: pointer"
-                                data-toggle="popover"
-                                data-placement="top"
-								data-trigger="hover"
-								data-html="true"
-                                title="Download Video"
-								data-content="
-									<div class='downloadvid'>
-									<ul class='downloadlist'>
-									<li><a class='file_size' href='{{ '/b/' . $video->file }}' download>WebM</a> <span class='filesize'> ({{HumanReadable::bytesToHuman($video->filesize()) }})</span></li>
-
-									</ul>
-									</div>"
-							</button>
-						</div>
-
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}"><i style="color:#ff0094;" class="fa fa-heart"></i></a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}"><i style="color:#ff0094;" class="fa fa-heart-o"></i></a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}"><i class="fa fa-heart-o"></i></a>
-						@endif
-						</div>
-						<button class="fa fa-info-circle"
-							id="infobox"
-							style="cursor: pointer"
-							data-toggle="popover"
-							data-placement="top"
-							data-trigger="hover"
-							title="Information"
-							data-content="	<div style='word-break: break-word;'>@if($video->interpret) <strong>Artist:</strong> {{$video->interpret}}<br>@endif
-											@if($video->songtitle) <strong>Songtitle:</strong> {{$video->songtitle}}<br>@endif
-											@if($video->imgsource) <strong>Video Source:</strong> {{$video->imgsource}}<br>
-											@endif
-											<strong>Category:</strong> {{$video->category->name}}</div>">
-						</button>
-						<span id="uploader">by <a style="color: white" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>@if(auth()->check() && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#">[del]</a>@endif 
-			</div>
-			<div class="mobile-comments">
-        			@include('partials.flash')
-        			@include('partials.comments')
-			</div>
-		</div>
-	</div>
-@endsection
diff --git a/resources/views/layout5/webm.blade.php b/resources/views/layout5/webm.blade.php
deleted file mode 100644
index 689720a..0000000
--- a/resources/views/layout5/webm.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>WebM Support</h3>
-         <p>How 2 make a webm</p>
- </div>
-
-<div class="box">
-<h4>Chad <small>(not afraid of using the command line)</small></h4>
-<img src="/images/gigachad.png" style="float:left;width:150px;" alt="gigachad">
-<pre><code>#The based white man way
-
-ffmpeg -i virgin.mp4 chad.webm #single file, very simple
-
-#You can add this to your .bashrc
-
-function mkwebmbatch() {
-        for i in *.$1;
-                do name=`basename "$i" .$1`
-                echo "$name"
-                ffmpeg -i "$i" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$PWD/${name}.webm"
-        done
-}
-
-function mkwebm() {
-	filename=$(basename -- "$1")
-	extension="${filename##*.}"
-	filename="${filename%.*}"
-	name=`basename "$filename" .$extension`
-	echo "$name"
-	ffmpeg -i "$1" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$HOME/Videos/converts/$name.webm"
-}
-
-function stillvid() {
-	#stillvid image.jpg music.mp3 $3.<webm>
-	ffmpeg -i "$1" -i "$2" -c:a libvorbis -auto-alt-ref 0 -c:v libvpx $3.webm 
-}
-
-#Notable mentions
-
-* https://github.com/ekisu/mpv-webm
-
-* https://github.com/Kagami/webm.py
-
-# If using webm.py a good line to get a high quality video would be
-
-# (assuming you have it in your path)
-webm -i virgin.mp4 -l 40 chad.webm #this will produce a vp9 webm with decent image quality
-</code></pre>
-</div>
-<h1 style="text-align:center;">VS</h1>
-<div class="box">
-<h4>Virgin</h4>
-<img src="/images/virgin.png" style="float:left;width:150px;" alt="gigachad">
-<ul>
-   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a></li>
-   <li><a href="https://gitgud.io/nixx/WebMConverter">WebMConverter by nixx!</a></li>
-</ul>
-</div>
-@endsection
-
diff --git a/resources/views/layout69/about.blade.php b/resources/views/layout69/about.blade.php
deleted file mode 100644
index 621289c..0000000
--- a/resources/views/layout69/about.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-@extends('profilelayout')
-@section('content')
-{!!$blah!!}
-@include('footer')
-@endsection
-
diff --git a/resources/views/layout69/apply-down.blade.php b/resources/views/layout69/apply-down.blade.php
deleted file mode 100644
index 681884a..0000000
--- a/resources/views/layout69/apply-down.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-@include('partials.flash')
-
-user limit reached 6969
-
-@endsection
diff --git a/resources/views/layout69/apply.blade.php b/resources/views/layout69/apply.blade.php
deleted file mode 100644
index 91686ab..0000000
--- a/resources/views/layout69/apply.blade.php
+++ /dev/null
@@ -1 +0,0 @@
- closed, come back later
diff --git a/resources/views/layout69/apply_open.blade.php b/resources/views/layout69/apply_open.blade.php
deleted file mode 100644
index ad9fc81..0000000
--- a/resources/views/layout69/apply_open.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-@extends('layout')
-@section('content')
-@include('partials.flash')
-    <div class="page-header">
-	<h5>Register your w0bm.com Account</h5>
-<p style="color:red;">Note: If you ever lose your password you are fucked, we will <b>NOT</b> reset it. To prevent this not only on w0bm.com but evrywhere we highly recommend the usage of a password manager such as <a href="https://keepassxc.org/">KeePassXC</a></p>
-<p>Being a member of w0bm.com is <b>NOT</b> a right, it's privilege which can be revoked at any point in time.</p>
-    </div>
-    <div class="register">
-        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-            {!! csrf_field() !!}
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email | Must be valid! Confirmation will be sent out']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                        {!!captcha_img('mini')!!} <input class="form-control" type="text" name="captcha" placeholder="Verify Captcha">
-            </div>
-	    <div class="form-group terms">
-		<div style="text-align: center;">
-		<p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-		</div>
-		<div class="">
-            <button type="submit" class="btn btn-primary">Register</button>
-                </div>
-            </div>
-        </form>
-    </div>
-<!--    <div class="form-group" style="
-		text-align: center;
-		background: rgba(0, 0, 0, 0.75);
-		margin-left: 5px;
-                margin-right: 5px;
-    				  ">
-	<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
-	<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
-    </div>
--->
-@endsection
-
diff --git a/resources/views/layout69/banned.blade.php b/resources/views/layout69/banned.blade.php
deleted file mode 100644
index 1fd4c74..0000000
--- a/resources/views/layout69/banned.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">YOU ARE BANNED! ;_;</h3>
-  </div>
-
-  <div class="panel-body">
-    <div style="border:0;" class="panel panel-default">
-      <div class="panel-body">
-        @if($perm)
-        <p class="banned">Reason: {{ $user->banreason }}</p>
-        <p>Your ban is permanent fool and will <b>NOT</b> expire!</p>
-        <video class="banwidth" autoplay loop src="https://w0bm.com/b/1515965864.webm">You are banned</video>
-        @else
-        <p class="banned">Reason: {{ $user->banreason }}</p>
-        <p class="banned">Your ban will expire in {{ $user->banend->diffForHumans(null, true) }}</p>
-        <video class="banwidth" autoplay loop src="//b/1515965864.webm">You are banned</video>
-        @endif
-      </div>
-    </div>
-    <p>If you think you were banned by accident or dindu nuffin to deserve the ban contact an administrator in the <a href="/irc">IRC</a></p>
-  </div>
-</div>
-@endsection
diff --git a/resources/views/layout69/blog.blade.php b/resources/views/layout69/blog.blade.php
deleted file mode 100644
index 3d6dab6..0000000
--- a/resources/views/layout69/blog.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Blog</h3>
- </div>
-
-<div class="box">
-<small>30.06.2023</small>
-<p>Dear friends and users of w0bm.com,</p>
-<p>We will turn 8 years old on the 13th of Semptember!</p>
-<p>Thank you for all the great years we had together, w0bm was from the very beginning a passion and fun project, mainly to learn a bit about hosting a website, when I first had this idea I didn't even know what "ssh" was, but it didn't stop me from learning about it.</p>
-<p>w0bm is a community driven project maintained for the last 8 years by the same small circle of friends, we had ups and downs but the project somehow kept going.</p>
-<p>I had some bad times myself where I just wanted to end this project but I always came back to the conclusion that it is something worth keeping and maintaining.</p>
-<p>We have some great content on this website, sadly also a lot of very bad content, but for now it is what it is.</p>
-<p>If it wasn't for you, our users and friends this website probably wouldn't have turned 8 years old.</p>
-<p>We thank everyone who particicpated and still participates in this community, we also thank everyone that helped us with the coding of this project!</p>
-<p>Let's hope for some more great years together :)</p>
-<p>For this matter, we invite everyone to our <a href="/irc">IRC</a> to celebrate with us the 8th birthday of w0bm, come and have a nice chat with us, stay if you like it!</p>
-<img src="logo.png" alt="The first official w0bm logo">
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout69/categories.blade.php b/resources/views/layout69/categories.blade.php
deleted file mode 100644
index 415a611..0000000
--- a/resources/views/layout69/categories.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h3>Categories</h3>
-    </div>
-    <div class="" id="categories">
-        @foreach($categories as $category)
-            <div id="category_box_{{$category->shortname}}" class="col-sm-6 col-md-4 category">
-                <div class="thumbnail">
-                    <img src="{{ asset('/images/cat/' . $category->shortname . '.webp') }}" alt="{{$category->name}}">
-                    <div class="caption">
-                        <h3>{{$category->name}} <small>{{$category->videos()->count()}}</small></h3>
-                        <p>{{$category->description}}</p>
-                        <p><a href="{{$category->shortname}}" class="btn btn-primary" role="button">View</a></p>
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-@endsection
diff --git a/resources/views/layout69/close.sh b/resources/views/layout69/close.sh
deleted file mode 100644
index 91e778e..0000000
--- a/resources/views/layout69/close.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/w0bm.com/resources/views/
-ln -sf registerclosed.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout69/comments.blade.php b/resources/views/layout69/comments.blade.php
deleted file mode 100644
index 9d93c55..0000000
--- a/resources/views/layout69/comments.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.profileheader')
-@include('partials.comlist')
-<h3>Comments</h3>
-@if(Auth::check())
-<div class="row jkh">
-    <div class="col-md" id="list">
-        <div class="spinner">
-            <div class="cube1"></div>
-            <div class="cube2"></div>
-        </div>
-    </div>
-    <!--<div class="col-md-6" id="message"><h4>Select a comment to display content</h4></div>-->
-</div>
-
-@else
-<div class="row jkh">
-        <i>Not logged in. Please log in to view comments!</i>
-</div>
-@endif
-@endsection
-
diff --git a/resources/views/layout69/contact.blade.php b/resources/views/layout69/contact.blade.php
deleted file mode 100644
index 0f680e6..0000000
--- a/resources/views/layout69/contact.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Contact</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<p>
-  For anything w0bm related you can either reach us via email: <code>admin@w0bm.com</code> or via our <a href="/irc">IRC</a>
-</p>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout69/deleted.blade.php b/resources/views/layout69/deleted.blade.php
deleted file mode 100644
index 6b08e1d..0000000
--- a/resources/views/layout69/deleted.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-@extends('layout')
-@section('content')
-<h5>Sorry, this video is unavailable at the moment!</h5>
-<img src="/images/404-video.png">
-<p>Possible reasons: Your video was shit, broke a rule or the ID you tried to watch does not even exist (yet)</p>
-<p>Go <a href="/">back</a> to the normal rotation</p>
-
-@endsection
diff --git a/resources/views/layout69/emails/activation.blade.php b/resources/views/layout69/emails/activation.blade.php
deleted file mode 100644
index e66f02f..0000000
--- a/resources/views/layout69/emails/activation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Hello {{$username}}</h3>
-<p>Welcome to <a href="https://w0bm.com">w0bm.com</a>.</p>
-<p>To activate your account please click this <a href="https://w0bm.com/activate/{{$activation_token}}">link</a>.</p>
diff --git a/resources/views/layout69/emails/report.blade.php b/resources/views/layout69/emails/report.blade.php
deleted file mode 100644
index 6baf76c..0000000
--- a/resources/views/layout69/emails/report.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-
-  <div style="width:100%;font-family:verdana;">
-
-    <h1>webm got reported!</h1>
-
-    <div>
-      <b>Link:</b>
-      <a href="{{$videoURL}}">{{$videoURL}}</a>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%;border:1px solid black;border-collapse:collapse;">
-        <thead>
-          <tr style="border:1px solid black; padding:5px;">
-            <th style="background-color:#bbbbbb;border-right:1px solid black;">Report Reasons</th>
-            <th style="background-color:#bbbbbb;">Report Text</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td style="padding:10px;border-right:1px solid #bbbbbb;">
-              <ul>
-                {!! $reportReasons !!}
-              </ul>
-            </td>
-            <td style="padding:10px;">
-              {{$reportText}}
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%; border-collapse:collapse;border:1px solid black;">
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;width:200px;">Username</th>
-          <td>{!! $username !!}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Time reported</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">IP:</th>
-          <td></td>
-        </tr>-->
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video ID</th>
-          <td>{{$videoID}}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Title</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Tags</th>
-          <td></td>
-        </tr>-->
-      </table>
-    </div>
-
-    <br>
-    <hr>
-
-    <!--
-    <div>
-      <h3>Debug Output:</h3>
-      <div style="color:green;font-family:consolas;background-color:black;">
-        <pre>
-          {{$debugOutput}}
-        </pre>
-      </div>
-    </div>
-    -->
-
-  </div>
-
-
-</html>
diff --git a/resources/views/layout69/errors/404.blade.php b/resources/views/layout69/errors/404.blade.php
deleted file mode 100644
index 28fd198..0000000
--- a/resources/views/layout69/errors/404.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="notfound">
-<h1>404 - NOT FOUND</h1>
-<img id="notfound-img" src="/404.gif">
-</div>
-@endsection
diff --git a/resources/views/layout69/errors/500.blade.php b/resources/views/layout69/errors/500.blade.php
deleted file mode 100644
index fc5e5cd..0000000
--- a/resources/views/layout69/errors/500.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<style>
-.sf-reset .block > pre {
-    background-color: #000000;
-    padding: 10px 28px;
-    margin-bottom: 20px;
-    -webkit-border-bottom-right-radius: 0;
-    -webkit-border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    border-bottom: 1px solid #1faeac;
-    border-right: 1px solid #1faeac;
-    border-left: 1px solid #1faeac;
-    border-top: 1px solid #1faeac;
-    word-wrap: break-word;
-    color: green;
-}
-</style>
-
-	<h5>Oh shit! Something went wrong!</h5>
-        <div id="sf-resetcontent" class="sf-reset box">
-		<h6>Please don't send this fucking text to an admin, we have other problems.</h6>
-            <?php
-                $iv = openssl_random_pseudo_bytes(16);
-            ?>
-            @if(!env('APP_DEBUG'))
-            <div class="block">
-                {{bin2hex($iv)}}<br>
-                {{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
-            </div>
-            @else
-            <div class="block">
-                <pre>{{$exception}}</pre>
-            </div>
-            @endif
-
-        </div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout69/errors/503.blade.php b/resources/views/layout69/errors/503.blade.php
deleted file mode 100644
index 4f63d68..0000000
--- a/resources/views/layout69/errors/503.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-	<title>Please Stand By we are just fucking this up</title>
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-		font-family: 'Lato';
-		background-color: #161618;
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Short maintenance, brb!</div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/layout69/footer.blade.php b/resources/views/layout69/footer.blade.php
deleted file mode 100644
index bff5b03..0000000
--- a/resources/views/layout69/footer.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<nav class="navbar-fixed-bottom">
-  <div class="container futter">
-  @if(auth()->check())<a href="/about">About</a> | @endif<a href="/rules">Rules</a> | <a href="/contact">Contact</a> | <a href="/privacy">Privacy</a>@if(auth()->check()) | <a href="/stats">Stats</a>@endif
-    <p>Inspired by <a href="http://z0r.de">z0r.de</a> | © 2015 – {{ date('Y') }} w0bm.com</p>
-  </div>
-</nav>
diff --git a/resources/views/layout69/footertwo.blade.php b/resources/views/layout69/footertwo.blade.php
deleted file mode 100644
index 3a0c81c..0000000
--- a/resources/views/layout69/footertwo.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<div style="visibility: hidden;" class="footer">
-  <div class="vidinfo_topper">
-				<span class="videoinfo_top">
-            	@if($video->videotitle)
-				[ <b>{{$video->videotitle}}</b> ]
-					@else
-					[ <b> / </b> ]
-					@endif
-				 uploaded by <a class="{{ $video->user->username }}" style="color: white" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
-						
-			<button title="Toggle comments" class="hidden-xs toggle-comments" id="toggle"><i class="fa fa-comments"></i> <span id="commentAmount">{{ $video->comments()->count() }}</span></button>	
-						<button title="Toggle Background" class="hidden-xs bg-toggle" id="togglebg"><i style="color:#fff200;" class="fa fa-adjust"></i></button>
-						<button class="copylink" data-clipboard-text="{{url($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
-						<div class="dropdown">
-							<button class="fa fa-download"
-								id="dlbutton"
-                                style="cursor: pointer"
-                                data-toggle="popover"
-                                data-placement="top"
-								data-trigger="hover"
-								data-html="true"
-                                title="Download"
-								data-content="
-									<div class='downloadvid'>
-									<ul class='downloadlist'>
-									<li><a class='file_size' href='{{ '/b/' . $video->file }}' download>WebM</a> <span class='filesize'> ({{HumanReadable::bytesToHuman($video->filesize()) }})</span></li>
-									</ul>
-									</div>"
-							</button>
-						</div>
-						@if(auth()->check())
-						<button title="Report WebM" id="webm_report" class="webm-report" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-warning fa-md"></i></button>
-						@endif
-
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}"><i style="color:#ff0094;" class="fa fa-heart"></i></a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}"><i style="color:#ff0094;" class="fa fa-heart-o"></i></a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}"><i class="fa fa-heart-o"></i></a>
-						@endif
-						</div>
-						</button>
-						<button class="fa fa-info-circle"
-							id="infobox"
-							style="cursor: pointer"
-							data-toggle="popover"
-							data-placement="top"
-							data-trigger="hover"
-							data-html="true"
-							title="Information"
-							data-content="@include('popover-content')">
-						</button>
-				</span>
-			</div>
-</div>
diff --git a/resources/views/layout69/git.blade.php b/resources/views/layout69/git.blade.php
deleted file mode 100644
index 29d0cae..0000000
--- a/resources/views/layout69/git.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<?php
-
-function getLatestCommit() {
-    $latestCommit = shell_exec('git log -n 1');
-    $getcommitID = substr($latestCommit,0,48);
-    $commitID = substr($getcommitID, 7);
-    echo "<div class='box'>";
-    echo "<span>Latest commit</span>";
-    //echo "<h4><a style='color:white' href='https://git.lat/w0bm/w0bm/commit/$commitID' target='_blank'>$commitID</a></h4>";
-    echo "<pre>$latestCommit</pre>";
-    echo "</div>";
-}
-
-function getLastTenCommits() {
-    $lastTenCommits = shell_exec('git log -n 10');
-    echo "<div class='box'>";
-    echo "<span>Last 10 Commits</span>";
-    echo "<pre>$lastTenCommits</pre>";
-    echo "</div>";
-}
-
-getLatestCommit();
-getLastTenCommits()
-?>
-
-@endsection
-@include('footer')
\ No newline at end of file
diff --git a/resources/views/layout69/help.blade.php b/resources/views/layout69/help.blade.php
deleted file mode 100644
index 6ec5ce1..0000000
--- a/resources/views/layout69/help.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="page-header">
-        <h2></h2>
-</div>
-@endsection
-
diff --git a/resources/views/layout69/index.blade.php b/resources/views/layout69/index.blade.php
deleted file mode 100644
index 6f9d585..0000000
--- a/resources/views/layout69/index.blade.php
+++ /dev/null
@@ -1,77 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="page-header">
-	<h3 id="index">Index <small>{{ $number_of_results }} results</small></h3>
-        <form method="get">
-	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    <table class="table table-hover table-condensed">
-        <thead>
-        <tr>
-	    <th>ID</th>
-	    <th>Video Title</th>
-            <th>Artist</th>
-            <th>Songtitle</th>
-            <th class="hidden-xs">Video Source</th>
-            <th>Category</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <tr data-thumb="{{$thumb}}" class="indexedit" data-vid="{{$video->id}}">
-                <td>
-                    @if($edit = auth()->check() && auth()->user()->can('edit_video'))
-                        <form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
-                    @endif
-                    <span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
-                    @if($edit)
-                        <input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
-                    @endif
-		</td>
-                <td>
-                    <span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="videotitle" value="{{$video->videotitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vinterpret">{{$video->interpret or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="interpret" value="{{$video->interpret or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vsongtitle">{{$video->songtitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="songtitle" value="{{$video->songtitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td class="hidden-xs">
-                    <span class="vinfo vimgsource">{{$video->imgsource or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="imgsource" value="{{$video->imgsource or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vcategory"><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></span>
-                    @if($edit)
-                        <select class="form-control" name="category" form="edit_{{$video->id}}">
-                            @foreach($categories as $cat)
-                                <option value="{{$cat->id}}" @if($cat->shortname === $video->category->shortname) selected @endif>{{$cat->name}}</option>
-                            @endforeach
-                        </select>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <div class="page" style="position:relative;bottom:5px;">
-        {!! $videos->render() !!}
-    </div>
-@endsection
diff --git a/resources/views/layout69/irc.blade.php b/resources/views/layout69/irc.blade.php
deleted file mode 100644
index 1875253..0000000
--- a/resources/views/layout69/irc.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>IRC</h3>
- </div>
-
-<div class="irc-content">
-{{--<div class="webchat">
-	@if(auth()->check())
-	<iframe src="https://n0xy.net/webirc/?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe> 
-	@else
-	<iframe src="https://n0xy.net/webirc/?join=%23w0bm&"></iframe>
-	@endif
-</div>--}}
-<div class="irc-matrix-info">
-	<h5>IRC</h5>
-<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
-<p><a href="https://n0xy.net/webirc/?join=%23w0bm" target="about_blank">n0xy.net Webirc</a></p>
-<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
-</div>
-@include('footer')
-@endsection
-
diff --git a/resources/views/layout69/layout.blade.php b/resources/views/layout69/layout.blade.php
deleted file mode 100644
index a4f80c6..0000000
--- a/resources/views/layout69/layout.blade.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<!--RENDERED IN {{ (microtime(true) - LARAVEL_START) }} SECONDS-->
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="theme-color" content="#161618">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1">
-    <meta charset="UTF-8">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <meta name="robots" content="noindex">
-    @if(auth()->check())<meta name="Description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
-    <meta name="description" content="@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">
-    <meta property="og:site_name" content="w0bm.com" />
-    <meta property="og:title" content="@if(isset($video)){{$video->videotitle}}@endif">
-    <meta name="twitter:card" content="summary_large_image" />
-    @if(auth()->check())<meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
-    @if(isset($video))
-	@if($video->isSfw())
-            <meta property="og:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
-	    <meta name="twitter:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
-	@else
-            <meta property="og:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
-	    <meta name="twitter:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
-	@endif
-    @endif
-
-    @if(auth()->check())<meta property="og:video" content="@if(isset($video))/b/{{ $video->file }} @endif">@endif
-    <meta property="og:url" content="@if(isset($video))/{{ $video->id }}@endif">
-    <meta property="og:video:type" content="video/webm">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="favicon" href="favicon.ico" type="image/ico">
-    <link rel="stylesheet" href="/css/style.css">
-    <link rel="stylesheet" href="/css/w0bmfonts.css">
-    <link rel="stylesheet" href="/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" href="/css/video-js.min.css">
-    <link rel="stylesheet" href="/css/vjsnew.css">
-    <link rel="stylesheet" href="/css/w0bmcustom.css?v={{ filemtime("css/w0bmcustom.css") }}">
-    @if(auth()->check())
-    <link rel="alternate stylesheet" href="/css/w0bm_override.css?v={{ filemtime("css/w0bm_override.css") }}" title="DARK">
-    <link rel="alternate stylesheet" href="/css/chilledblue.css?v={{ filemtime("css/chilledblue.css") }}" title="Chilledblue">
-    <link rel="alternate stylesheet" href="/css/xayd.css?v={{ filemtime("css/xayd.css") }}" title="Xayd">
-    <link rel="alternate stylesheet" href="/css/glitch.css?v={{ filemtime("css/glitch.css") }}" title="Glitch">
-    <link rel="alternate stylesheet" href="/css/epilepsie.css?v={{ filemtime("css/epilepsie.css") }}" title="Epilepsie">
-    <link rel="stylesheet"  href="/css/w0bmvision.css">
-    <script src="/js/styleswitcher.js"></script>
-    @else
-    @endif
-</head>
-<body>
-@if(auth()->check())
-@include('partials.report')
-    @include('partials.filterselect')
-    @if(isset($video) && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id))
-        @include('partials.frontendedit')
-	@endif
-@endif
-@if(auth()->check())
-<canvas class="hidden-xs" id="bg"></canvas>
-@else
-<!-- placeholder? -->
-@endif
-
-@include('partials.navigation')
-
-<div class="wrapper">
-    @yield('aside')
-    <div class="LooLOut" style="width: auto; overflow: hidden; position: relative;">
-	<noscript><div class="no-js-mode" style="position: fixed;bottom: 0;right: 0;">nojs</div></noscript>
-    @include('footertwo')
-        <div class=" container">
-	    @yield('content')
-	</div>
-
-    </div>
-</div>
-@if(auth()->check())
-<script src="/js/jquery.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/bootstrap-tagsinput.min.js"></script>
-<script src="/js/isotope.pkgd.min.js"></script>
-<script src="/js/imagesloaded.pkgd.min.js"></script>
-<script src="/js/jquery.timeago.js"></script>
-<script src="/js/jquery.detectmobilebrowser.js"></script>
-<script src="/js/video.min.js"></script>
-<script src="/js/simplebar.js"></script>
-<script src="/js/clipboard.min.js"></script>
-<script>
-var clipboard = new ClipboardJS('.copylink');
-
-clipboard.on('success', function(e) {
-    console.info('Action:', e.action);
-    console.info('Text:', e.text);
-    console.info('Trigger:', e.trigger);
-
-    e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
-    console.error('Action:', e.action);
-    console.error('Trigger:', e.trigger);
-});
-</script>
-<script src="/js/w0bmscript.js?v={{ filemtime("js/w0bmscript.js") }}"></script>
-@else
-
-@endif
-@if(isset($video))
-@else
-@endif
-<p style="color: red">development version</p>
-</body>
-</html>
diff --git a/resources/views/layout69/login.blade.php b/resources/views/layout69/login.blade.php
deleted file mode 100644
index 05f87ca..0000000
--- a/resources/views/layout69/login.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@extends('layout')
-@section('content')
-@include('partials.flash')
-<div class="centered">
-        <div class="modal-content col-md-5">
-            <div class="modal-header">
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            @include('partials.flash')
-            <div class="login_wrapper">
-              <div class="col-md">
-          <form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-            {!! csrf_field() !!}
-                       <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                       <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                       {{-- {!!captcha_img('login')!!} <input class="form-control" type="text" name="captcha" placeholder="Verify Captcha"> --}}
-                       <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-          </form>
-        </div>
-        </div>
-        <div class="modal-footer">
-          <a href="/contact">Contact</a> | <a href="/irc">IRC</a>
-        </div>
-      </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout69/main.blade.php b/resources/views/layout69/main.blade.php
deleted file mode 100644
index fe0faaa..0000000
--- a/resources/views/layout69/main.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="page-header">
-    	    <div class="page">
-        {!! $videos->render() !!}
-        <form method="get">
-	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    </div>
-
-    <div class="items">
-    	@foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <div class="main-item">
-            <a href="/{{$video->id}}">
-            {{-- MUSS UNBEDINGT NOCH ANGEPASST WERDEN!!! --}}
-            @if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
-    			<img src="/thumbs/beta/{{$thumb}}.png">
-				@else
-    			<img src="/small_404.gif" class="nothumb">
-			@endif
-			</a>
-			</div>
-        @endforeach
-    </div>
-@endsection
diff --git a/resources/views/layout69/marder.blade.php b/resources/views/layout69/marder.blade.php
deleted file mode 100644
index 7d53282..0000000
--- a/resources/views/layout69/marder.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<h3>Hello everyone!</h3>
-
-<div class="box">
-<img src="https://marderchen.totally.rip/marderchen.lima-city.de/marderchen.gif" style="float: right;" alt="">
-  <p>Today we have sad news, a beloved friend of us and one of our most unique members died.</p>
-  <p>Some of you may remember his unique and interesting and somewhat chaotic but cool videos.</p>
-  <p>Today we mourn the loss of our friend marderchen.</p>
-  <p>We sincerely hope you are at a better place now.</p>
-  <p>We thank you for the great time we had with you, you inspired many of us and brought joy to the IRC and to the website, you will be missed old friend.</p>
-
-  <p>To say it in your words: =^_^= MEOW</p>
-
-  <p>We have archived his long gone website, make sure to check it out! It is absolutely wild (only available in German)</p>
-
-  <p><a href="https://marderchen.totally.rip/marderchen.lima-city.de/index.html">https://marderchen.totally.rip/marderchen.lima-city.de/index.html</a></p>
-
-  <p>Also make sure to check out his uploads <a href="https://w0bm.com/main?q=marderchen">https://w0bm.com/main?q=marderchen</a> and enjoy it.</p>
-
-  <p><i>- w0bm staff</i></p>
-</div>
-@endsection
-
diff --git a/resources/views/layout69/matrix.blade.php b/resources/views/layout69/matrix.blade.php
deleted file mode 100644
index 911005c..0000000
--- a/resources/views/layout69/matrix.blade.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<style type="text/css">
-    * {margin: 0; padding: 0}
-body {background: #000;overflow:hidden;}
-canvas {display: block;}
-.matrix {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    font-family: monospace;
-}
-.matrix > .inner {
-    position: absolute;
-    color: white;
-    top: 40%;
-}
-.inner {
-    background: #000000b5;
-    padding: 5px;
-}
-
-#bluepill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: blue;
-    background: blue;
-    border-radius: 5px;
-}
-
-#redpill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: red;
-    background: red;
-    border-radius: 5px;
-}
-</style>
-<div class="matrix">
-    <div class="inner">
-    <h3><p><b><i>Are you a slave {{Auth::user()->username}} ?</i></b></p></h3>
-    <br>
-    <p>Take control over your chats, leave Discord for good!</p>
-    <p>Join [matrix] today!</p>
-    <p>Why should you consider either running a [matrix] synapse yourself or start using someone elses:</p>
-    <p>Discord is evil, it took away the freedom you and I deserve, it makes you a slave to their services,<br> makes you obey their rules, includes you in a unwanted botnet where you have no freedom at all!</p>
-    <p><a target="_blank" href="/22424">Why you shouldn't use Discord</a></p>
-    <p>It's time to break free {{Auth::user()->username}}</p>
-    <p>Choose your fate</p>
-    <span id="bluepill"><a href="https://spyware.neocities.org/articles/discord.html"></a></span> <span id="redpill"><a href="https://github.com/matrix-org/synapse" target="_blank"></a></span>
-    <p><code>#w0bm:totally.rip</code></p>
-    <br>
-    <p><small>We are happy to help if you have any trouble setting up your synapse</small></p>
-</div>
-</div>
-<canvas></canvas>
-<audio src="/clubbed.mp3" autoplay loop></audio>
-<script type="text/javascript">
-    // Initialising the canvas
-var canvas = document.querySelector('canvas'),
-    ctx = canvas.getContext('2d');
-
-// Setting the width and height of the canvas
-canvas.width = window.innerWidth;
-canvas.height = window.innerHeight;
-
-// Setting up the letters
-var letters = 'ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ';
-letters = letters.split('');
-
-// Setting up the columns
-var fontSize = 10,
-    columns = canvas.width / fontSize;
-
-// Setting up the drops
-var drops = [];
-for (var i = 0; i < columns; i++) {
-  drops[i] = 1;
-}
-
-// Setting up the draw function
-function draw() {
-  ctx.fillStyle = 'rgba(0, 0, 0, .1)';
-  ctx.fillRect(0, 0, canvas.width, canvas.height);
-  for (var i = 0; i < drops.length; i++) {
-    var text = letters[Math.floor(Math.random() * letters.length)];
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(text, i * fontSize, drops[i] * fontSize);
-    drops[i]++;
-    if (drops[i] * fontSize > canvas.height && Math.random() > .95) {
-      drops[i] = 0;
-    }
-  }
-}
-
-// Loop the animation
-setInterval(draw, 33);
-</script>
diff --git a/resources/views/layout69/messages.blade.php b/resources/views/layout69/messages.blade.php
deleted file mode 100644
index af58dd1..0000000
--- a/resources/views/layout69/messages.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.msglist')
-	<div class="page-header">
-        <h3>Messages</h3>
-    </div>
-    <div class="">
-        <div class="col-md-6" id="list">
-            <div class="spinner">
-                <div class="cube1"></div>
-                <div class="cube2"></div>
-            </div>
-        </div>
-        <div class="col-md-6" id="message"><h4>Select a message to display content</h4></div>
-    </div>
-@endsection
diff --git a/resources/views/layout69/messages/commentanswer.blade.php b/resources/views/layout69/messages/commentanswer.blade.php
deleted file mode 100644
index 5fa7616..0000000
--- a/resources/views/layout69/messages/commentanswer.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout69/messages/commentmention.blade.php b/resources/views/layout69/messages/commentmention.blade.php
deleted file mode 100644
index ea15625..0000000
--- a/resources/views/layout69/messages/commentmention.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout69/messages/commentpreview.blade.php b/resources/views/layout69/messages/commentpreview.blade.php
deleted file mode 100644
index 46f257e..0000000
--- a/resources/views/layout69/messages/commentpreview.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-body">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="right" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small></div>
-</div>
diff --git a/resources/views/layout69/messages/moderation/commentdelete.blade.php b/resources/views/layout69/messages/moderation/commentdelete.blade.php
deleted file mode 100644
index 734b4b6..0000000
--- a/resources/views/layout69/messages/moderation/commentdelete.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator deleted your comment.</h3>
-<p>A moderator deleted your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout69/messages/moderation/commentrestore.blade.php b/resources/views/layout69/messages/moderation/commentrestore.blade.php
deleted file mode 100644
index a8cf012..0000000
--- a/resources/views/layout69/messages/moderation/commentrestore.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator restored your comment.</h3>
-<p>A moderator restored your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout69/messages/moderation/videodelete.blade.php b/resources/views/layout69/messages/moderation/videodelete.blade.php
deleted file mode 100644
index 6a6568b..0000000
--- a/resources/views/layout69/messages/moderation/videodelete.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<h3>A moderator deleted your video.</h3>
-<p>A moderator deleted your video with the ID {{$video->id}}</p>
-<span style="font-weight:bold;">Video Info:</span>
-<ul>
-    @if(isset($videoinfo['artist'])) <li><span style="font-weight:bold;">Artist:</span> {{ $videoinfo['artist'] }}</li> @endif
-    @if(isset($videoinfo['songtitle'])) <li><span style="font-weight:bold;">Songtitle:</span> {{ $videoinfo['songtitle'] }}</li> @endif
-    @if(isset($videoinfo['video_source'])) <li><span style="font-weight:bold;">Video Source:</span> {{ $videoinfo['video_source'] }}</li> @endif
-    <li><span style="font-weight:bold;">Category:</span> {{ $videoinfo['category'] }}</li>
-</ul>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
\ No newline at end of file
diff --git a/resources/views/layout69/messages/videocomment.blade.php b/resources/views/layout69/messages/videocomment.blade.php
deleted file mode 100644
index 48e43c4..0000000
--- a/resources/views/layout69/messages/videocomment.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>New comment on your video <a href="{{url($video->id)}}">/{{$video->id}}</a></h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> made a comment on your video.</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout69/open.sh b/resources/views/layout69/open.sh
deleted file mode 100644
index 0f713e9..0000000
--- a/resources/views/layout69/open.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/devw0bm.com/resources/views/
-ln -sf registeropen.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout69/partials/banmenu.blade.php b/resources/views/layout69/partials/banmenu.blade.php
deleted file mode 100644
index a1607d0..0000000
--- a/resources/views/layout69/partials/banmenu.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<form id="banmenu" method="POST" action="/api/user/{{$user->username}}/ban">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="banmenumodal" tabindex="-1" role="dialog" aria-labelledby="Ban user">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="filterModalTitle">Ban user</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="reason">Reason</label>
-                        <input class="form-control" type="text" name="reason" id="reason" placeholder="Reason">
-                    </div>
-                    <div class="form-group">
-                        <label for="duration">Duration</label>
-                        <input class="form-control" type="text" name="duration" id="duration" placeholder="Duration (-1 = permanent)">
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                    <input type="submit" class="btn btn-danger" value="BAN!">
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/resources/views/layout69/partials/comlist.php b/resources/views/layout69/partials/comlist.php
deleted file mode 100644
index 8c0f191..0000000
--- a/resources/views/layout69/partials/comlist.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<script id="comlist" type="text/x-handlebars-template">
-            {{#each data as |value key|}}
-            <div class="panel panel-default">
-                <div class="panel-body" style="word-wrap: break-word;" data-index="{{key}}" data-id="{{id}}">{{{rendered_view}}}</div>
-                <div class="panel-footer">Video: <a href="/{{video_id}}">/{{video_id}}</a> | <time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-            </div>
-            {{else}}
-            <div class="list-group-item">No comments</div>
-            {{/each}}
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-</script>
\ No newline at end of file
diff --git a/resources/views/layout69/partials/comment.blade.php b/resources/views/layout69/partials/comment.blade.php
deleted file mode 100644
index a4d0d5e..0000000
--- a/resources/views/layout69/partials/comment.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="panel @if($del = !is_null($comment->deleted_at)) panel-danger @else panel-default @endif" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
-    <div class="panel-body" author="{{$comment->user->username}}">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a class="{{$comment->user->username}}" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small>
-        @if($mod)
-            @if($del)
-                <a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
-            @else
-                <a class="delete_comment" href="#" onclick="deleteComment($(this))">[del]</a>
-                <a class="edit_comment" href="#" onclick="editComment($(this))">[edit]</a>
-            @endif
-        @endif
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/commentform.blade.php b/resources/views/layout69/partials/commentform.blade.php
deleted file mode 100644
index 7855f52..0000000
--- a/resources/views/layout69/partials/commentform.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="commentForm" class="hidden-xs">
-<form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-    {!! csrf_field() !!}
-    <div class="sees panel panel-default">
-        <div class="fickfackfoo panel-body">
-            {!! Form::textarea('comment', null, ['placeholder' => 'Write something', 'id' => 'cinput', 'class' => 'form-control', 'required' => 'required']) !!}
-        </div>
-        <div class="commbordersoos">
-    <div id="comment_tools" class="commentform-panel-footer"><button type="submit" class="btn btn-primary btn-sm">Post</button>
-        <div class="textmodifierss">
-                   <a style="font-size: 14px;" class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-       <a style="font-size: 14px;" class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-       <a style="font-size: 14px;" class="anim" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-       <a style="font-size: 14px; color: white;" class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
-    <div class="emoji-shit">
-    <div class="header"><span>😂</span></div>
-    </div>
-    </div>
-    </div>
-    </div>
-    <div style="display: none;" id="parent" class="emojis-box">
-        <div id="child" class="emojis">
-            <?php
-                $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.webp', GLOB_BRACE);
-                $files = array_map(function ($f) { return pathinfo($f); }, $files);
-            ?>
-
-            @foreach ($files as $file)
-                <a class="w0bm_emoji_anchor" title=":{{$file['filename']}}:" href="javascript:;" onclick="formatTextEmoji ('{{$file['filename']}}');"><img class="comment_emoji_small" loading="lazy" src="//w0bm.com/images/comments/{{$file['basename']}}"></a>
-            @endforeach
-        </div>
-    </div>
-    </div>
-</form>
-</div>
diff --git a/resources/views/layout69/partials/comments.blade.php b/resources/views/layout69/partials/comments.blade.php
deleted file mode 100644
index 6137b33..0000000
--- a/resources/views/layout69/partials/comments.blade.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--<div id="motd" class="panel panel-info hidden-xs">
-    @if(null === $banner)
-	<div class="panel-body motd">
-		<span style="color:red;">f0ck you!</span>
-		<iframe style="width: 342px; height: 50px; border: 0!important;display: flex;"src="/0x40"></iframe>
-	</div>
-    @else
-        <a href="{{ $banner->url }}" target="_blank" rel="noopener">
-            <div style="height: 50px; background-image:url('{{ $banner->image }}')" class="panel-body motd">
-            </div>
-        </a>
-	@endif
-</div>-->
-{{-- <div id="nutti">
-	<p>Please check out the overhauled <a href="https://w0bm.com/api/user/layout?layout=2">Njum</a> Layout and give me some feedback!</p>
-</div> --}}
-{{-- <div id="nutti">
-    <p>Next month w0bm turns 6 years old! Wouldn't be possible without all of you! Thanks</p>
-</div> --}}
-@if(Auth::check())
-@if($video->id == '30186')
-@include('partials.thread_closed')
-@else
-@include('partials.commentform')
-@endif
-@else
-@endif
-
-@if(Auth::check())
-<div id="comment_container_scrollable" class="comments hidden-xs">
-    <div class="commentwrapper">
-        <?php
-            if($mod = (Auth::check() && Auth::user()->can('delete_comment'))) $comments = $video->comments()->withTrashed()->get();
-            else $comments = $video->comments;
-        ?>
-        @if(count($comments) > 0)
-            @foreach($comments as $comment)
-                @include('partials.comment', ['comment' => $comment, 'mod' => $mod])
-            @endforeach
-        @else
-	    <div class="panel panel-default nocomments">
-                <div class="panel-body">
-                    No comments yet …<br />
-                </div>
-            </div>
-        @endif
-    </div>
-</div>
-@else
-<div class="comments hidden-xs">
-	<div class="commentwrapper">
-		<div class="panel  panel-default ">
-        		<div class="panel-body">
-        			<p class="comment"><i>Please log in to view comments</i></p>
-			</div>
-			<div class="panel-footer">by w0bm ∞</div>
-		</div>
-	</div>
-</div>
-@endif
diff --git a/resources/views/layout69/partials/filterselect.blade.php b/resources/views/layout69/partials/filterselect.blade.php
deleted file mode 100644
index 244a830..0000000
--- a/resources/views/layout69/partials/filterselect.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-		<h4 class="modal-title" id="filterModalTitle">Add Tags to filter out</h4>
-		<p>When entering a tag you will no longer see videos with that tag.</p>
-            </div>
-            <div class="modal-body">
-                <input id="filter" type="text" class="form-control" placeholder="Input tags…" name="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">
-                {{--<input type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                <button href="/filter" type="submit" id="submitfilter" class="btn btn-primary" value="Save">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/flash.blade.php b/resources/views/layout69/partials/flash.blade.php
deleted file mode 100644
index f15929e..0000000
--- a/resources/views/layout69/partials/flash.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="flashcontainer">
-    <div class="flash-inner">
-        @if($errors->count() > 0)
-            @foreach($errors->all() as $error)
-                <div class="alert alert-danger alert-dismissable" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    {{ $error }}
-                </div>
-            @endforeach
-        @endif
-        @if(Session::has('error'))
-            <div class="alert alert-danger alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('error') }}
-            </div>
-        @endif
-        @if(Session::has('success'))
-            <div class="alert alert-success alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('success') }}
-            </div>
-        @endif
-        @if(Session::has('info'))
-            <div class="alert alert-info alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('info') }}
-            </div>
-        @endif
-        @if(Session::has('warning'))
-            <div class="alert alert-warning alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('warning') }}
-            </div>
-        @endif
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/frontendedit.blade.php b/resources/views/layout69/partials/frontendedit.blade.php
deleted file mode 100644
index aa6f552..0000000
--- a/resources/views/layout69/partials/frontendedit.blade.php
+++ /dev/null
@@ -1,46 +0,0 @@
-@if(isset($video))
-    <form id="webmedit" method="POST" action="/index/{{$video->id}}">
-        {!! csrf_field() !!}
-        <div class="modal fade" id="webmeditmodal" tabindex="-1" role="dialog" aria-labelledby="Edit webm">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title" id="filterModalTitle">Edit webm</h4>
-                    </div>
-                    <div class="modal-body frontendeditmodal">
-                        <div class="form-group">
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Title</label>
-                            <input class="form-control" type="text" name="videotitle" id="videotitleedit" value="{{ $video->videotitle or ''}}" placeholder="Video Title">
-                        </div>
-                            <label for="interpretedit">Artist</label>
-                            <input class="form-control" type="text" name="interpret" id="interpretedit" value="{{ $video->interpret or ''}}" placeholder="Artist">
-                        </div>
-                        <div class="form-group">
-                            <label for="songtitleedit">Songtitle</label>
-                            <input class="form-control" type="text" name="songtitle" id="songtitleedit" value="{{ $video->songtitle or ''}}" placeholder="Songtitle">
-                        </div>
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Source</label>
-                            <input class="form-control" type="text" name="imgsource" id="imgsourceedit" value="{{ $video->imgsource or ''}}" placeholder="Video Source">
-
-                        </div>
-                        <div class="form-group">
-                            <label for="categoryselect">Category</label>
-                            <select class="form-control" name="category" id="categoryselect">
-                                @foreach(\App\Models\Category::all() as $category)
-                                <option value="{{$category->id}}" @if($video->category->id == $category->id) selected @endif>{{$category->name}}</option>
-                                @endforeach
-                            </select>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <input type="submit" class="btn btn-primary" value="Save">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-@endif
diff --git a/resources/views/layout69/partials/handlebars.php b/resources/views/layout69/partials/handlebars.php
deleted file mode 100644
index 3a70c75..0000000
--- a/resources/views/layout69/partials/handlebars.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="paginationtmpl" type="text/x-handlebars-template">
-    <nav class="mitte">
-        <ul class="pagination">
-            {{#paginate pagination type="first"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">First</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="previous"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&laquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="middle" limit="7"}}
-            <li {{#if active}}class="active"{{/if}}><a href="#" data-page="{{n}}">{{n}}</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="next"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&raquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="last"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">Last</a></li>
-            {{/paginate}}
-        </ul>
-    </nav>
-    <div class="clearfix"></div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout69/partials/header.blade.php b/resources/views/layout69/partials/header.blade.php
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout69/partials/layoutchanger.blade.php b/resources/views/layout69/partials/layoutchanger.blade.php
deleted file mode 100644
index 7a075bc..0000000
--- a/resources/views/layout69/partials/layoutchanger.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<li role="presentation" class="layoutChanger" id="layoutSwitcher">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Layout
-    </a>
-<ul class="dropdown-menu">
-    <div class="layoutblah">
-        <button class="layoutbutton" id="layout2">Njum</button>
-        <br> 
-        <button class="layoutbutton" id="layout3">z0mb</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout69/partials/loginmodal.blade.php b/resources/views/layout69/partials/loginmodal.blade.php
deleted file mode 100644
index b748734..0000000
--- a/resources/views/layout69/partials/loginmodal.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="modal fade" id="loginmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            
-            <div class="login_wrapper">
-            	<div class="col-md-9">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-
-		<div class="modal-footer">
-			<p>Registration has been disabled and will stay closed until further notice.</p>
-        	</div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/msglist.php b/resources/views/layout69/partials/msglist.php
deleted file mode 100644
index fbacfc0..0000000
--- a/resources/views/layout69/partials/msglist.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<script id="msglist" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Messages</h3> <button class="btn btn-primary pull-right readall" onclick="readAll()">Read all</button>
-        </div>
-
-        <div class="list-group" id="listitems">
-            {{#each data as |value key|}}
-            <a href="#" data-index="{{key}}" data-id="{{id}}" class="list-group-item {{#unless read}}list-group-item-info{{/unless}}">{{subject}}</a>
-            {{else}}
-            <div class="list-group-item">No messages</div>
-            {{/each}}
-        </div>
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-    </div>
-</script>
-
-<script id="msgtmpl" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{{subject}}</h3>
-        </div>
-        <div class="panel-body">
-            {{{content}}}
-        </div>
-        <div class="panel-footer"><time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-    </div>
-</script>
diff --git a/resources/views/layout69/partials/navigation.blade.php b/resources/views/layout69/partials/navigation.blade.php
deleted file mode 100644
index d56c94d..0000000
--- a/resources/views/layout69/partials/navigation.blade.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<nav class="navbar navbar-inverse navbar-static-top">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            @if(Auth::check())
-            <a class="navbar-brand" href="/main">
-        <img src="{{ asset('logo.svg') }}" alt="w0bm.com">
-        </a>
-            @else
-            <a class="navbar-brand" href="/">
-        <img src="{{ asset('logo.svg') }}" alt="w0bm.com">
-        </a>
-            @endif
-
-        </div>
-
-        <div class=" collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            @if(Auth::check())
-            <ul class="nav navbar-nav navbar-left">
-                <li><a href="{{url('categories')}}"><i class="fa fa-clone"></i><span class="hidden-sm"> Categories</span></a></li>
-                <li><a href="{{url('index')}}"><i class="fa fa-list"></i><span class="hidden-sm"> Index</span></a></li>
-        @include('partials.themechanger')
-        @endif
-        @if(Auth::check())
-        @include('partials.layoutchanger')
-        @endif
-                @include('partials.searchmodal')
-                <li><a href="#" data-toggle="modal" data-target="#searchmodal"><i class="fa fa-search"></i><span class="hidden-sm"> Find shit</span></a></li>
-	    </ul>
-            @if(Auth::check())
-                <ul class="nav navbar-nav navbar-right">
-		    <li><a href="{{url('messages')}}"><i class="fa fa-envelope"></i> <span class="badge message-badge">{{Auth::user()->messagesRecv()->unread()->count()}}</span></a></li>
-                    <li><a href="#" data-toggle="modal" data-target="#filterselectmodal"><i class="fa fa-filter"></i><span class="hidden-sm"> Filter</span></a></li>
-                    <li><a href="{{url('upload')}}"><i class="fa fa-cloud-upload"></i><span class="hidden-sm"> Upload</span></a></li>
-                    <li><a href="{{url('user', Auth::user()->username)}}/favs"><i class="fa fa-heart"></i></a></li>
-                    <li><a href="{{url('user', Auth::user()->username)}}"><i class="fa fa-user"></i> {{Auth::user()->username}}</a></li>
-                    <li><a href="{{url('logout')}}"><i class="fa fa-sign-out"></i><span class="hidden-sm"> Logout</span></a></li>
-                </ul>
-            @else
-		<!-- Hier war mal der Login Kot -->
-		<ul class="nav navbar-nav navbar-right">
-            @if(Auth::check())
-		<li><a href="#" data-toggle="modal" data-target="#loginmodal"><i class="fa fa-sign-in"></i> Login</a></li>
-		@include('partials.loginmodal')
-		</ul>
-        @endif
-            @endif
-        </div>
-    </div>
-</nav>
diff --git a/resources/views/layout69/partials/profileheader.blade.php b/resources/views/layout69/partials/profileheader.blade.php
deleted file mode 100644
index dccddb9..0000000
--- a/resources/views/layout69/partials/profileheader.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h3 class="{{ $user->username }}">{!! rtrim(e($user->username) . ' ' . $user->activeIcon()) !!} <small>ID: {{ $user->id }}</small> @if($user->disabled && isset($user->banend) && (Carbon\Carbon::now() <= $user->banend || 1 >= $user->banend->timestamp)) <span style="color: grey; font-size: 15px;">(@if(Carbon\Carbon::now() <= $user->banend)Ban expires in <time class="timeago" data-toggle="tooltip" title="{{ $user->banend }}+0000" datetime="{{ $user->banend }}+0000"></time>@else permanently banned @endif)</span>@endif</h3>
-<div class="admin-settings">
-@if(auth()->check() && auth()->user()->can('edit_user'))<span id="pannade"><a href="#" data-toggle="modal" data-target="#banmenumodal"><i style="color:red;" class=""></i>[ban user]</a></span>
-@endif
-</div>
-    <span id="jointime">Joined: <time class="timeago" datetime="{{ $user->created_at }}+0000" title="{{ $user->created_at }}+0000" data-toggle="tooltip"></time></span>
-<div class="profile-info">
-    <span id="count-upload"> <a href="/user/{{$user->username}}"> <i class="fa fa-cloud-upload"></i> {{ $user->uploads()->countScoped()->count() }} Uploads</a></span>
-
-    <span id="comments-user"> <a href="/user/{{$user->username}}/comments"><i class="fa fa-commenting"></i> {{ $user->comments()->count() }} Comments</a></span>
-
-    <span id="favs-user"><a href="/user/{{$user->username}}/favs/index"><i class="fa fa-heart"></i> {{ $user->favs()->countScoped()->count() }} Favorites</a></span>
-</div>
-</div>
diff --git a/resources/views/layout69/partials/registermodal.blade.php b/resources/views/layout69/partials/registermodal.blade.php
deleted file mode 100644
index d56589a..0000000
--- a/resources/views/layout69/partials/registermodal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="modal fade" id="registermodal" tabindex="-1" role="dialog" aria-labelledby="Register">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Register</h4>
-            </div>
-            
-            <div class="advantages">
-              <p>Registering on w0bm has some advantages...</p>
-              <p>With a account you can comment on WebMs, favor WebMs, upload WebMs, tag videos, filter out unwanted tags and watch NSFW WebMs!</p>
-            </div>
-
-            <div class="reg_wrapper">
-	   		        <div class="register">
-                  <div class="col-md-10">
-                    <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-                      {!! csrf_field() !!}
-                        <div class="form-group">
-                          <div class="reg_username">
-                            {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                          </div>
-                        </div>
-                
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                          </div>
-                        </div>
-              
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                          </div>
-                        </div>
-            
-                        <div class="form-group">
-                          <div class="recaptcha">
-                            {!! Recaptcha::render() !!}
-                          </div>
-                        </div>
-                      
-                        <div class="form-group terms">
-                          <div class="verify_rules">
-                            <p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-                          </div>
-                        
-                          <div class="submit_registration">
-                            <button type="submit" class="btn btn-primary">Register</button>
-                          </div>
-                        </div>
-                    </form>
-                  </div>
-                </div>
-            </div>
-
-            <div class="modal-footer">
-              <p>Back to <a href="#" data-toggle="modal" data-target="#loginmodal" data-dismiss="modal">Login?</a></p>
-            </div>
-    </div>
-</div>
-</div>
diff --git a/resources/views/layout69/partials/report.blade.php b/resources/views/layout69/partials/report.blade.php
deleted file mode 100644
index 00a56d3..0000000
--- a/resources/views/layout69/partials/report.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- created by klee -->
-@if(isset($video))
-  <form id="webmreport" method="POST" action="/report/{{$video->id}}">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="webmreportmodal" tabindex="-1" role="dialog" aria-labelledby="Report webm">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title" id="filterModalTitle">Report WebM</h4>
-          </div>
-          <div class="modal-body-report webmreportmodal">
-            So you want to report this webm? Tell us why:<br>
-            <br>
-            <div class="form-group">
-              <label for="reportReasons">
-                Reason(s)<br>
-                <em>(hold ctrl to select multiple)</em>
-              </label>
-              <select multiple class="form-control" id="reportReasons" name="reportReasons[]">
-                <option>Wrong rating (sfw/nsfw)</option>
-                <option>Shitpost</option>
-                <option>Low quality/effort video</option>
-                <option>Breaks a rule</option>
-                <option>Other</option>
-                <!-- breaks a rule, Wrong safe for rating -->
-              </select>
-            </div>
-            <label for="reportReasonText">Please explain a bit more detailed why you want to report this webm</label>
-            <textarea class="form-control" id="reportText" name="reportText" rows="3" required></textarea>
-            <p>Abuse of this form will be awarded with a permanent ban!</p>
-          </div>            
-          <div class="modal-footer">
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-primary">Send Report</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </form>
-@endif
diff --git a/resources/views/layout69/partials/searchbar.blade.php b/resources/views/layout69/partials/searchbar.blade.php
deleted file mode 100644
index 473c994..0000000
--- a/resources/views/layout69/partials/searchbar.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<div style="background:black;text-align:center;">
-<span><a href="/blog">w0bm will turn 8 years old in a few months, thanks for all the great years!</a></span>
-</div>
-<div class="searchbar">
-	<form method="get" action="/main">
-            	{!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search w0bm.com']) !!}
-		<button type="submit" class="suchbutton_video"><i style="color:white;" class="fa fa-search"></i></button>
-	</form>
-</div>
-
diff --git a/resources/views/layout69/partials/searchmodal.blade.php b/resources/views/layout69/partials/searchmodal.blade.php
deleted file mode 100644
index 801fb5e..0000000
--- a/resources/views/layout69/partials/searchmodal.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
- <div class="modal fade" id="searchmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-
-                <div class="random_blah">
-                    <?php
-                        function random_array_picker($array) {
-                            $count = count($array);
-                            $random_index = rand(0, $count - 1);
-                            return $array[$random_index];
-                        }
-                        $array = [
-                        'We have the 👀',
-                        '😂 We have funny videos',
-                        '💎 We got gemmies',
-                        '🤔 We dont even know man',
-                        '🤮 we got this too',
-                        '😎 we got the cool',
-                        ];
-                        $random_element = random_array_picker($array);
-                            echo "<h4 class='modal-title' id='filterModalTitle'>$random_element</h4>";
-                        
-                    ?>
-                </div>
-            </div>
-            <div class="searchbar">
-	            <form method="get" action="/main">
-            	    {!! Form::text('q', null, ['class' => 'suchleiste_video', 'placeholder' => 'Search w0bm.com']) !!}
-		            <button type="submit" class="suchbutton_video"><i style="color:white;" class="fa fa-search"></i></button>
-	            </form>
-            </div>
-            <div class="modal-footer">
-			    <i>& find some… </i>
-        	</div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/tags.blade.php b/resources/views/layout69/partials/tags.blade.php
deleted file mode 100644
index 37db8d7..0000000
--- a/resources/views/layout69/partials/tags.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="tags hidden-xs">
-    <div class="tagtest">
-    @if(Auth::check())
-    <ul class="nav navbar-nav info-nav">
-    <label for="tag-add-toggle">
-    <li id="tagadder" class="addtagsy">[+Add Tag]</li>
-    </label>
-    <li class="addtagsy"><a href="/irc">IRC </a></li>
-    <li class="addtagsy"><a href="/about">About </a></li>
-    <li class="addtagsy"><a href="/contact">Contact </a></li>
-    <li class="addtagsy"><a href="/rules">Rules </a></li>
-    <li class="addtagsy"><a href="/stats">Stats</a></li>
-    <li class="addtagsy"><a href="/marderchen">✝</a></li>
-    </ul>
-    <input type="checkbox" id="tag-add-toggle">
-    <div id="tag-add">
-    <div class="input-group tag-input-open" style="margin-top: 4px;">
-        {{--<select multiple name="tags[]" data-role="tagsinput" class="form-control"></select>--}}
-            <input id="tags" type="text" class="" placeholder="Add new tag" name="tags" data-role="tagsinput">
-		<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="">Submit</button>
-    </div>
-        </div>
-	@else
-	<ul class="nav navbar-nav info-nav">
-            <li class="addtagsy"><a href="/irc">IRC </a></li>
-            <li class="addtagsy"><a href="/about">About </a></li>
-	    <li class="addtagsy"><a href="/contact">Contact </a></li>
-	    <li class="addtagsy"><a href="/rules">Rules </a></li>
-	    <li class="addtagsy"><a href="/stats">Stats</a></li>
-        <li class="addtagsy"><a href="/marderchen">✝</a></li>
-	</ul>
-        @endif
-
-    </div>
-    <div class="toggo tag-panel-body" style="">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                    <span class="label label-default"><a href="/main?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-        <div class="git">
-        <?php
-            $latestCommit = shell_exec('git log -n 1');
-            $getcommitID = substr($latestCommit,0,48);
-            $commitID = substr($getcommitID, 7);
-            echo "<a class='latestCommit' target='_blank' href='/git'>$commitID</a>"
-        ?>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout69/partials/themechanger.blade.php b/resources/views/layout69/partials/themechanger.blade.php
deleted file mode 100644
index 8203485..0000000
--- a/resources/views/layout69/partials/themechanger.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<li role="presentation" class="">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Theme
-    </a>
-<ul class="dropdown-menu">
-    <div id="switcher">
-        <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
-        <br>
-    <button class="w0bm_override-css" onclick="setActiveStyleSheet('DARK'); return false;">DARK</button>
-	<br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
-    <button class="glitch-css" onclick="setActiveStyleSheet('Glitch'); return false;">Glitch</button>
-    <br>    
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout69/partials/thread_closed.php b/resources/views/layout69/partials/thread_closed.php
deleted file mode 100644
index 03d2e52..0000000
--- a/resources/views/layout69/partials/thread_closed.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thread_closed">
-  <span>Thread closed! ;__;</span>
-</div>
diff --git a/resources/views/layout69/popover-content.blade.php b/resources/views/layout69/popover-content.blade.php
deleted file mode 100644
index bf44074..0000000
--- a/resources/views/layout69/popover-content.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@if($video->interpret) Artist: {{ $video->interpret }}<br>@endif
-@if($video->songtitle) Songtitle: {{ $video->songtitle }}<br>@endif
-@if($video->imgsource) Video Source: {{ $video->imgsource }}<br>@endif
-Category: {{ $video->category->name }}
\ No newline at end of file
diff --git a/resources/views/layout69/privacy.blade.php b/resources/views/layout69/privacy.blade.php
deleted file mode 100644
index 3955833..0000000
--- a/resources/views/layout69/privacy.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Privacy</h3>
- </div>
-
-<div class="box">
-<h5>What do we log?</h5>
-<p>Our webserver does not log access log requests, we may log error logs from time to time if something breaks.</p>
-<h5>3<sup>rd</sup> party links</h5>
-<p>There are some 3rd party linkings on this website, be careful with clicking them we don't know whats inside the box blah blah blah, don't be stupid and don't trust the internet.</p>
-<p>If you encounter a malicious link shared here on w0bm.com please notify an admin in the <a href="/irc">IRC</a></p>
-<p>If you find a bug or a vulnerability, please notify an admin in the <a href="/irc">IRC</a></p>
-<h5>Cookies</h5>
-<p>Yes, we use cookies and if you don't like that don't come to our site! (or don't accept them in the first place) You can see the details of the cookies in your browser.</p>
-<p>Spoiler: They are all relevant for the website to function properly!</p>
-<ul>
-<p>The following cookies are being set by the website:</p>
-<li><code>remember_&lt;token&gt;</code> Well, it's used to remember you and so you don't have to re-login after like 5 minutes</li>
-<li><code>style</code> This one is used to store your style preference</li>
-<li><code>w0bm_session</code> Your session id</li>
-<li><code>XSRF-TOKEN</code> The XSRF Token</li>
-</ul>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout69/profile.blade.php b/resources/views/layout69/profile.blade.php
deleted file mode 100644
index e32e5f2..0000000
--- a/resources/views/layout69/profile.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-@extends('profilelayout')
-@section('content')
-@include('partials.profileheader')
-<fieldset>
-	    <legend><a href="/{{$user->baseurl()}}/">View {{ $title }}</a></legend>
-
-            <table class="table table-hover table-condensed">
-                <thead>
-                <tr>
-		    <th>ID</th>
-		    <th>Video Title</th>
-                    <th>Artist</th>
-                    <th>Songtitle</th>
-                    <th class="hidden-xs">Video Source</th>
-                    <th>Category</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($videos as $video)
-                    <?php
-                        $thumb = str_replace(".webm","",$video->file);
-                    ?>
-                    <tr data-thumb="{{$thumb}}">
-			<td><a href="/{{$user->baseurl()}}/{{$video->id}}">{{$video->id}}</a></td>
-			<td>{{$video->videotitle or ''}}</td>
-                        <td>{{$video->interpret or ''}}</td>
-                        <td>{{$video->songtitle or ''}}</td>
-                        <td class="hidden-xs">{{$video->imgsource or ''}}</td>
-                        <td><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            {!! $videos->render() !!}
-        </fieldset>
-@endsection
diff --git a/resources/views/layout69/profilelayout.blade.php b/resources/views/layout69/profilelayout.blade.php
deleted file mode 100644
index cb73352..0000000
--- a/resources/views/layout69/profilelayout.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="theme-color" content="#161618">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1">
-    <meta charset="UTF-8">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>w0bm.com - WebMs with sound!</title>
-    <link rel="stylesheet" href="/css/style.css">
-    <link rel="favicon"
-      type="image/ico"
-      href="favicon.ico" />
-    <link rel="stylesheet" href="/css/style.css">
-    <link rel="stylesheet" href="/css/w0bmfonts.css">
-    <link rel="stylesheet" href="/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" href="/css/w0bmcustom.css?v={{ filemtime("css/w0bmcustom.css") }}">
-    @if(auth()->check())
-    <link rel="stylesheet" href="/css/video-js.min.css">
-    <link rel="stylesheet" href="/css/simplebar.css" />
-    <link rel="stylesheet" href="/css/vjsnew.css?v=1.1.1">
-    <link rel="alternate stylesheet" href="/css/w0bm_override.css?v={{ filemtime("css/w0bm_override.css") }}" title="DARK">
-    <link rel="alternate stylesheet" href="/css/chilledblue.css?v={{ filemtime("css/chilledblue.css") }}" title="Chilledblue">
-    <link rel="alternate stylesheet" href="/css/xayd.css?v={{ filemtime("css/xayd.css") }}" title="Xayd">
-    <link rel="alternate stylesheet" href="/css/glitch.css?v={{ filemtime("css/glitch.css") }}" title="Glitch">
-    <link rel="alternate stylesheet" href="/css/epilepsie.css?v={{ filemtime("css/epilepsie.css") }}" title="Epilepsie">
-    <script src="/js/styleswitcher.js"></script>
-    @else
-    @endif
-</head>
-<body>
-@if(auth()->check())
-@include('partials.handlebars')
-@else
-@endif
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($user) && auth()->user()->can('edit_user'))
-        @include('partials.banmenu')
-    @endif
-@endif
-@if(auth()->check())
-<canvas id="bg" @if(!Session::get('background', true)) style="display: none;"@endif></canvas>
-@else
-@endif
-@include('partials.navigation')
-
-<div class="wrapper">
-    @yield('aside')
-    <div style="width: auto; overflow: hidden; position: relative;">
-	<div class="fucklaravel">
-	    <noscript><div class="no-js-mode" style="position: fixed;bottom: 0;right: 0;">nojs</div></noscript>
-            @yield('content')
-        </div>
-    </div>
-
-</div>
-@if(auth()->check())
-<script src="/js/jquery.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/bootstrap-tagsinput.min.js"></script>
-<script src="/js/isotope.pkgd.min.js"></script>
-<script src="/js/imagesloaded.pkgd.min.js"></script>
-<script src="/js/handlebars.min.js"></script>
-<script src="/js/jquery.timeago.js"></script>
-<script src="/js/w0bmscript.js?v={{ filemtime("js/w0bmscript.js") }}"></script>
-@else
-@endif
-</body>
-</html>
diff --git a/resources/views/layout69/rulez.blade.php b/resources/views/layout69/rulez.blade.php
deleted file mode 100644
index 2c7f413..0000000
--- a/resources/views/layout69/rulez.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h3>Rulez</h3>
-    </div>
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    @include('footer')
-@endsection
diff --git a/resources/views/layout69/settings.blade.php b/resources/views/layout69/settings.blade.php
deleted file mode 100644
index 13fbab4..0000000
--- a/resources/views/layout69/settings.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
- @extends('profilelayout')
-@section('content')
-<h4>Layouts</h4>
-<div class="box">
-    <h5>Change how you experience w0bm.com</h5>
-  <ul class="layout-ul">
-    <li><a class="nav-link layout1" style="font-size: 10px;" href="/api/user/layout?layout=1">w0bm</a>The default look</li>
-    <li><a class="nav-link layout2" style="font-size: 10px;" href="/api/user/layout?layout=2">Njum</a>Alternative approach</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=3">z0mb</a>z0r.de layout + theme</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=4">nojs</a>The nojs layout (broken)</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=5">Mobile</a>The mobile optimized default layout</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=6">Marderchen</a>This is marders Layout, it has no async js</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=7">2017</a>The layout from 2017</li>
-    <li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=8">2015</a>The OG w0bm</li>
-  </ul>
-</div>
-  @endsection
\ No newline at end of file
diff --git a/resources/views/layout69/stats.blade.php b/resources/views/layout69/stats.blade.php
deleted file mode 100644
index 75caed6..0000000
--- a/resources/views/layout69/stats.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-        <h3>Stats</h3>
-</div>
-<div class="box">
-	<p class="user_count">Total amount of registered users: <amount>{{$user_count}}</amount> / 3000</p>
-	<p class="upload_count">Total amount of uploads: <amount>{{$upload_count}}</amount></p>
-	<p class="comment_count">Total amount of comments: <amount>{{$comment_count}}</amount></p>
-	<p class="latest-video">Latest video <a href="/{{$latest_video}}">/{{$latest_video}}</a></p>
-	<p class="newest_user">Newest user <a href="/user/{{$newest_user}}">/user/{{$newest_user}}</a></p>
-	<p class="dirsize">Total size of w0bm: <amount>{{$dirsize}}</amount></p>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout69/upload.blade.php b/resources/views/layout69/upload.blade.php
deleted file mode 100644
index 4e91114..0000000
--- a/resources/views/layout69/upload.blade.php
+++ /dev/null
@@ -1,76 +0,0 @@
-@extends('profilelayout')
-@section('content')
-    <div class="uploadheader">
-        <h3 id="upheader">Upload</h3>
-    </div>
-    <div class="wrapper">
-        <div class="ulcontainer" style="white-space: nowrap; padding: 0px; height: 100%;">
-	    <div class="form-group">
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}
-                </div>
-            </div>
-                <div class="">
-                    {!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    <?php
-                        $categories = [];
-                        foreach(App\Models\Category::all() as $cat)
-                            $categories[$cat->id] = $cat->name;
-                    ?>
-                    {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="blah">
-                    {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw">NSFW?</label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="ultags">
-                    {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'form-control', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}
-                </div>
-	    </div>
-<div class="form-group">
-    @include('partials.flash')
-    <br>
-        <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-            <a id="dragndrop-link" href="#">
-                <span style="display: table; width: 100%; height: 100%;">
-                    <span id="dragndrop-text">
-                        <i class="fa fa-cloud-upload"></i><br>
-                        Drop or select WebM!
-                    </span>
-                </span>
-            </a>
-        </div>
-</div>
-
-            <div class="form-group">
-                <div class="col-md-12">
-                    <button id="btn-upload" type="button" style="width: 100%; height: 40px;" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
-			<span class="" id="laz0r-fire"></span>
-			<span class="hidden-xs" id="shoop-laz0r"></span>
-		    </button>
-		    <p style="text-align:center; padding-top: 5px; white-space: normal;">Before you fire the laz0r make sure you have read the <a href="/rules">Rules</a>! <br><i>With great power comes great responsibility</i></p>
-		    <p style="text-align:center; padding-top: 5px; white-space: normal;"><span id="big">10</span> uploads <span id="big">every 12 hours.</span> – Maximum filesize: <span id="big">40MB.</span> – Only <span id="big">.webm (vp8/vp9) with sound</span> allowed. Need <a href="/webm">help?</a></p>
-                </div>
-            </div>
-        <input name="file" type="file" class="hidden" accept=".webm"></input>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout69/video.blade.php b/resources/views/layout69/video.blade.php
deleted file mode 100644
index 48c18d9..0000000
--- a/resources/views/layout69/video.blade.php
+++ /dev/null
@@ -1,125 +0,0 @@
-@extends('layout')
-@section('content')
-
-@if(auth()->check())
-<?php $related = $related ?? null; ?>
-    <div class="vertical-align">
-        <div class="wrapper">
-            <div class="embed-responsive embed-responsive-16by9">
-            	                        	@if($video->id == '27204')
-            	<iframe src="https://w0bm.com/loop/index.html"></iframe>
-            	@else
-		<video id="video" loop controls preload="auto" crossorigin="anonymous" loading="lazy">
-			<source src="/b{{ "/" . $video->file }}">
-		</video>
-		@endif
-		    	@if($video->category->name === 'Anime' || $video->category->name === 'Otomad')
-		    	<div class="anime-thumb-opener hidden-xs"><i title="Generate Anime Thumbnail!" class="fa fa-file-image-o"></i></div>
-				<div style="display: none;" class="anime-thumb">
-				<span>Anime Thumbnail Generator v1.0 Alpha</span><br>
-				<img id="thumbnail_img" alt="Pause video to create thumb!"/><br>
-				<span>Right click <code>Copy Image</code> and paste it on <a href="https://trace.moe">trace.moe</a></span>
-				<canvas height="540" width="960" style="display: none;" id="thecanvas"></canvas>
-				<script src="/js/animethumbnailer.js"></script>
-			</div>
-		@endif
-	    </div>
-            	<?php
-			//$shortfile = str_replace(".webm", "" ,$video->file);
-			//$mp4 = shell_exec("curl https://fapple.w0bm.com/api/v1/{{$shortfile}} | jq -r .size");
-		?>
-			<div class="text-center" style="position: unset;">
-				@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<a class="first" href="#" style="visibility: hidden;">← first</a>
-						<a id="prev" href="#" style="visibility: hidden;">← prev</a> |
-					@else
-						<a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}">← first</a>
-						<a id="prev" href="{{url($related->baseurl(), [$prev->id])}}">← prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next →</a>
-						<a class="last" href="#" style="visibility: hidden;">last →</a>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next →</a>
-						<a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last →</a>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<a class="first" href="#" style="visibility: hidden;">← first</a>
-						<a id="prev" href="#" style="visibility: hidden;">← prev</a> |
-					@else
-						<a class="first" href="{{url($video->getFirstId())}}">← first</a>
-						<a id="prev" href="{{url($prev->id)}}">← prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next →</a>
-						<a class="last" href="#" style="visibility: hidden;">last →</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next →</a>
-						<a class="last" href="{{url($video->getLastId())}}">last →</a>
-					@endif
-				@endif
-			</div>
-		</div>
-	</div>
-@endsection
-
-@section('aside')
-    <aside id="sidebar" class="aside panel hidden-xs">
-    	@include('partials.flash')
-    	@include('partials.comments')
-		@include('partials.tags')
-	</aside>
-
-@else
-<div class="centered">
-        <div class="modal-content col-md-5">
-            <div class="modal-header">
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            @include('partials.flash')
-            <div class="login_wrapper">
-            	<div class="col-md">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input style="vertical-align: unset;" id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-	   		<div class="media not-logged-in">
-  <div class="media-left">
-	@if($sfw)
-	      <img class="media-object" src="/thumbs/beta/{{str_replace('.webm','',$video->file)}}.png">
-	@else
-	      <img class="media-object" src="/thumbs/blurred/{{str_replace('.webm','',$video->file)}}_blurred.png">
-	@endif
-  </div>
-  <div class="media-koerper">
-    <h4 class="media-heading">
-    	@if($video->videotitle){{$video->videotitle}}
-    	@else
-    	<p><i>No Title</i></p></h4>
-    @endif</h4>
-            <div id="tag-display" style="width: auto; height: auto;" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                    <span class="label label-default"><a class="default-link">{{$tag->name}}</a></span>
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-  </div>
-</div>
-<div class="modal-footer">
-	<a href="/privacy">Privacy</a> | <a href="/contact">Contact</a> | <a href="/irc">IRC</a>
-</div>
-</div>
-    </div>
-@endif
-@endsection
diff --git a/resources/views/layout69/webm.blade.php b/resources/views/layout69/webm.blade.php
deleted file mode 100644
index 689720a..0000000
--- a/resources/views/layout69/webm.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>WebM Support</h3>
-         <p>How 2 make a webm</p>
- </div>
-
-<div class="box">
-<h4>Chad <small>(not afraid of using the command line)</small></h4>
-<img src="/images/gigachad.png" style="float:left;width:150px;" alt="gigachad">
-<pre><code>#The based white man way
-
-ffmpeg -i virgin.mp4 chad.webm #single file, very simple
-
-#You can add this to your .bashrc
-
-function mkwebmbatch() {
-        for i in *.$1;
-                do name=`basename "$i" .$1`
-                echo "$name"
-                ffmpeg -i "$i" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$PWD/${name}.webm"
-        done
-}
-
-function mkwebm() {
-	filename=$(basename -- "$1")
-	extension="${filename##*.}"
-	filename="${filename%.*}"
-	name=`basename "$filename" .$extension`
-	echo "$name"
-	ffmpeg -i "$1" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$HOME/Videos/converts/$name.webm"
-}
-
-function stillvid() {
-	#stillvid image.jpg music.mp3 $3.<webm>
-	ffmpeg -i "$1" -i "$2" -c:a libvorbis -auto-alt-ref 0 -c:v libvpx $3.webm 
-}
-
-#Notable mentions
-
-* https://github.com/ekisu/mpv-webm
-
-* https://github.com/Kagami/webm.py
-
-# If using webm.py a good line to get a high quality video would be
-
-# (assuming you have it in your path)
-webm -i virgin.mp4 -l 40 chad.webm #this will produce a vp9 webm with decent image quality
-</code></pre>
-</div>
-<h1 style="text-align:center;">VS</h1>
-<div class="box">
-<h4>Virgin</h4>
-<img src="/images/virgin.png" style="float:left;width:150px;" alt="gigachad">
-<ul>
-   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a></li>
-   <li><a href="https://gitgud.io/nixx/WebMConverter">WebMConverter by nixx!</a></li>
-</ul>
-</div>
-@endsection
-
diff --git a/resources/views/layout8/about.blade.php b/resources/views/layout8/about.blade.php
deleted file mode 100644
index 2a8b433..0000000
--- a/resources/views/layout8/about.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="dark-bg">
-{!!$blah!!}
-</div>
-@endsection
-
diff --git a/resources/views/layout8/abouttest.blade.php b/resources/views/layout8/abouttest.blade.php
deleted file mode 100644
index 8ba19b2..0000000
--- a/resources/views/layout8/abouttest.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-{{$blah}}
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout8/banned.blade.php b/resources/views/layout8/banned.blade.php
deleted file mode 100644
index d626301..0000000
--- a/resources/views/layout8/banned.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">YOU ARE BANNED!</h3>
-  </div>
-
-  <div class="panel-body">
-    <div style="border:0;" class="panel panel-default">
-      <div class="panel-body">
-        @if($perm)
-        <p>Your ban is permanent fool and will <b>NOT</b> expire!</p>
-        <video class="banwidth" autoplay loop src="https://b.w0bm.com/1515965864.webm">You are banned</video>
-        @else
-        <p class="banned">Reason: {{ $user->banreason }}</p>
-        <p class="banned">Your ban will expire in {{ $user->banend->diffForHumans(null, true) }}</p>
-        <img class="banwidth" src="otter-ban.png">
-        @endif
-      </div>
-    </div>
-    <p>If you think you were banned by accident or dindu nuffin to deserve the ban contact an administrator in the <a href="/irc">IRC</a></p>
-  </div>
-</div>
-@endsection
diff --git a/resources/views/layout8/categories.blade.php b/resources/views/layout8/categories.blade.php
deleted file mode 100644
index 0b14662..0000000
--- a/resources/views/layout8/categories.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-        <h3>Categories</h3>
-    </div>
-    <div class="dark-bg">
-    <div class="p-2" id="categories">
-        @foreach($categories as $category)
-            <div id="category_box_{{$category->shortname}}" class="category-box">
-                <div class="thumbnail">
-                   	<a href="{{$category->shortname}}"><img src="{{ asset('/images/cat/' . $category->shortname . '.webp') }}" alt="{{$category->name}}"></a>
-                    <div class="caption">
-                        <h5>{{$category->name}} <small><b>{{$category->videos()->count()}}</b></small></h5>
-                        <span class="cat-desc"><i>{{$category->description}}</i></span>
-                    </div>
-                </div>
-            </div>
-        @endforeach
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout8/close.sh b/resources/views/layout8/close.sh
deleted file mode 100644
index 91e778e..0000000
--- a/resources/views/layout8/close.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/w0bm.com/resources/views/
-ln -sf registerclosed.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout8/closedreg.php b/resources/views/layout8/closedreg.php
deleted file mode 100644
index dcf75af..0000000
--- a/resources/views/layout8/closedreg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('layout')
-@section('content')
-    <div class="page-header">
-        <h1>Registration closed - check back later</h1>
-@endsection
diff --git a/resources/views/layout8/comments.blade.php b/resources/views/layout8/comments.blade.php
deleted file mode 100644
index a523214..0000000
--- a/resources/views/layout8/comments.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-@include('partials.comlist')
-<h3>Comments</h3>
-@if(Auth::check())
-
-<div class="row jkh">
-    <div class="col-md" id="list">
-        <div class="spinner">
-            <div class="cube1"></div>
-            <div class="cube2"></div>
-        </div>
-    </div>
-    <!--<div class="col-md-6" id="message"><h4>Select a comment to display content</h4></div>-->
-</div>
-
-@else
-<div class="row jkh">
-        <i>Not logged in. Please log in to view comments!</i>
-</div>
-@endif
-@endsection
-
diff --git a/resources/views/layout8/contact.blade.php b/resources/views/layout8/contact.blade.php
deleted file mode 100644
index 61ad6e1..0000000
--- a/resources/views/layout8/contact.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
- <div class="page-header p-2">
-         <h3>Professional Support</h3>
- </div>
-<div class="box">
-<img src="/images/cockfag.png" style="margin-left: 10px; width: 15%; height: 15%; float:right;">
-<h4>Contact</h4>
-<ul>
-<li>Contact via IRC: <a href="https://webirc.n0xy.net/?join=%23w0bm">#w0bm on n0xy.net</a></li>
-</ul>
-<p><span>Need something? Let's talk then!</span></p>
-<p>Email: <a href="mailto:admin@w0bm.com">admin [ät] w0bm [dotto] com</a>
-</div>
-@endsection
diff --git a/resources/views/layout8/contact/create.blade.php b/resources/views/layout8/contact/create.blade.php
deleted file mode 100644
index ce73100..0000000
--- a/resources/views/layout8/contact/create.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@extends('layouts.app')
-
-@section('jumbotron')
-    <div class="jumbotron">
-        <div class="container">
-            <h1>Contact HackerPair</h1>
-            <h2>Your message will be delivered to our clandestine team</h2>
-        </div>
-    </div>
-@endsection
-
-@section('content')
-
-    <div class="row" style="margin-top: 25px;">
-
-        <div class="col-md-4 col-sm-12">
-
-            <div class="card">
-                <div class="card-body">
-                    <div class="card-title map">
-                        <gmap-map
-                                :center="{lat: 38.871026, lng: -77.055959}"
-                                :zoom="13"
-                                :options="{styles: mapStyles, streetViewControl: false, zoomControl: false, mapTypeControl: false}"
-                                map-type-id="roadmap"
-                                style="width: 100%; height: 300px;"
-                        >
-                        </gmap-map>
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-building" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Group 9
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            </li>
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-map-signs" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                Classified
-                            <li class="list-group-item" style="border: none;">
-                                <span class="fa fa-calendar" style="color: #FFC200; padding-right: 5px;" aria-hidden></span>
-                                support@hackerpair.com
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <div class="col-md-8 col-sm-12">
-
-            <p>
-                Send us your questions, comments, and suggestions and someone will be in touch within
-                24 hours.
-            </p>
-
-            {!! Form::open(['route' => 'contact.store']) !!}
-
-            <div class="form-group">
-                {!! Form::label('name', 'Your Name') !!}
-                {!! Form::text('name', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('email', 'E-mail Address') !!}
-                {!! Form::text('email', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-                {!! Form::label('msg', 'Message') !!}
-                {!! Form::textarea('msg', null, ['class' => 'form-control']) !!}
-            </div>
-
-            <div class="form-group">
-            </div>
-
-            {!! Form::submit('Submit', ['class' => 'btn btn-info']) !!}
-
-            {!! Form::close() !!}
-            <br />
-        </div>
-
-    </div>
-
-@endsection
diff --git a/resources/views/layout8/contactUS.blade.php b/resources/views/layout8/contactUS.blade.php
deleted file mode 100644
index 497de5e..0000000
--- a/resources/views/layout8/contactUS.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Laravel 5.4 Cloudways Contact US Form Example</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-</head>
-<body>
-<div class="container">
-<h1>Contact US Form</h1>
-@if(Session::has('success'))
-   <div class="alert alert-success">
-     {{ Session::get('success') }}
-   </div>
-@endif
-{!! Form::open(['route'=>'contactus.store']) !!}
-<div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
-{!! Form::label('Name:') !!}
-{!! Form::text('name', old('name'), ['class'=>'form-control', 'placeholder'=>'Enter Name']) !!}
-<span class="text-danger">{{ $errors->first('name') }}</span>
-</div>
-<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
-{!! Form::label('Email:') !!}
-{!! Form::text('email', old('email'), ['class'=>'form-control', 'placeholder'=>'Enter Email']) !!}
-<span class="text-danger">{{ $errors->first('email') }}</span>
-</div>
-<div class="form-group {{ $errors->has('message') ? 'has-error' : '' }}">
-{!! Form::label('Message:') !!}
-{!! Form::textarea('message', old('message'), ['class'=>'form-control', 'placeholder'=>'Enter Message']) !!}
-<span class="text-danger">{{ $errors->first('message') }}</span>
-</div>
-<div class="form-group">
-<button class="btn btn-success">Contact US!</button>
-</div>
-{!! Form::close() !!}
-</div>
-</body>
-</html>
diff --git a/resources/views/layout8/deleted.blade.php b/resources/views/layout8/deleted.blade.php
deleted file mode 100644
index 1c48390..0000000
--- a/resources/views/layout8/deleted.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<p>Video deleted by admin</p>
-<p>Given reason: </p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout8/email.blade.php b/resources/views/layout8/email.blade.php
deleted file mode 100644
index e986826..0000000
--- a/resources/views/layout8/email.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-You received a message from : {{ $name }}
-<p>
-Name: {{ $name }}
-</p>
-<p>
-Email: {{ $email }}
-</p>
-<p>
-Message: {{ $user_message }}
-</p>
diff --git a/resources/views/layout8/emails/activation.blade.php b/resources/views/layout8/emails/activation.blade.php
deleted file mode 100644
index e66f02f..0000000
--- a/resources/views/layout8/emails/activation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Hello {{$username}}</h3>
-<p>Welcome to <a href="https://w0bm.com">w0bm.com</a>.</p>
-<p>To activate your account please click this <a href="https://w0bm.com/activate/{{$activation_token}}">link</a>.</p>
diff --git a/resources/views/layout8/emails/report.blade.php b/resources/views/layout8/emails/report.blade.php
deleted file mode 100644
index cceac1e..0000000
--- a/resources/views/layout8/emails/report.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-
-  <div style="width:100%;font-family:verdana;">
-
-    <h1>webm got reported!</h1>
-
-    <div>
-      <b>Link:</b>
-      <a href="{{$videoURL}}">{{$videoURL}}</a>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%;border:1px solid black;border-collapse:collapse;">
-        <thead>
-          <tr style="border:1px solid black; padding:5px;">
-            <th style="background-color:#bbbbbb;border-right:1px solid black;">Report Reasons</th>
-            <th style="background-color:#bbbbbb;">Report Text</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td style="padding:10px;border-right:1px solid #bbbbbb;">
-              <ul>
-                {!! $reportReasons !!}
-              </ul>
-            </td>
-            <td style="padding:10px;">
-              {{$reportText}}
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <br>
-
-    <div>
-      <table style="width:100%; border-collapse:collapse;border:1px solid black;">
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;width:200px;">Username</th>
-          <td>{!! $username !!}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Time reported</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">IP:</th>
-          <td></td>
-        </tr>-->
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video ID</th>
-          <td>{{$videoID}}</td>
-        </tr>
-        <!--
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Title</th>
-          <td></td>
-        </tr>
-        <tr style="border-bottom:1px solid black;">
-          <th style="border-right:1px solid black;padding:5px;">Video Tags</th>
-          <td></td>
-        </tr>-->
-      </table>
-    </div>
-
-    <br>
-    <hr>
-
-    <!--
-    <div>
-      <h3>Debug Output:</h3>
-      <div style="color:green;font-family:consolas;background-color:black;">
-        <pre>
-          {{$debugOutput}}
-        </pre>
-      </div>
-    </div>
-    -->
-
-  </div>
-
-
-</html>
\ No newline at end of file
diff --git a/resources/views/layout8/errors/404.blade.php b/resources/views/layout8/errors/404.blade.php
deleted file mode 100644
index 3a97175..0000000
--- a/resources/views/layout8/errors/404.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="notfound">
-<h1>404 - NOT FOUND</h1>
-<img id="notfound-img" src="/404.gif">
-</div>
-@endsection
diff --git a/resources/views/layout8/errors/500.blade.php b/resources/views/layout8/errors/500.blade.php
deleted file mode 100644
index cb1712a..0000000
--- a/resources/views/layout8/errors/500.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<style>
-.sf-reset .block > pre {
-    background-color: #000000;
-    padding: 10px 28px;
-    margin-bottom: 20px;
-    -webkit-border-bottom-right-radius: 0;
-    -webkit-border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    border-bottom: 1px solid #1faeac;
-    border-right: 1px solid #1faeac;
-    border-left: 1px solid #1faeac;
-    border-top: 1px solid #1faeac;
-    word-wrap: break-word;
-    color: green;
-}
-
-.block {
-    overflow: auto;
-    word-break: break-all;
-    max-height: 500px;
-}
-</style>
-
-	<h5>l0l! Something went wrong!</h5>
-        <div id="sf-resetcontent" class="sf-reset box">
-		<h6>Please don't send this fucking text to an admin, we have other problems.</h6>
-            <?php
-                $iv = openssl_random_pseudo_bytes(16);
-            ?>
-            @if(!env('APP_DEBUG'))
-            <div class="block">
-                {{bin2hex($iv)}}<br>
-                {{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
-            </div>
-            @else
-            <div class="block">
-                <pre>{{$exception}}</pre>
-            </div>
-            @endif
-
-        </div>
-@endsection
diff --git a/resources/views/layout8/errors/503.blade.php b/resources/views/layout8/errors/503.blade.php
deleted file mode 100644
index 4f63d68..0000000
--- a/resources/views/layout8/errors/503.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-	<title>Please Stand By we are just fucking this up</title>
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-		font-family: 'Lato';
-		background-color: #161618;
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Short maintenance, brb!</div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/layout8/footer.blade.php b/resources/views/layout8/footer.blade.php
deleted file mode 100644
index 80c807c..0000000
--- a/resources/views/layout8/footer.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<nav class="navbar-fixed-bottom">
-  <div class="container futter">
-    <a href="/about">About</a> | <a href="/rules">Rules</a> | <a href="/contact">Contact</a> | <a href="/privacy">Privacy</a> | <a href="/transparency">Transparency</a> | <a href="/friends">Friends</a> | <a href="/stats">Stats</a>
-    <p>Inspired by <a href="http://z0r.de">z0r.de</a> | © 2015 – {{ date('Y') }} w0bm.com</p>
-  </div>
-</nav>
diff --git a/resources/views/layout8/help.blade.php b/resources/views/layout8/help.blade.php
deleted file mode 100644
index 7402c87..0000000
--- a/resources/views/layout8/help.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layout')
-@section('content')
-<div class="page-header p-2">
-        <h2></h2>
-</div>
-@endsection
-
diff --git a/resources/views/layout8/index.blade.php b/resources/views/layout8/index.blade.php
deleted file mode 100644
index 46dcf83..0000000
--- a/resources/views/layout8/index.blade.php
+++ /dev/null
@@ -1,83 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-    <h3 id="index">Index</h3>
-        
-        <form method="get" class="d-block d-sm-none">
-    <button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
-        </form>
-    </div>
-    <table class="table table-hover table-condensed">
-        <thead>
-        <tr>
-        <th>ID</th>
-        <th>Video Title</th>
-            <th>Artist</th>
-            <th>Songtitle</th>
-            <th class="hidden-xs">Video Source</th>
-            <th>Category</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <tr data-thumb="{{$thumb}}" class="indexedit" data-vid="{{$video->id}}">
-                <td>
-                    @if($edit = auth()->check() && auth()->user()->can('edit_video'))
-                        <form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
-                    @endif
-                    <div class="relativebla">
-                        <span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
-                        <a href="{{url($video->id)}}"><img id="indexthumb" src="/thumbs/beta/{{$thumb}}.png"></a>
-                    </div>
-                    @if($edit)
-                        <input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
-                    @endif
-        </td>
-                <td>
-                    <span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="videotitle" value="{{$video->videotitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vinterpret">{{$video->interpret or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="interpret" value="{{$video->interpret or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vsongtitle">{{$video->songtitle or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="songtitle" value="{{$video->songtitle or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td class="hidden-xs">
-                    <span class="vinfo vimgsource">{{$video->imgsource or ''}}</span>
-                    @if($edit)
-                        <input class="form-control" type="text" name="imgsource" value="{{$video->imgsource or ''}}" form="edit_{{$video->id}}">
-                    @endif
-                </td>
-                <td>
-                    <span class="vinfo vcategory"><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></span>
-                    @if($edit)
-                        <select class="form-control" name="category" form="edit_{{$video->id}}">
-                            @foreach($categories as $cat)
-                                <option value="{{$cat->id}}" @if($cat->shortname === $video->category->shortname) selected @endif>{{$cat->name}}</option>
-                            @endforeach
-                        </select>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-
-    <div class="">
-        {!! $videos->render() !!}
-    </div>
-
-@endsection
diff --git a/resources/views/layout8/irc.blade.php b/resources/views/layout8/irc.blade.php
deleted file mode 100644
index d46724d..0000000
--- a/resources/views/layout8/irc.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header p-2">
-        <h3>IRC/[matrix]</h3>
-</div>
-<div class="dark-bg">
-<div class="box irc-matrix-info">
-	<h5>IRC</h5>
-<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
-<p><a href="https://webirc.n0xy.net/?join=%23w0bm" target="about_blank">webirc.n0xy.net</a></p>
-<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
-<h5>[matrix]</h5>
-<h6>#w0bm on the [matrix] network</h6>
-<p><a href="https://matrix.to/#/#!w0bm:f0ck.it?via=f0ck.it&via=matrix.org&via=f0.gg">#!w0bm:f0ck.it</a></p>
-<p>Alternatively you can use the Element web client hosted at <a href="https://element.f0ck.it">f0ck.it</a> to connect to our channel, it has some modifications to make chatting more comfy: <br><small>Note: Registrations are disabled, you can still use this client with every homeserver you have an account on!</small></p>
-<ul>
-    <li>w0bm.com Stylesheet</li>
-    <li>Greentexting</li>
-</ul>
-<a href="https://spyware.neocities.org/articles/discord.html" target="_blank"><img src="/images/shitcord.gif" alt="discord-no-way"></a><br><a href="/matrix">Additional Redpill</a>
-</div>
-{{--<div class="box">
-<iframe src="https://webirc.n0xy.net?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe>
-</div>--}}
-</div>
-@endsection
-
diff --git a/resources/views/layout8/layout.blade.php b/resources/views/layout8/layout.blade.php
deleted file mode 100644
index c01c018..0000000
--- a/resources/views/layout8/layout.blade.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/njum/css/magic.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-dark.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/cstms.css?v={{ filemtime("njum/css/cstms.css") }}">
-</head>
-<body>
-    @if(auth()->check())
-    @include('partials.frontendedit')
-    	@include('partials.report')
-        @include('partials.filterselect')
-    @endif
-<canvas id="bg" class=""></canvas>
-<div class="container-fluid row p-0" id="wrapper">
-    <div class="col-sm scrollable hidden-xs p-0"></div>
-        <div class="container p-0">
-                <div class="col-md p-0">
-                    @include('partials.navigation')
-                    @include('partials.flash')
-                    <noscript>
-<div class="alert alert-warning alert-dismissible fade show" role="alert">
-  <strong>Javascript is disabled :(</strong> be a good neckbeard and turn it on, otherwise this Layout wont work as it should. However I can offer you to either reset to a <a href="/api/user/layout?layout=1">Layout that is nojs friendly</a> or just mind your own biz and simply block this message with your adblocker for example. Anyways have a nice day.
-  </button>
-</div>
-</noscript>
-                    @yield('floatvid')
-                    @include('partials.comments')
-                </div>
-            <div class="col-sm scrollable p-0"></div>
-        </div>
-    <div class="col-sm scrollable hidden-xs p-0"></div>
-</div>
-</body>
-<script type="text/javascript" src="/njum/js/jquery.min.js"></script>
-<script type="text/javascript" src="/njum/js/jquery.timeago.js"></script>
-<script type="text/javascript" src="/njum/js/popper.min.js"></script>
-<script type="text/javascript" src="/njum/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="/njum/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" src="/js/clipboard.min.js"></script>
-<script type="text/javascript" src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
-<script src="/njum/js/sticky_video.js"></script>
-<script type="text/javascript">
-    var clipboard = new ClipboardJS('.copylink');
-
-clipboard.on('success', function(e) {
-    console.info('Action:', e.action);
-    console.info('Text:', e.text);
-    console.info('Trigger:', e.trigger);
-
-    e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
-    console.error('Action:', e.action);
-    console.error('Trigger:', e.trigger);
-});
-</script>
-</html>
diff --git a/resources/views/layout8/login.blade.php b/resources/views/layout8/login.blade.php
deleted file mode 100644
index dad386d..0000000
--- a/resources/views/layout8/login.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.flash')
-  <form action="{{action('UserController@login')}}" method="post" class="form-signin">
-        {!! csrf_field() !!}
-        <input type="text" name="identifier" placeholder="Username" class="form-control">
-        <input type="password" name="password" placeholder="Password" class="form-control">
-        <input type="checkbox" name="remember" checked> Remember me<br>
-        <button type="submit" class="btn btn-dark">Login</button>
-        <a href="{{url('register')}}" class="btn btn-success">Register</a>
-  </form>
-@endsection
diff --git a/resources/views/layout8/main.blade.php b/resources/views/layout8/main.blade.php
deleted file mode 100644
index 742407d..0000000
--- a/resources/views/layout8/main.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="items">
-        @foreach($videos as $video)
-            <?php
-                $thumb = str_replace(".webm","",$video->file);
-            ?>
-            <div class="main-item">
-		    <a href="/{{$video->id}}">
-			@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
-			    <img src="/thumbs/beta/{{$thumb}}.png">
-			@else
-			    <img src="/small_404.gif" class="nothumb" />
-			@endif
-		    </a>
-		</div>
-        @endforeach
-    </div>
-
-    <div class="page">
-        {!! $videos->render() !!}
-    </div>
-@endsection
diff --git a/resources/views/layout8/marder.blade.php b/resources/views/layout8/marder.blade.php
deleted file mode 100644
index 11ae7ad..0000000
--- a/resources/views/layout8/marder.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<h3>Hello everyone!</h3>
-
-<div class="box">
-<img src="https://marderchen.totally.rip/marderchen.lima-city.de/marderchen.gif" style="float: right;" alt="">
-  <p>Today we have sad news, a beloved friend of us and one of our most unique members died.</p>
-  <p>Some of you may remember his unique and interesting and somewhat chaotic but cool videos.</p>
-  <p>Today we mourn the loss of our friend marderchen.</p>
-  <p>We sincerely hope you are at a better place now.</p>
-  <p>We thank you for the great time we had with you, you inspired many of us and brought joy to the IRC and to the website, you will be missed old friend.</p>
-
-  <p>To say it in your words: =^_^= MEOW</p>
-
-  <p>We have archived his long gone website, make sure to check it out! It is absolutely wild (only available in German)</p>
-
-  <p><a href="https://marderchen.totally.rip/marderchen.lima-city.de/index.html">https://marderchen.totally.rip/marderchen.lima-city.de/index.html</a></p>
-
-  <p>Also make sure to check out his uploads <a href="https://w0bm.com/main?q=marderchen">https://w0bm.com/main?q=marderchen</a> and enjoy it.</p>
-
-  <p><i>- w0bm staff</i></p>
-</div>
-@endsection
-
diff --git a/resources/views/layout8/matrix.blade.php b/resources/views/layout8/matrix.blade.php
deleted file mode 100644
index f38731d..0000000
--- a/resources/views/layout8/matrix.blade.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<style type="text/css">
-    * {margin: 0; padding: 0}
-body {background: #000;overflow:hidden;}
-canvas {display: block;}
-.matrix {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    font-family: monospace;
-}
-.matrix > .inner {
-    position: absolute;
-    color: white;
-    top: 40%;
-}
-.inner {
-    background: #000000b5;
-    padding: 5px;
-}
-
-#bluepill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: blue;
-    background: blue;
-    border-radius: 5px;
-}
-
-#redpill a {
-    width: 26px;
-    height: 10px;
-    display: inline-block;
-    color: red;
-    background: red;
-    border-radius: 5px;
-}
-</style>
-<div class="matrix">
-    <div class="inner">
-    <h3><p><b><i>You are a slave {{Auth::user()->username}}</i></b></p></h3>
-    <br>
-    <p>Take control over your chats, leave Discord for good!</p>
-    <p>Join [matrix] today!</p>
-    <p>Why should you consider either running a [matrix] synapse yourself or start using someone elses:</p>
-    <p>Discord is evil, it took away the freedom you and I deserve, it makes you a slave to their services,<br> makes you obey their rules, includes you in a unwanted botnet where you have no freedom at all!</p>
-    <p>It's time to break free {{Auth::user()->username}}</p>
-    <p>Choose your fate</p>
-    <span id="bluepill"><a href="https://discordapp.com/app"></a></span> <span id="redpill"><a href="https://github.com/matrix-org/synapse" target="_blank"></a></span>
-    <p><code>#!w0bm:f0ck.it</code></p>
-    <br>
-    <p><small>We are happy to help if you have any trouble setting up your synapse</small></p>
-</div>
-</div>
-<canvas></canvas>
-<audio src="/clubbed.mp3" autoplay loop></audio>
-<script type="text/javascript">
-    // Initialising the canvas
-var canvas = document.querySelector('canvas'),
-    ctx = canvas.getContext('2d');
-
-// Setting the width and height of the canvas
-canvas.width = window.innerWidth;
-canvas.height = window.innerHeight;
-
-// Setting up the letters
-var letters = 'ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ';
-letters = letters.split('');
-
-// Setting up the columns
-var fontSize = 10,
-    columns = canvas.width / fontSize;
-
-// Setting up the drops
-var drops = [];
-for (var i = 0; i < columns; i++) {
-  drops[i] = 1;
-}
-
-// Setting up the draw function
-function draw() {
-  ctx.fillStyle = 'rgba(0, 0, 0, .1)';
-  ctx.fillRect(0, 0, canvas.width, canvas.height);
-  for (var i = 0; i < drops.length; i++) {
-    var text = letters[Math.floor(Math.random() * letters.length)];
-    ctx.fillStyle = '#0f0';
-    ctx.fillText(text, i * fontSize, drops[i] * fontSize);
-    drops[i]++;
-    if (drops[i] * fontSize > canvas.height && Math.random() > .95) {
-      drops[i] = 0;
-    }
-  }
-}
-
-// Loop the animation
-setInterval(draw, 33);
-</script>
\ No newline at end of file
diff --git a/resources/views/layout8/messages.blade.php b/resources/views/layout8/messages.blade.php
deleted file mode 100644
index 2c7aed8..0000000
--- a/resources/views/layout8/messages.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="dark-bg">
-@include('partials.msglist')
-    <div class="row">
-        <div class="col-md-6" id="list">
-            <div class="spinner">
-                <div class="cube1"></div>
-                <div class="cube2"></div>
-            </div>
-        </div>
-        <div class="col-md-6" id="message"><h4>Select a message to display content</h4></div>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout8/messages/commentanswer.blade.php b/resources/views/layout8/messages/commentanswer.blade.php
deleted file mode 100644
index 9e16805..0000000
--- a/resources/views/layout8/messages/commentanswer.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<span id="comm_answer"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment.</span>
-<span id="comm_answer"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> answered on your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></span>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout8/messages/commentmention.blade.php b/resources/views/layout8/messages/commentmention.blade.php
deleted file mode 100644
index ea15625..0000000
--- a/resources/views/layout8/messages/commentmention.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment.</h3>
-<p><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> mentioned you in a comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout8/messages/commentpreview.blade.php b/resources/views/layout8/messages/commentpreview.blade.php
deleted file mode 100644
index 46f257e..0000000
--- a/resources/views/layout8/messages/commentpreview.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-body">
-        @simplemd($comment->content)
-    </div>
-    <div class="panel-footer">by <a href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="right" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small></div>
-</div>
diff --git a/resources/views/layout8/messages/moderation/commentdelete.blade.php b/resources/views/layout8/messages/moderation/commentdelete.blade.php
deleted file mode 100644
index 734b4b6..0000000
--- a/resources/views/layout8/messages/moderation/commentdelete.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator deleted your comment.</h3>
-<p>A moderator deleted your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout8/messages/moderation/commentrestore.blade.php b/resources/views/layout8/messages/moderation/commentrestore.blade.php
deleted file mode 100644
index a8cf012..0000000
--- a/resources/views/layout8/messages/moderation/commentrestore.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h3>A moderator restored your comment.</h3>
-<p>A moderator restored your comment on the following video: <a href="{{url($video->id)}}">/{{$video->id}}</a></p>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout8/messages/moderation/videodelete.blade.php b/resources/views/layout8/messages/moderation/videodelete.blade.php
deleted file mode 100644
index 6a6568b..0000000
--- a/resources/views/layout8/messages/moderation/videodelete.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<h3>A moderator deleted your video.</h3>
-<p>A moderator deleted your video with the ID {{$video->id}}</p>
-<span style="font-weight:bold;">Video Info:</span>
-<ul>
-    @if(isset($videoinfo['artist'])) <li><span style="font-weight:bold;">Artist:</span> {{ $videoinfo['artist'] }}</li> @endif
-    @if(isset($videoinfo['songtitle'])) <li><span style="font-weight:bold;">Songtitle:</span> {{ $videoinfo['songtitle'] }}</li> @endif
-    @if(isset($videoinfo['video_source'])) <li><span style="font-weight:bold;">Video Source:</span> {{ $videoinfo['video_source'] }}</li> @endif
-    <li><span style="font-weight:bold;">Category:</span> {{ $videoinfo['category'] }}</li>
-</ul>
-<p><span style="font-weight:bold;">Reason:</span> {{$reason}}</p>
\ No newline at end of file
diff --git a/resources/views/layout8/messages/videocomment.blade.php b/resources/views/layout8/messages/videocomment.blade.php
deleted file mode 100644
index 6fd92f3..0000000
--- a/resources/views/layout8/messages/videocomment.blade.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<p class="vidcomment"><a href="{{url('user/' . $user->username)}}">{{$user->username}}</a> made a comment on your video ID (<a href="{{url($video->id)}}">/{{$video->id}}</a>)</p>
-@include('messages.commentpreview')
\ No newline at end of file
diff --git a/resources/views/layout8/nav.blade.php b/resources/views/layout8/nav.blade.php
deleted file mode 100644
index 2ec3f72..0000000
--- a/resources/views/layout8/nav.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<ul class="nav">
-  <div class="card">
-    <a class="badge badge-sexy">{{$video->id}}</a>
-      @if(count($video->tags))
-        @foreach($video->tags as $tag)
-          @if($tag == 'sfw')
-            <a class="badge badge-success isSfw">SFW</a>
-            @elseif($tag == 'nsfw')
-            <a class="badge badge-danger isNsfw">NSFW</a>
-          @endif
-        @endforeach
-      @endif
-  </div>
-
-        @if(auth()->check())
-          @if(auth()->user()->hasFaved($video->id))
-            <form action="{{url($video->id . '/fav')}}">
-              <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-              <button type="submit" id="fav" class="btn btn-dark" fav-data="{{url($video->id . '/fav')}}"><i class="fa fa-heart fa-lg"></i></button>
-            </form>
-          @else
-            <form action="{{url($video->id . '/fav')}}">
-              <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-              <button type="submit" id="fav" class="btn btn-dark bg-toggle"><i class="fa fa-heart-o fa-lg"></i></button>
-            </form>
-          @endif
-          @else
-          @endif
-  
- <li class="nav-link" data-trigger="hover" data-toggle="popover" data-content="Toggle Videoblur" data-placement="bottom">
-    <button type="button" class="btn btn-dark" id="togglebg"><i class="fa fa-power-off fa-lg"></i></button>
-  </li>
-
-  <li class="nav-link" data-trigger="hover" data-toggle="popover" data-content="Metadata" data-placement="bottom">
-    <button type="button" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
-      <i class="fa fa-lg fa-info-circle"></i>
-    </button> 
-    <div id="popover-content" hidden>
-      @include('video-partials.popover-metadata')
-    </div>
-  </li>
-</ul>
\ No newline at end of file
diff --git a/resources/views/layout8/open.sh b/resources/views/layout8/open.sh
deleted file mode 100644
index ab6ca5a..0000000
--- a/resources/views/layout8/open.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/sirx/web/w0bm.com/resources/views/
-ln -sf registeropen.blade.php register.blade.php
-php ../../artisan view:clear
diff --git a/resources/views/layout8/partials/banmenu.blade.php b/resources/views/layout8/partials/banmenu.blade.php
deleted file mode 100644
index a1607d0..0000000
--- a/resources/views/layout8/partials/banmenu.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<form id="banmenu" method="POST" action="/api/user/{{$user->username}}/ban">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="banmenumodal" tabindex="-1" role="dialog" aria-labelledby="Ban user">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="filterModalTitle">Ban user</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="reason">Reason</label>
-                        <input class="form-control" type="text" name="reason" id="reason" placeholder="Reason">
-                    </div>
-                    <div class="form-group">
-                        <label for="duration">Duration</label>
-                        <input class="form-control" type="text" name="duration" id="duration" placeholder="Duration (-1 = permanent)">
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                    <input type="submit" class="btn btn-danger" value="BAN!">
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/resources/views/layout8/partials/comlist.php b/resources/views/layout8/partials/comlist.php
deleted file mode 100644
index 8c0f191..0000000
--- a/resources/views/layout8/partials/comlist.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<script id="comlist" type="text/x-handlebars-template">
-            {{#each data as |value key|}}
-            <div class="panel panel-default">
-                <div class="panel-body" style="word-wrap: break-word;" data-index="{{key}}" data-id="{{id}}">{{{rendered_view}}}</div>
-                <div class="panel-footer">Video: <a href="/{{video_id}}">/{{video_id}}</a> | <time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-            </div>
-            {{else}}
-            <div class="list-group-item">No comments</div>
-            {{/each}}
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-</script>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/comment.blade.php b/resources/views/layout8/partials/comment.blade.php
deleted file mode 100644
index 17f9ced..0000000
--- a/resources/views/layout8/partials/comment.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel @if($del = !is_null($comment->deleted_at)) panel-danger @else @endif video-comment-wrapper" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
-    	  <div class="umrandung_name">
-    	<div class="comment_header"><a class="{{$comment->user->username}} user_color" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time> No. <a href="#{{ $comment->id }}">{{ $comment->id }}</a>
-            <div class="dingz">
-            @if($mod)
-            @if($del)
-                <a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
-            @else
-                <a class="delete_comment" href="#{{$comment->id}}" onclick="deleteComment($(this))">[del]</a>
-                <a class="edit_comment" href="#{{$comment->id}}" onclick="editComment($(this))">[edit]</a>
-            @endif
-        @endif
-    </div>
-    </div>
-</div>
-    <div class="comment panel-body video-comment-body" author="{{$comment->user->username}}">
-        @simplemd($comment->content)
-    </div>
-</div>
diff --git a/resources/views/layout8/partials/commentform.blade.php b/resources/views/layout8/partials/commentform.blade.php
deleted file mode 100644
index a04b99e..0000000
--- a/resources/views/layout8/partials/commentform.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="sticky">
-    <div id="commentForm">
-        <form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-            {!! csrf_field() !!}
-                <div class="comment-panel panel-default">
-                    <div class="comment-panel panel-body">
-                        {!! Form::textarea('comment', null, ['placeholder' => 'Write something...', 'id' => 'cinput', 'class' => 'form-control text-light comment-entry-textarea', 'required' => 'required']) !!}
-                    </div>
-                    
-                    <div class="commentButton">
-                        <div id="comment_tools" class="commentform-panel-footer">
-                            <div class="commentToolsWrapper">
-                                <button type="submit" class="btn btn-dark btn-sm" onclick="commentBotScroll()">Post</button>
-                                <span class="emojiCollapser btn btn-dark btn-sm" data-toggle="collapse" href="#collapseEmojis" role="button" aria-expanded="false" aria-controls="collapseEmojis">🦦 Emoji Picker</span>
-                                <div class="textModifiers btn btn-dark btn-sm">
-                                    <a  class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
-                                    <a  class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
-                                    <a  class="krebs" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
-                                    <a  class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
-                                </div>
-                                <span onclick="bottomArrow()" class="btn btn-dark btn-sm" style="cursor: pointer;"><i class="fa fa-arrow-down" aria-hidden="true"></i></span> 
-                                <a href="#" class="scrollToTop btn btn-dark btn-sm" style=""><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                            </div>
-                            <div class="collapse" id="collapseEmojis">
-                                <div class="emojiWrapper emojis">
-                                    <?php
-                                        $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.webp', GLOB_BRACE);
-                                        $files = array_map(function ($f) { return pathinfo($f); }, $files);
-                                    ?>
-                                    @foreach ($files as $file)
-                                        <a class="w0bm_emoji_anchor" title=":{{$file['filename']}}:" href="javascript:;" onclick="formatTextEmoji ('{{$file['filename']}}');"><img class="comment_emoji_small" src="//w0bm.com/images/comments/{{$file['basename']}}" loading="lazy"></a>
-                                    @endforeach
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/comments.blade.php b/resources/views/layout8/partials/comments.blade.php
deleted file mode 100644
index 15d5930..0000000
--- a/resources/views/layout8/partials/comments.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@if(Auth::check())
-<div class="commentOpener">
-    <a class="commentOpenButton" data-toggle="collapse" href="#collapseComments" role="button" aria-expanded="false" aria-controls="collapseComments">
-    See {{ $video->comments()->count() }} comments
-  </a>
-</div>
-<div class="collapse" id="collapseComments">
-  <div class=" commentwrapper comments">
-          <?php
-            if($mod = (Auth::check() && Auth::user()->can('delete_comment'))) $comments = $video->comments()->withTrashed()->get();
-            else $comments = $video->comments;
-        ?>
-        @if(count($comments) > 0)
-            @foreach($comments as $comment)
-                @include('partials.comment', ['comment' => $comment, 'mod' => $mod])
-            @endforeach
-        @else
-        <div class="panel panel-default nocomments">
-                <div class="panel-body">
-                    No comments yet! Be the first one to comment!<br />
-                </div>
-            </div>
-        @endif
-  </div>
-  @if($video->id == '30186')
-  @include('partials.thread_closed')
-  @else
-    @include('partials.commentform')
-    @endif
-</div>
-@endif
diff --git a/resources/views/layout8/partials/filterselect.blade.php b/resources/views/layout8/partials/filterselect.blade.php
deleted file mode 100644
index 8759e59..0000000
--- a/resources/views/layout8/partials/filterselect.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-head">
-		<h4 class="modal-title" id="filterModalTitle"><i class="fa fa-coffee"></i> Filter</h4>
-		<span>When entering a tag you will no longer see videos with that tag.</span>
-            </div>
-            <div class="modal-body">
-                <input id="filter" type="text" class="form-control" placeholder="Input tags…" name="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">
-                {{--<input class="form-control" type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-                <button href="/filter" type="submit" id="submitfilter" class="btn btn-dark" value="Save">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout8/partials/filtersettings.blade.php b/resources/views/layout8/partials/filtersettings.blade.php
deleted file mode 100644
index 74eb84f..0000000
--- a/resources/views/layout8/partials/filtersettings.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($video) && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id))
-        @include('partials.frontendedit')
-	@endif
-@endif
diff --git a/resources/views/layout8/partials/flash.blade.php b/resources/views/layout8/partials/flash.blade.php
deleted file mode 100644
index 73335c1..0000000
--- a/resources/views/layout8/partials/flash.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="flashcontainer">
-    <div class="flash-inner">
-        @if($errors->count() > 0)
-            @foreach($errors->all() as $error)
-                <div class="alert alert-danger alert-dismissable" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    {{ $error }}
-                </div>
-            @endforeach
-        @endif
-        @if(Session::has('error'))
-            <div class="alert alert-danger alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('error') }}
-            </div>
-        @endif
-        @if(Session::has('success'))
-            <div class="alert alert-success alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('success') }}
-            </div>
-        @endif
-        @if(Session::has('info'))
-            <div class="alert alert-info alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('info') }}
-            </div>
-        @endif
-        @if(Session::has('warning'))
-            <div class="alert alert-warning alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                {{ session('warning') }}
-            </div>
-        @endif
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/footer-navigation.blade.php b/resources/views/layout8/partials/footer-navigation.blade.php
deleted file mode 100644
index c9bfa74..0000000
--- a/resources/views/layout8/partials/footer-navigation.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<nav class="navbar navbar-dark bg-dark">
-	<h5>LOL</h5>
-</nav>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/frontendedit.blade.php b/resources/views/layout8/partials/frontendedit.blade.php
deleted file mode 100644
index 509dc61..0000000
--- a/resources/views/layout8/partials/frontendedit.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@if(isset($video))
-    <form id="webmedit" method="POST" action="/index/{{$video->id}}">
-        {!! csrf_field() !!}
-        <div class="modal fade" id="webmeditmodal" tabindex="-1" role="dialog" aria-labelledby="Edit webm">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title" id="filterModalTitle">Edit webm</h4>
-                    </div>
-                    <div class="modal-body frontendeditmodal">
-                        <div class="form-group">
-                        @if(auth()->check() && auth()->user()->can('delete_video'))
-                            <div class="form-group">
-                                <label for="imgsourceedit">Video Title</label>
-                                <input class="form-control" type="text" name="videotitle" id="videotitleedit" value="{{ $video->videotitle or ''}}" placeholder="Video Title">
-                            </div>
-                            <label for="interpretedit">Artist</label>
-                            <input class="form-control" type="text" name="interpret" id="interpretedit" value="{{ $video->interpret or ''}}" placeholder="Artist">
-                        </div>
-                        <div class="form-group">
-                            <label for="songtitleedit">Songtitle</label>
-                            <input class="form-control" type="text" name="songtitle" id="songtitleedit" value="{{ $video->songtitle or ''}}" placeholder="Songtitle">
-                        </div>
-                        <div class="form-group">
-                            <label for="imgsourceedit">Video Source</label>
-                            <input class="form-control" type="text" name="imgsource" id="imgsourceedit" value="{{ $video->imgsource or ''}}" placeholder="Video Source">
-                            @endif
-                        </div>
-                        @if(auth()->check() && auth()->user()->can('delete_video'))
-                        <div class="form-group">
-                            <label for="categoryselect">Category</label>
-                            <select class="form-control" name="category" id="categoryselect">
-                                @foreach(\App\Models\Category::all() as $category)
-                                <option value="{{$category->id}}" @if($video->category->id == $category->id) selected @endif>{{$category->name}}</option>
-                                @endforeach
-                            </select>
-                        </div>
-                        @endif
-                        <div class="form-group">
-                            <label for="tageditor">Add Tags</label>
-                            <div class="frontendedittags">
-                                @include('partials.tags')
-                            </div>
-                        </div>
-                        <div class="deleteit">
-                            @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#"><i class="fa fa-trash fa-lg"></i> Remove upload</a>@endif
-                        </div>
-                    </div>
-                    @if(auth()->check() && auth()->user()->can('delete_video'))
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-dark">Save changes</button>
-                    </div>
-                    @endif
-                </div>
-            </div>
-        </div>
-    </form>
-@endif
diff --git a/resources/views/layout8/partials/handlebars.php b/resources/views/layout8/partials/handlebars.php
deleted file mode 100644
index 3a70c75..0000000
--- a/resources/views/layout8/partials/handlebars.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="paginationtmpl" type="text/x-handlebars-template">
-    <nav class="mitte">
-        <ul class="pagination">
-            {{#paginate pagination type="first"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">First</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="previous"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&laquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="middle" limit="7"}}
-            <li {{#if active}}class="active"{{/if}}><a href="#" data-page="{{n}}">{{n}}</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="next"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">&raquo;</a></li>
-            {{/paginate}}
-            {{#paginate pagination type="last"}}
-            <li {{#if disabled}}class="disabled"{{/if}}><a href="#" data-page="{{n}}">Last</a></li>
-            {{/paginate}}
-        </ul>
-    </nav>
-    <div class="clearfix"></div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/header.blade.php b/resources/views/layout8/partials/header.blade.php
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/views/layout8/partials/loginmodal.blade.php b/resources/views/layout8/partials/loginmodal.blade.php
deleted file mode 100644
index 91551b0..0000000
--- a/resources/views/layout8/partials/loginmodal.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="modal fade" id="loginmodal" tabindex="-1" role="dialog" aria-labelledby="Login">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Login</h4>
-            </div>
-            
-            <div class="login_wrapper">
-            	<div class="col-md-9">
-					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
-						{!! csrf_field() !!}
-                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
-                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
-                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
-					</form>
-				</div>
-	   		</div>
-
-		<div class="modal-footer">
-			<p>Registration has been disabled due to multiple spammers, if you want an account, please apply for it in the <a href="/irc">IRC</a>, thanks!</p>
-        	</div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout8/partials/msglist.php b/resources/views/layout8/partials/msglist.php
deleted file mode 100644
index 703afee..0000000
--- a/resources/views/layout8/partials/msglist.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<script id="msglist" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading-messages">
-            <h3 class="panel-title">Messages</h3> <button class="btn btn-dark readall" onclick="readAll()">Read all</button>
-        </div>
-
-        <div class="list-group" id="listitems">
-            {{#each data as |value key|}}
-            <a href="#" data-index="{{key}}" data-id="{{id}}" class="list-group-item {{#unless read}}list-group-item-info{{/unless}}">{{subject}}</a>
-            {{else}}
-            <div class="list-group-item">No messages</div>
-            {{/each}}
-        </div>
-        {{#if total}}
-        <div class="panel-footer" id="pagination">
-        </div>
-        {{/if}}
-    </div>
-</script>
-
-<script id="msgtmpl" type="text/x-handlebars-template">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{{subject}}</h3>
-        </div>
-        <div class="panel-body">
-            {{{content}}}
-        </div>
-        <div class="panel-footer"><time class="timeago" data-toggle="tooltip" datetime="{{created_at}}+0000" title="{{created_at}}+0000"></time></div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/navigation.blade.php b/resources/views/layout8/partials/navigation.blade.php
deleted file mode 100644
index 43e9e88..0000000
--- a/resources/views/layout8/partials/navigation.blade.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top">
-    <div class="w0bm-logo">
-        <a class="navbar-brand" href="/main">
-            <img id="logo" src="https://w0bm.com/w0bm_mosh_banner_by_marderchen.gif" class="d-inline-block align-top" alt="w0bm.com">
-        </a>
-    </div>
-  	<ul class="navbar-nav mr-auto">
-      @if (!empty($__env->yieldContent('novidcontent')))
-      @else
-      
-        @endif
-        @if(Auth::check())
-        <li class="nav-link dropdown">
-        <button id="nav-user" class="btn btn-dark nav-link bg-toggle dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span>
-            @if(Auth::user()->messagesRecv()->unread()->count() < 1)
-            <span class="nomsg">|</span>@else
-            <span class="yesmg">|</span>@endif {{Auth::user()->username}}</span>
-        </button>
-          <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-  <div class="grid-menu">
-      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}/favs"><span class=""><i class="fa fa-heart"></i></span></a>
-      <a class="dropdown-item" href="{{url('messages')}}"><span class=""><i class="fa fa-envelope-square"></i> {{Auth::user()->messagesRecv()->unread()->count()}}</span></a>
-      <a class="dropdown-item" href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
-      <a class="dropdown-item" href="{{url('upload')}}">Upload</a>
-  </div>
-            <a class="dropdown-item logout" href="{{url('logout')}}">Logout</a>
-          </div>
-        @else
-   
-        @endif
-      </li>
-      @if(Auth::check())
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Links
-        </a>
-        <div class="dropdown-menu LinksGrid" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" href="/index">Index</a>
-          <a class="dropdown-item" href="/categories">Categories</a>
-          <a class="dropdown-item" href="/about">About</a>
-          <a class="dropdown-item" href="/irc">IRC</a>
-          <a class="dropdown-item" href="/rules">Rules</a>
-          <a class="dropdown-item" href="/stats">Stats</a>
-        </div>
-      </li>
-<li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Layout
-        </a>
-        <div id="layoutSwitcher" class="dropdown-menu" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" id="layout1" href="#">Atmos</a>
-          <a class="dropdown-item" id="layout3" href="#">z0mb</a>
-        </div>
-      </li>
-
-  </ul>
-    @else
-@endif
-
-@if (\Request::is('index'))
-      <div class="search-index hidden-xs d-none d-md-block">
-        <form method="get" action="/index" class="form-inline my-2 my-lg-0">
-	    {!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
-	    <button class="search-btn btn btn-dark" type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
-        </form>
-    </div>
-@else
-      <div class="search-index hidden-xs d-none d-md-block">
-        <form method="get" action="/main" class="form-inline my-2 my-lg-0">
-            {!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
-            <button class="search-btn btn btn-dark" type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
-        </form>
-    </div>
-@endif
-</nav>
\ No newline at end of file
diff --git a/resources/views/layout8/partials/profileheader.blade.php b/resources/views/layout8/partials/profileheader.blade.php
deleted file mode 100644
index c9ebd0b..0000000
--- a/resources/views/layout8/partials/profileheader.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="page-header p-2">
-    <h3 class="{{ $user->username }}">{!! rtrim(e($user->username) . ' ' . $user->activeIcon()) !!} @if($user->disabled && isset($user->banend) && (Carbon\Carbon::now() <= $user->banend || 1 >= $user->banend->timestamp))<span style="color: grey; font-size: 15px;">(@if(Carbon\Carbon::now() <= $user->banend)Ban expires in <time class="timeago" data-toggle="tooltip" title="{{ $user->banend }}+0000" datetime="{{ $user->banend }}+0000"></time>@else permanently banned @endif)</span>@endif</h3>
-<div class="admin-settings">
-@if(auth()->check() && auth()->user()->can('edit_user'))<span id="pannade"><a href="#" data-toggle="modal" data-target="#banmenumodal"><i style="color:red;" class=""></i>[ban user]</a></span>
-@endif
-</div>
-    <span id="jointime">Joined: <time class="timeago" datetime="{{ $user->created_at }}+0000" title="{{ $user->created_at }}+0000" data-toggle="tooltip"></time></span>
-<div class="profile-info">
-    <span id="count-upload"> <a href="/user/{{$user->username}}"> <i class="fa fa-cloud-upload"></i> {{ $user->uploads()->countScoped()->count() }} Uploads</a></span>
-
-    <span id="comments-user"> <a href="/user/{{$user->username}}/comments"><i class="fa fa-commenting"></i> {{ $user->comments()->count() }} Comments</a></span>
-
-    <span id="favs-user"><a href="/user/{{$user->username}}/favs/index"><i class="fa fa-heart"></i> {{ $user->favs()->countScoped()->count() }} Favorites</a></span>
-</div>
-@if($user->isOnline())
-    user is online!!
-@endif
-</div>
diff --git a/resources/views/layout8/partials/registermodal.blade.php b/resources/views/layout8/partials/registermodal.blade.php
deleted file mode 100644
index d56589a..0000000
--- a/resources/views/layout8/partials/registermodal.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="modal fade" id="registermodal" tabindex="-1" role="dialog" aria-labelledby="Register">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="filterModalTitle">Register</h4>
-            </div>
-            
-            <div class="advantages">
-              <p>Registering on w0bm has some advantages...</p>
-              <p>With a account you can comment on WebMs, favor WebMs, upload WebMs, tag videos, filter out unwanted tags and watch NSFW WebMs!</p>
-            </div>
-
-            <div class="reg_wrapper">
-	   		        <div class="register">
-                  <div class="col-md-10">
-                    <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-                      {!! csrf_field() !!}
-                        <div class="form-group">
-                          <div class="reg_username">
-                            {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                          </div>
-                        </div>
-                
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                          </div>
-                        </div>
-              
-                        <div class="form-group">
-                          <div class="reg_password">
-                            {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                          </div>
-                        </div>
-            
-                        <div class="form-group">
-                          <div class="recaptcha">
-                            {!! Recaptcha::render() !!}
-                          </div>
-                        </div>
-                      
-                        <div class="form-group terms">
-                          <div class="verify_rules">
-                            <p><input type="checkbox" required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-                          </div>
-                        
-                          <div class="submit_registration">
-                            <button type="submit" class="btn btn-primary">Register</button>
-                          </div>
-                        </div>
-                    </form>
-                  </div>
-                </div>
-            </div>
-
-            <div class="modal-footer">
-              <p>Back to <a href="#" data-toggle="modal" data-target="#loginmodal" data-dismiss="modal">Login?</a></p>
-            </div>
-    </div>
-</div>
-</div>
diff --git a/resources/views/layout8/partials/report.blade.php b/resources/views/layout8/partials/report.blade.php
deleted file mode 100644
index 07de851..0000000
--- a/resources/views/layout8/partials/report.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- created by klee -->
-@if(isset($video))
-  <form id="webmreport" method="POST" action="/report/{{$video->id}}">
-    {!! csrf_field() !!}
-    <div class="modal fade" id="webmreportmodal" tabindex="-1" role="dialog" aria-labelledby="Report webm">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title" id="filterModalTitle">Report WebM</h4>
-          </div>
-          <div class="modal-body webmreportmodal">
-            So you want to report this webm? Tell us why:<br>
-            <br>
-            <div class="form-group">
-              <label for="reportReasons">
-                Reason(s)<br>
-                <em>(hold ctrl to select multiple)</em>
-              </label>
-              <select multiple class="form-control" id="reportReasons" name="reportReasons[]">
-                <option>Wrong rating (sfw/nsfw)</option>
-                <option>Shitpost</option>
-                <option>Low quality/effort video</option>
-                <option>Breaks a rule</option>
-                <option>Other</option>
-                <!-- breaks a rule, Wrong safe for rating -->
-              </select>
-            </div>
-            <label for="reportReasonText">Please explain a bit more detailed why you want to report this webm</label>
-            <textarea class="form-control" id="reportText" name="reportText" rows="3" required></textarea>
-            <p>Abuse of this form will be awarded with a permanent ban!</p>
-          </div>            
-          <div class="modal-footer">
-            <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-dark">Send Report</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </form>
-@endif
\ No newline at end of file
diff --git a/resources/views/layout8/partials/tags.blade.php b/resources/views/layout8/partials/tags.blade.php
deleted file mode 100644
index 26b8293..0000000
--- a/resources/views/layout8/partials/tags.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="tags">
-    <div class="tagtest">
-    @if(Auth::check())
-    <div id="tag-add">
-        <div class="row">
-            <div class="col tag-col">
-                <div class="input-group">
-                    {{--<select multiple name="tags[]" data-role="tagsinput" class="form-control"></select>--}}
-                    <input id="tags" type="text" class="form-control" placeholder="Input tags…" name="tags" data-role="tagsinput">
-                    <span class="input-group-btn"></span>
-                </div>
-            </div>
-        </div>
-    <div class="sendtags">
-        <button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-dark">Submit</button>
-    </div>          
-    </div>
-    @else
-        @endif
-    </div>
-    <label for="manage-tags">Manage Tags</label>
-    <div class="toggo tag-panel-body">
-        <div id="tag-display" class="tag-panel-body">
-            @if(count($video->tags))
-                @foreach($video->tags as $tag)
-                @if($tag == 'sfw')
-                @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
-                @elseif($tag == 'nsfw')
-                @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a></span>@endif
-                @else
-                    @if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
-                    @endif
-                @endforeach
-            @else
-                No tags yet ...
-            @endif
-        </div>
-    </div>
-</div>
diff --git a/resources/views/layout8/partials/themechanger.blade.php b/resources/views/layout8/partials/themechanger.blade.php
deleted file mode 100644
index 2efed41..0000000
--- a/resources/views/layout8/partials/themechanger.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<li role="presentation" class="">
-    <a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span> Theme
-    </a>
-<ul class="dropdown-menu">
-    <div id="switcher">
-        <button class="w0bmcustom-css" onclick="setActiveStyleSheet('w0bmcustom'); return false;">Default</button>
-        <br>
-	<button class="chilledblue-css" onclick="setActiveStyleSheet('Chilledblue'); return false;">Chilledblue</button>
-	<br>
-	<button class="xayd-css" onclick="setActiveStyleSheet('Xayd'); return false;">Xayd</button>
-        <br>
-    <button class="glitch-css" onclick="setActiveStyleSheet('Glitch'); return false;">Glitch</button>
-    <br>    
-        <button class="epilepsie-css" onclick="alert('This theme can cause seizures and headaches, use with care!'); setActiveStyleSheet('Epilepsie'); return false;">Epilepsie</button>
-    </div>
-</ul>
-</li>
diff --git a/resources/views/layout8/partials/thread_closed.php b/resources/views/layout8/partials/thread_closed.php
deleted file mode 100644
index 03d2e52..0000000
--- a/resources/views/layout8/partials/thread_closed.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thread_closed">
-  <span>Thread closed! ;__;</span>
-</div>
diff --git a/resources/views/layout8/partials/uploadinfo.blade.php b/resources/views/layout8/partials/uploadinfo.blade.php
deleted file mode 100644
index 0653081..0000000
--- a/resources/views/layout8/partials/uploadinfo.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="vidinfo">
-						<button title="Toggle Background" class="hidden-xs bg-toggle" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
-							<div style='word-break: break-word;'>@if($video->interpret) <strong>Artist:</strong> {{$video->interpret}}<br>@endif
-											@if($video->songtitle) <strong>Songtitle:</strong> {{$video->songtitle}}<br>@endif
-											@if($video->imgsource) <strong>Video Source:</strong> {{$video->imgsource}} <br>
-											@endif
-											<strong>Category:</strong> {{$video->category->name}}</div>
-						<span id="uploader">uploaded by <a style="color: white" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>@if(auth()->check() && (auth()->user()->can('edit_video') || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#">[del]</a>@endif 
-	</div>
diff --git a/resources/views/layout8/partials/videoinfo.blade.php b/resources/views/layout8/partials/videoinfo.blade.php
deleted file mode 100644
index aba4c4b..0000000
--- a/resources/views/layout8/partials/videoinfo.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-			<div class="text-center">
-				@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}">🡄 first</a>
-						<a id="prev" href="{{url($related->baseurl(), [$prev->id])}}">🡄 prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next 🡆</a>
-						<a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last 🡆</a>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<a class="first" href="#" style="visibility: hidden;">🡄 first</a>
-						<a id="prev" href="#" style="visibility: hidden;">🡄 prev</a> |
-					@else
-						<a class="first" href="{{url($video->getFirstId())}}">🡄 first</a>
-						<a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a>
-						<a class="last" href="{{url($video->getLastId())}}">last 🡆</a>
-					@endif
-				@endif
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout8/privacy.blade.php b/resources/views/layout8/privacy.blade.php
deleted file mode 100644
index 1066ee4..0000000
--- a/resources/views/layout8/privacy.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-@extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>Privacy</h3>
- </div>
-
-<div class="box">
-<h5>What do we log?</h5>
-<p>We ourself don't log anything, cloudflare does log all the request that are being made to our site, we can however only access very little of it, no ips and only basic stats.</p>
-<h5>3<sup>rd</sup> party links</h5>
-<p>There are some 3rd party linkings on this website, be careful with clicking them we don't know whats inside the box blah blah blah, don't be stupid and don't trust the internet.</p>
-<p>If you encounter a malicious link shared here on w0bm.com please notify an admin in the IRC.</p>
-<p>We also use a webfont from google fonts, if you don't like that go fuck yourself or block it with umatrix.</p>
-<h5>Cookies</h5>
-<p>Yes, we use cookies if you don't like that don't come to our site! (or don't accept them in the first place)</p>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout8/profile.blade.php b/resources/views/layout8/profile.blade.php
deleted file mode 100644
index baf7fe5..0000000
--- a/resources/views/layout8/profile.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.profileheader')
-	<div class="profilheader p-2">
-	    <a href="/{{$user->baseurl()}}/">View {{ $title }}</a>
-	</div>
-            <table class="table table-hover table-condensed">
-                <thead>
-                <tr>
-		    <th>ID</th>
-		    <th>Video Title</th>
-                    <th>Artist</th>
-                    <th>Songtitle</th>
-                    <th class="hidden-xs">Video Source</th>
-                    <th>Category</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($videos as $video)
-                    <?php
-                        $thumb = str_replace(".webm","",$video->file);
-                    ?>
-                    <tr data-thumb="{{$thumb}}">
-			<td><a href="/{{$user->baseurl()}}/{{$video->id}}">{{$video->id}}</a></td>
-			<td>{{$video->videotitle or ''}}</td>
-                        <td>{{$video->interpret or ''}}</td>
-                        <td>{{$video->songtitle or ''}}</td>
-                        <td class="hidden-xs">{{$video->imgsource or ''}}</td>
-                        <td><a href="{{url($video->category->shortname)}}">{{$video->category->name}}</a></td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            {!! $videos->render() !!}
-@endsection
diff --git a/resources/views/layout8/profilelayout.blade.php b/resources/views/layout8/profilelayout.blade.php
deleted file mode 100644
index 140d937..0000000
--- a/resources/views/layout8/profilelayout.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="_token" content="{{csrf_token()}}">
-    <meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
-    <link rel="icon" href="/favicon.png">
-    <title>w0bm.com</title>
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-dark.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-tagsinput.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/njum/css/cstms.css?v={{ filemtime("njum/css/cstms.css") }}">
-</head>
-<body>
-    @include('partials.handlebars')
-@if(auth()->check())
-    @include('partials.filterselect')
-    @if(isset($user) && auth()->user()->can('edit_user'))
-        @include('partials.banmenu')
-    @endif
-@endif
-    <div data-simplebar class="container-fluid">
-        <div class="container">
-            @include('partials.navigation')
-            @yield('novidcontent')
-        </div>
-    </div>
-</body>
-<script type="text/javascript" defer src="/njum/js/jquery.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/jquery.timeago.js"></script>
-<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/handlebars.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/newscript.js"></script>
-</html>
diff --git a/resources/views/layout8/register.blade.php b/resources/views/layout8/register.blade.php
deleted file mode 100644
index bef7af1..0000000
--- a/resources/views/layout8/register.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-@include('partials.flash')
-    <div class="page-header">
-	<h5>Register your w0bm.com Account</h5>
-<p style="color:red;">Note: We do not reset passwords, make sure to write down your password on paper, otherwise you need create a new account or start to circlejerk in the IRC!</p>
-    </div>
-    <div class="register">
-        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
-            {!! csrf_field() !!}
-            <div class="form-group">
-                <div class="">
-                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    {!! Recaptcha::render() !!}
-                </div>
-	    </div>
-	    <div class="form-group terms">
-		<div style="text-align: center;">
-		<p><input type="checkbox" name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
-		</div>
-		<div class="">
-                    <button type="submit" class="btn btn-primary">Register</button>
-                </div>
-            </div>
-        </form>
-    </div>
-<!--    <div class="form-group" style="
-		text-align: center;
-		background: rgba(0, 0, 0, 0.75);
-		margin-left: 5px;
-                margin-right: 5px;
-    				  ">
-	<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
-	<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
-    </div>
--->    
-@endsection
-
diff --git a/resources/views/layout8/registerclosed.blade.php b/resources/views/layout8/registerclosed.blade.php
deleted file mode 100644
index f45f3d7..0000000
--- a/resources/views/layout8/registerclosed.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@extends('layout')
-@section('content')
-<style>
-html body {
-     animation: anfall 0.2s;
-     -webkit-animation: anfall 0.2s;
-     animation-iteration-count: infinite;
-     margin: 0;
-     padding: 0;
-     height: 100%;
-     overflow: hidden;
- }
-
-@keyframes anfall {
-    0%   {background: red;}
-    25%  {background: yellow;}
-    50%  {background: blue;}
-    75%  {background: pink;}
-    100% {background: red;}
-}
-
-@-webkit-keyframes anfall {
-    0%   {background: black;}
-    25%  {background: white;}
-    50%  {background: black;}
-    75%  {background: white;}
-    100% {background: black;}
-}
-
-div.a {
-width: 50px;
-height:50px;
-}
-@endsection
diff --git a/resources/views/layout8/rules.blade.php b/resources/views/layout8/rules.blade.php
deleted file mode 100644
index 30df1ef..0000000
--- a/resources/views/layout8/rules.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header">
-        <h4>Rules for w0bm.com</h4>
-</div>
-<p>These are more or less guidelines for a friendly and peaceful together, please don't try to abuse this or push it to the limits.</p>
-<div class="box">
-<h5>General</h5>
-<ol>
-	<li>Content on this website is intended for adults (18+), we can't check your age and don't want to, but keep this in mind, this is a website by adults for adults.</li>
-	<li>No Comment or Tag spamming</li>
-	<li>No Child porn and/or underage modeling videos/links to websites</li>
-	<li>No racism, I know this can be defined however someone wants, but deep inside most of us know when it's going into the racism direction and I don't want to see that here.</li>
-	<li>Be friendly to each other!</li>
-	<li>No Terrorist Propaganda and Content!</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Uploading</h5>
-<ol>
-	<li>The focus is on videos that are catchy and fun to watch, for example <a href="/index?q=loop">loops</a> this does not mean these are the only videos we welcome, it's just our main focus, we have plenty of videos that are completely unrelated to loops or catchy stuff and are still fitting, ask yourself "does my upload fit on w0bm.com?" and if yes, you're good to go!</li>
-	<li>The Artist and Songtitle field is only for the Artist and Song information respectively, anything else in there probably doesn't belong in there, use the Tags.</li>
-	<li>I reserve the right to remove uploads that I consider not worth being on w0bm.com without comment, discussions about deleted videos will be ignored and can lead in extreme cases to a ban.</li>
-	<li>No videos with watermarks like coub.com they will be removed regardless of quality, please take the time to either recreate or censor the watermark.</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Tagging</h5>
-<ol>
-	<li><b>You have to add at least 3 tags describing the video, not doing so can lead to a ban.</b></li>
-	<li>Tags should always describe what you see in the video and maybe some additional informations</li>
-	<li>No links in the Tags, use the comment section for that!</li>
-	<li>Always give your video a rating like "sfw" or "nsfw" so people can filter.</li>
-	<li>Comments are not welcome in the Tag section</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Commenting</h5>
-<ol>
-	<li>You don't have to be polite, but you also don't have to be an asshole.</li>
-	<li>NSFW images should only be posted on NSFW videos.</li>
-	<li>Live with different opinions, and deal with it.</li>
-	<li>No scam links or links to paywall sites, no unauthorized advertisment</li>
-</ol>
-</div>
-
-<div class="box">
-<h5>Reposts</h5>
-<ul style="text-align:left;">
-<li>Tag reposts with the tag: repost also link the original and the repost in the comments, maybe some admin or moderator is going to care about it and deletes the repost.</li>
-</ul>
-</div>
-<p>These rules can change at any time!</p>
-
-<?php
-$filename = '/home/sirx/web/w0bm.com/resources/views/rules.blade.php';
-if (file_exists($filename)) {
-    echo "Last modified: " . date ("F d Y H:i:s.", filemtime($filename));
-}
-?>
-
-@include('footer')
-@endsection
diff --git a/resources/views/layout8/rulez.blade.php b/resources/views/layout8/rulez.blade.php
deleted file mode 100644
index 0ef0fdc..0000000
--- a/resources/views/layout8/rulez.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-    <div class="page-header p-2">
-        <h3>Rulez</h3>
-    </div>
-    <div class="dark-bg">
-    <div class="box">
-        <h5>General</h5>
-        <ol>
-        @foreach($generalrules as $rule)
-        <li>{{$rule->rule}}</li>
-        @endforeach    
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Uploading</h5>
-        <ol>
-        @foreach($uploadrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Tagging</h5>
-        <ol>
-        @foreach($tagrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-    <div class="box">
-        <h5>Commenting</h5>
-        <ol>
-        @foreach($commentrules as $rule)
-        <li>{!!$rule->rule!!}</li>
-        @endforeach
-        </ol>
-    </div>
-</div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout8/settings.blade.php b/resources/views/layout8/settings.blade.php
deleted file mode 100644
index 058ca9a..0000000
--- a/resources/views/layout8/settings.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="box">
-    <ul class="list-group">
-        <li class="list-group-item"><a href="/api/user/layout?layout=1">w0bm.com</a> <span class="text-end">[The default Layout]</span></li>
-        <li class="list-group-item active"><a href="/api/user/layout?layout=2">Njum</a> <span class="text-end">[More focussed on the video, also 4:3]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=3">z0mb</a> <span class="text-end">[z0r.de Layout]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=4">nojs</a> <span class="text-end">[For the nojs neckbeards, lol]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=5">Mobile</a> <span class="text-end">[The default Layout optimized for mobile usage]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=6">Marderchen</a> <span class="text-end">[Marderlayout, older version of the default layout but without async JS]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=7">2017</a> <span class="text-end">[w0bm.com from ~2017]</span></li>
-        <li class="list-group-item"><a href="/api/user/layout?layout=8">2015</a> <span class="text-end">[The OG w0bm.com Layout]</span></li>
-</ul>
-</div>
-  @endsection
\ No newline at end of file
diff --git a/resources/views/layout8/stats.blade.php b/resources/views/layout8/stats.blade.php
deleted file mode 100644
index 10f3128..0000000
--- a/resources/views/layout8/stats.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header p-2">
-        <h3>Stats</h3>
-</div>
-<div class="dark-bg">
-<div class="box">
-	<p class="user_count">Total amount of registered users: <amount>{{$user_count}}</amount></p>
-	<p class="upload_count">Total amount of uploads: <amount>{{$upload_count}}</amount></p>
-	<p class="comment_count">Total amount of comments: <amount>{{$comment_count}}</amount></p>
-	<p class="latest-video">Latest video <a href="/{{$latest_video}}">/{{$latest_video}}</a></p>
-	<p class="newest_user">Newest user <a href="/user/{{$newest_user}}">/user/{{$newest_user}}</a></p>
-	<p class="dirsize">Total size of w0bm: <amount>{{$dirsize}}</amount></p>
-</div>
-</div>
-@endsection
diff --git a/resources/views/layout8/tos.blade.php b/resources/views/layout8/tos.blade.php
deleted file mode 100644
index 2a17267..0000000
--- a/resources/views/layout8/tos.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<h5>Terms of Service</h5>
-<p>Being a member of w0bm.com can be described best with the following quote: <blockquote>„It's a privilege, not a right“</blockquote></p>
-<p>w0bm.com is a voluntary project provided to you free of charge for the sole purpose of enjoyment and amusement for you the users.</p>
-<p>You (the users) agree to read and accept the rules and behave accordingly when on w0bm.com</p>
-<p>w0bm.com can terminate accounts, comments and/or uploads at any time without any reason</p>
-<p>Hotlinking our direct video urls is not welcome, since it puts the whole collection in danger of copyright reports. Please do not share any direct links in frequently visited forums! w0bm.com may need to block hotlinking and direct url access if problems will occur, which has negative side effects for nearly everyone using this site on a daily basis.</p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/layout8/transparency.blade.php b/resources/views/layout8/transparency.blade.php
deleted file mode 100644
index 2b4592f..0000000
--- a/resources/views/layout8/transparency.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('profilelayout')
-@section('content')
-<div class="page-header">
-<h4>Transparency</h4>
-</div>
-
-<div class="box">
-<h5>Takedown notices and other shit</h5>
-<ul>
-	<li><a href="/07072016-FSM.txt">07.07.2016 FSM Takedown Notice</a></li>
-	<li><a href="/30012019-CTIRU.txt">30.01.2019 Metropolitan Police Service Terrorist Content Takedown Notice</a></li>
-</ul>
-</div>
-@include('footer')
-@endsection
diff --git a/resources/views/layout8/upload.blade.php b/resources/views/layout8/upload.blade.php
deleted file mode 100644
index 2fb4153..0000000
--- a/resources/views/layout8/upload.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-
-<!-- later @include('partials.flash') -->
-
-<div class="page-header p-2">
-    <h3>Upload</h3>
-</div>
-
-<div class="container p-2 dark-bg">
-        <ul class="list-group">
-            <li class="list-group-item">
-                @include('partials.flash')
-                <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-                    <a id="dragndrop-link" href="#">
-                        <span style="display: table; width: 100%; height: 100%;">
-                            <span id="dragndrop-text">
-                                <i class="fa fa-cloud-upload"></i>
-                                    Drop or select WebM!
-                            </span>
-                        </span>
-                    </a>
-                </div>
-            </li>
-
-            <li class="list-group-item">{!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}</li>
-            <li class="list-group-item">{!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}</li>
-            <li class="list-group-item">{!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}</li>
-            <li class="list-group-item">{!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}</li>
-            <li class="list-group-item">
-                <?php 
-                    $categories = [];
-                    foreach(App\Models\Category::all() as $cat)
-                    $categories[$cat->id] = $cat->name;
-                ?>
-                {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-            </li>
-            <li class="list-group-item">
-                {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw" class="badge badge-danger">NSFW?</label>
-                {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'row', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}
-            </li>
-            <li class="list-group-item">
-                <div class="uploadButton">
-                    <button id="btn-upload" type="button" class="btn btn-dark btn-sm"><span class="laz0r">Fire the laz0r</span>
-                        <span class="" id="laz0r-fire"></span>
-                        <span class="hidden-xs" id="shoop-laz0r"></span>
-                    </button>
-                    <p>Before you fire the laz0r make sure you have read the <a href="/rules">Rules</a>! <br><i>With great power comes great responsibility</i></p>
-		            <p><b>10</b> uploads <b>every 12 hours.</b> – Maximum filesize: <b>40MB.</b> – Only <b>.webm (vp8/vp9) with sound</b> allowed. Need <a href="/webm">help?</a></p>
-                </div>
-            </li>
-        </ul>
-</div>
-
-        <input name="file" type="file" hidden accept=".webm"></input>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layout8/video-partials/disqus.blade.php b/resources/views/layout8/video-partials/disqus.blade.php
deleted file mode 100644
index 7cee7e9..0000000
--- a/resources/views/layout8/video-partials/disqus.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="disqus_thread"></div>
-<script>
-
-/**
-*  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-*  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
-/*
-var disqus_config = function () {
-this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
-};
-*/
-(function() { // DON'T EDIT BELOW THIS LINE
-var d = document, s = d.createElement('script');
-s.src = 'https://w0bm.disqus.com/embed.js';
-s.setAttribute('data-timestamp', +new Date());
-(d.head || d.body).appendChild(s);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-                            
\ No newline at end of file
diff --git a/resources/views/layout8/video-partials/legacy-metadata.blade.php b/resources/views/layout8/video-partials/legacy-metadata.blade.php
deleted file mode 100644
index 99739fc..0000000
--- a/resources/views/layout8/video-partials/legacy-metadata.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<ul class="nav justify-content-center">
-<div class="monchichi">
-<li class="safe-for-rating legacy-item">
-      <a class="badge video-id">{{$video->id}}</a>
-      <a class="badge video-rating {{$sfw ? 'sfw' : 'nsfw'}}">{{$sfw ? "sfw" : "nsfw"}}</a>
-</li>
-  <li class="legacy-item">
-   @if(auth()->check())
-@if(auth()->user()->hasFaved($video->id))
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark" fav-data="{{url($video->id . '/fav')}}"><i class="fa fa-heart fa-lg"></i></button>
-  </form>
-@else
-  <form action="{{url($video->id . '/fav')}}">
-    <a hidden id="hidden-fav" href="{{url($video->id . '/fav')}}"></a>
-    <button type="submit" id="fav" class="btn btn-dark bg-toggle"><i class="fa fa-heart-o fa-lg"></i></button>
-  </form>
-@endif
-@else
-@endif
-  </li>
-  <li class="legacy-item">
-    <button class="copylink" data-clipboard-text="{{url($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
-  </li>
-  <li class="legacy-item">
-        <button type="button" id="infobox" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
-      <i class="fa fa-lg fa-info-circle"></i>
-    </button> 
-  </li>
-  <li class="legacy-item">
-        <div id="popover-content" hidden>
-      @include('video-partials.popover-metadata')
-    </div>
-  </li>
-  <li class="legacy-item">
-    <button type="button" class="btn btn-dark" id="togglebg"><i class="fa fa-power-off fa-lg"></i></button>
-  </li>
-  <li class="legacy-item">
-
-<button id="webm_edit" class="btn btn-dark" data-toggle="modal" data-target="#webmeditmodal"><i class="fa fa-edit fa-lg"></i></button>
-
-	<li class="legacy-item">
-		<button id="webm_report" class="btn btn-dark" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-warning fa-md"></i></button>
-	</li>
-  </div>
-</ul>
\ No newline at end of file
diff --git a/resources/views/layout8/video-partials/legacy-videonav.blade.php b/resources/views/layout8/video-partials/legacy-videonav.blade.php
deleted file mode 100644
index c4bb002..0000000
--- a/resources/views/layout8/video-partials/legacy-videonav.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="row videonavigation">
-@if($related)
-					@if(($prev = $video->getPrev($related)) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($related->baseurl(), [$prev->id])}}"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last <i class="fa  fa-arrow-right"></i></a></div>
-					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last <i class="fa  fa-arrow-right"></i></a></div>
-					@endif
-				@else
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@else
-						<div class="col- first-video"><a class="first" href="{{url($video->getFirstId())}}"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($prev->id)}}"><i class="fa  fa-arrow-left"></i> prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last 🡆</a></div>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($video->getLastId())}}">last <i class="fa  fa-arrow-right"></i></a></div>
-					@endif
-				@endif
-</div>
\ No newline at end of file
diff --git a/resources/views/layout8/video-partials/popover-metadata.blade.php b/resources/views/layout8/video-partials/popover-metadata.blade.php
deleted file mode 100644
index a8dc152..0000000
--- a/resources/views/layout8/video-partials/popover-metadata.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="popover-metadata">
-              <div class="filesize">
-      <span class="dlwebm badge badge-secondary"><a class='file_size' href='{{ '/b/' . $video->file }}' download>{{ HumanReadable::bytesToHuman($video->filesize()) }}</a></span>
-    </div>
-	@if($video->videotitle) <div class="artist">
-      <strong>Videotitle:</strong> {{$video->videotitle}}
-    </div>@endif
-    @if($video->interpret) <div class="artist">
-      <strong>Artist:</strong> {{$video->interpret}}
-    </div>@endif
-    @if($video->songtitle) <div class="songtitle">
-      <strong>Songtitle:</strong> {{$video->songtitle}}
-    </div>@endif
-    @if($video->imgsource) <div class="source">
-      <strong>Video Source:</strong> @simplemd($video->imgsource)
-    </div>@endif
-    <div class="category">
-        <strong>Category:</strong> <a class="text-white" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-    </div>
-    <div class="uploader">
-      <strong>Uploader:</strong> <a class="text-white" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span></a>
-    </div>
-    <div class="added">
-    	<strong>Added:</strong> <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
-    </div>
-</div>
diff --git a/resources/views/layout8/video-partials/video-details.blade.php b/resources/views/layout8/video-partials/video-details.blade.php
deleted file mode 100644
index ea9ec27..0000000
--- a/resources/views/layout8/video-partials/video-details.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="details bg-dark sticky-top">
-    @if (!empty($__env->yieldContent('novidcontent')))
-    {{-- nix --}}
-    @else   
-    @endif
-    @if(Auth::check())
-    <div class="details_user">
-    @if(Auth::user()->messagesRecv()->unread()->count() < 1)
-        <span class="nomsg">|</span> <span><a href="{{url('messages')}}">[{{Auth::user()->messagesRecv()->unread()->count()}}]</a></span>@else
-        <span class="yesmg">|</span> <span><a href="{{url('messages')}}">[{{Auth::user()->messagesRecv()->unread()->count()}}]</a></span>@endif</span>
-        <a href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
-        <a href="{{url('user', Auth::user()->username)}}/favs"><span class=""><i class="fa fa-heart"></i></span></a>
-        <a href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
-        <a href="{{url('upload')}}">Upload</a>
-        <a class="logout" href="{{url('logout')}}">Logout</a>
-    </div>
-    @else
-    {{-- nix --}}
-    @endif
-	
-    @if($video->videotitle)
-	<div class="videoTitle">
-		{{$video->videotitle}}
-	</div>
-	@endif
-</div>
\ No newline at end of file
diff --git a/resources/views/layout8/video-partials/video-fav.blade.php b/resources/views/layout8/video-partials/video-fav.blade.php
deleted file mode 100644
index 8488b1c..0000000
--- a/resources/views/layout8/video-partials/video-fav.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-	<button title="Toggle Background" class="hidden-xs bg-toggle power" id="togglebg">BG</button>
-						<div class="favbutton">
-						@if(auth()->check())
-							@if(auth()->user()->hasFaved($video->id))
-								<a id="fav" href="{{url($video->id . '/fav')}}">UNFAV</a>
-							@else
-								<a id="fav" href="{{url($video->id . '/fav')}}">FAV</a>
-							@endif
-						@else
-							<a href="{{url($video->id . '/fav')}}">FAVED</a>
-						@endif
-						</div>
\ No newline at end of file
diff --git a/resources/views/layout8/video-partials/video-matadata-overlay.blade.php b/resources/views/layout8/video-partials/video-matadata-overlay.blade.php
deleted file mode 100644
index ce6e361..0000000
--- a/resources/views/layout8/video-partials/video-matadata-overlay.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="video-metadata-overlay">
-		@if($video->interpret) <div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div>@endif
-		@if($video->songtitle) <div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div>@endif
-		@if($video->imgsource) <div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div>@endif
-		<div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div>
-		<div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url('user/' . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div>
-</div>
diff --git a/resources/views/layout8/video-partials/video-metadata.blade.php b/resources/views/layout8/video-partials/video-metadata.blade.php
deleted file mode 100644
index a6f10b7..0000000
--- a/resources/views/layout8/video-partials/video-metadata.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="video-metadata">
-	<ul class="list-group list-group-horizontal indexedit">
-		@if($video->interpret) <li class="list-group-item"><div class="artist">
-			<strong>Artist:</strong> {{$video->interpret}}
-		</div></li>@endif
-		@if($video->songtitle) <li class="list-group-item"><div class="songtitle">
-			<strong>Songtitle:</strong> {{$video->songtitle}}
-		</div></li>@endif
-		@if($video->imgsource) <li class="list-group-item"><div class="source">
-			<strong>Video Source:</strong> {{$video->imgsource}}
-		</div></li>@endif
-		<li class="list-group-item"><div class="category">
-				<strong>Category:</strong> <a class="text-dark" href="/index?q={{$video->category->name}}">{{$video->category->name}}</a>
-		</div></li>
-		<li class="list-group-item"><div class="uploader">
-			<strong>Uploader:</strong> <a class="text-dark" href="{{ url("user/" . $video->user->username) }}">{!! $video->user->displayName() !!}</a></span> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time></a>
-		</div></li>
-		</ul>
-		gfgf
-					 <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@if(auth()->check() && auth()->user()->can("delete_video"))<a class="delete_video" href="#">[del]</a>@endif 
-</div>
-
-      <div class="tags">
-    <div id="tag-display" class="tag-panel-body">
-        @if(count($video->tags))
-            @foreach($video->tags as $tag)
-                <span class="badge badge-dark"><a href="/index?q={{$tag->normalized}}" class="dark-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can("edit_video")) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
-            @endforeach
-        @else
-            No tags yet ...
-        @endif
-    </div>
-    
-</div>
diff --git a/resources/views/layout8/video-partials/videocontrols.blade.php b/resources/views/layout8/video-partials/videocontrols.blade.php
deleted file mode 100644
index 97f437a..0000000
--- a/resources/views/layout8/video-partials/videocontrols.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-		<div class="row videonavigation">
-					@if(($prev = $video->getPrev()) === null)
-						<div class="col"><a class="first" href="#" style="visibility: hidden;">🡄 first</a></div>
-
-					@else
-						<div class="col"><a class="first" href="{{url($video->getFirstId())}}">🡄 first</a></div>
-						<div class="col"><a id="prev" href="{{url($prev->id)}}">🡄 prev</a> |
-					@endif
-					<a href="{{url('/')}}">random</a>
-					@if(($next = $video->getNext()) === null)
-						| <a id="next" href="#" style="visibility: hidden;">next 🡆</a>
-						<a class="last" href="#" style="visibility: hidden;">last 🡆</a>
-					@else
-						| <a id="next" href="{{url($next->id)}}">next 🡆</a></div>
-						<div class="col"><a class="last" href="{{url($video->getLastId())}}">last 🡆</a></div>
-					@endif
-				
-			</div>
\ No newline at end of file
diff --git a/resources/views/layout8/video.blade.php b/resources/views/layout8/video.blade.php
deleted file mode 100644
index 89b4a4e..0000000
--- a/resources/views/layout8/video.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-@extends('layout')
-@section('video')
-<?php $related = $related ?? null; ?>
-    <div class="video-content">
-    	<div class="video">
-    		<div class="embed-responsive embed-responsive-16by9">
-				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="//w0bm.com/b{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('testvideo')
-<?php $related = $related ?? null; ?>
-    <div class="page">
-    	<div class="video-wrap embed-responsive embed-responsive-16by9">
-    		<div class="video">
-				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="//w0bm.com/b{{ "/" . $video->file }}">
-				</video>
-			</div>
-    	</div>
-    @include('video-partials.legacy-videonav')
-	</div>
-@endsection
-
-@section('floatvid')
-        <div class="video-wrap embed-responsive embed-responsive-16by9" id="sticky-container">
-            @if($video->id == '27204')
-                <iframe src="https://w0bm.com/loop/index.html"></iframe>
-            @else
-            <video class="video scrollable" loop id="video">
-                <source src="//w0bm.com/b{{ "/" . $video->file }}">
-            </video>
-            @endif
-        </div>
-        @include('video-partials.legacy-videonav')
-        @include('video-partials.legacy-metadata')
-@endsection
diff --git a/resources/views/layout8/webm.blade.php b/resources/views/layout8/webm.blade.php
deleted file mode 100644
index d21bac0..0000000
--- a/resources/views/layout8/webm.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@extends('profilelayout')
-@section('novidcontent')
-<div class="page-header">
-        <h3>WebM Support</h3>
-        <p>How 2 make a webm</p>
-</div>
-<div class="box">
-<h4>Chad <small>(not afraid of using the command line)</small></h4>
-<img src="/images/gigachad.png" style="float:left;width:150px;" alt="gigachad">
-<pre><code>#The based white man way
-
-ffmpeg -i virgin.mp4 chad.webm #single file, very simple
-
-#You can add this to your .bashrc
-
-function mkwebmbatch() {
-        for i in *.$1;
-                do name=`basename "$i" .$1`
-                echo "$name"
-                ffmpeg -i "$i" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$PWD/${name}.webm"
-        done
-}
-
-function mkwebm() {
-	filename=$(basename -- "$1")
-	extension="${filename##*.}"
-	filename="${filename%.*}"
-	name=`basename "$filename" .$extension`
-	echo "$name"
-	ffmpeg -i "$1" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$HOME/Videos/converts/$name.webm"
-}
-
-function stillvid() {
-	#stillvid image.jpg music.mp3 $3.<webm>
-	ffmpeg -i "$1" -i "$2" -c:a libvorbis -auto-alt-ref 0 -c:v libvpx $3.webm 
-}
-
-#Notable mentions
-
-* https://github.com/ekisu/mpv-webm
-
-* https://github.com/Kagami/webm.py
-
-# If using webm.py a good line to get a high quality video would be
-
-# (assuming you have it in your path)
-webm -i virgin.mp4 -l 40 chad.webm #this will produce a vp9 webm with decent image quality
-</code></pre>
-</div>
-<h1 style="text-align:center;">VS</h1>
-<div class="box">
-<h4>Virgin</h4>
-<img src="/images/virgin.png" style="float:left;width:150px;" alt="gigachad">
-<ul>
-   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a></li>
-   <li><a href="https://gitgud.io/nixx/WebMConverter">WebMConverter by nixx!</a></li>
-</ul>
-</div>
-@endsection