diff --git a/app/Models/Icon.php b/app/Models/Icon.php
index cea2b83..491fc55 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://s.w0bm.com/' . ltrim($this->icon, '/') . '" alt="' . $this->icon . '">';
+                return '<img class="icon" src="https://w0bm.com/' . ltrim($this->icon, '/') . '" alt="' . $this->icon . '">';
             default:
                 return '';
         }
diff --git a/app/Services/Markdown.php b/app/Services/Markdown.php
index f12340a..7f5d06c 100644
--- a/app/Services/Markdown.php
+++ b/app/Services/Markdown.php
@@ -42,10 +42,10 @@ class Markdown extends \Parsedown {
         if (preg_match('/\:(\w+)\:/mUs', $Excerpt['text'], $matches)) {
         	$path = "images/comments/" . $matches[1];
 			$file_ext = "";
-			if(file_exists($path . ".png"))
-			$file_ext = ".png";
-			else if(file_exists($path . ".gif"))
-			$file_ext = ".gif";
+			if(file_exists($path . ".webp"))
+			$file_ext = ".webp";
+			else if(file_exists($path . ".webp"))
+			$file_ext = ".webp";
 			if($file_ext === "")
 			return;
             return [
@@ -55,7 +55,7 @@ class Markdown extends \Parsedown {
 		    		'handler' => 'line',
                     'attributes' => [
                         'class' => 'comment_emoji',
-			'src' => '//s.w0bm.com/images/comments/' . $matches[1] . $file_ext,
+			'src' => '//w0bm.com/images/comments/' . $matches[1] . $file_ext,
 			'alt' => ':' . $matches[1] . ':',
 			'title' => ':' . $matches[1] . ':'
                     ],
diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css
index 4926e96..106e4d5 100644
--- a/public/css/w0bmcustom.css
+++ b/public/css/w0bmcustom.css
@@ -3772,7 +3772,8 @@ button#layout5 {
 }
 
 div#parent {
-    overflow-x: overlay;
+    overflow-x: overlay !important;
+    overflow-x: scroll;
 }
 
 a.not-safe-for-work {
diff --git a/resources/views/layout1/categories.blade.php b/resources/views/layout1/categories.blade.php
index 40b20b9..415a611 100644
--- a/resources/views/layout1/categories.blade.php
+++ b/resources/views/layout1/categories.blade.php
@@ -7,7 +7,7 @@
         @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 . '.png') }}" alt="{{$category->name}}">
+                    <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>
diff --git a/resources/views/layout1/login.blade.php b/resources/views/layout1/login.blade.php
index 8f9f22b..ca8da25 100644
--- a/resources/views/layout1/login.blade.php
+++ b/resources/views/layout1/login.blade.php
@@ -22,6 +22,7 @@
         <a href="{{url('register')}}" class="btn btn-success disabled">Register</a>
   </form>
 </div>
+    <p>w0bm now supports a javascript free experience, check it out if you dont like js that much</p>
     </div>
   </div>
 </div>
diff --git a/resources/views/layout1/partials/commentform.blade.php b/resources/views/layout1/partials/commentform.blade.php
index 4b4581f..66a9ff3 100644
--- a/resources/views/layout1/partials/commentform.blade.php
+++ b/resources/views/layout1/partials/commentform.blade.php
@@ -31,12 +31,12 @@
     <div style="display: none;" id="parent" class="emojis-box">
         <div id="child" class="emojis">
             <?php
-                $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.{gif,png}', GLOB_BRACE);
+                $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="//s.w0bm.com/images/comments/{{$file['basename']}}"></a>
+                <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>
diff --git a/resources/views/layout2/categories.blade.php b/resources/views/layout2/categories.blade.php
index 9116e66..892e2fd 100644
--- a/resources/views/layout2/categories.blade.php
+++ b/resources/views/layout2/categories.blade.php
@@ -7,7 +7,7 @@
         @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 . '.png') }}" alt="{{$category->name}}">
+                    <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>
diff --git a/resources/views/layout2/partials/navigation.blade.php b/resources/views/layout2/partials/navigation.blade.php
index 7fa8d31..5c32de8 100644
--- a/resources/views/layout2/partials/navigation.blade.php
+++ b/resources/views/layout2/partials/navigation.blade.php
@@ -46,6 +46,8 @@
         <div id="layoutSwitcher" class="dropdown-menu" aria-labelledby="navbarDropdown">
           <a class="dropdown-item" id="layout1" href="#">w0bm.com</a>
           <a class="dropdown-item" id="layout3" href="#">z0mb</a>
+          <a class="dropdown-item" id="layout4" href="#"><span style="font-size:10px;">nojs</span>z0mbie</a>
+          <a class="dropdown-item" id="layout5" href="#">m0bile</a>
         </div>
       </li>
 
diff --git a/resources/views/layout3/categories.blade.php b/resources/views/layout3/categories.blade.php
index 9116e66..892e2fd 100644
--- a/resources/views/layout3/categories.blade.php
+++ b/resources/views/layout3/categories.blade.php
@@ -7,7 +7,7 @@
         @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 . '.png') }}" alt="{{$category->name}}">
+                    <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>
diff --git a/resources/views/layout4/categories.blade.php b/resources/views/layout4/categories.blade.php
index 53af5df..6eb13a7 100644
--- a/resources/views/layout4/categories.blade.php
+++ b/resources/views/layout4/categories.blade.php
@@ -7,7 +7,7 @@
         @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 . '.png') }}" alt="{{$category->name}}">
+                    <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>
diff --git a/resources/views/layout5/categories.blade.php b/resources/views/layout5/categories.blade.php
index 51894f8..63e7232 100644
--- a/resources/views/layout5/categories.blade.php
+++ b/resources/views/layout5/categories.blade.php
@@ -7,7 +7,7 @@
         @foreach($categories as $category)
             <div class="col-sm-6 col-md-4 category">
                 <div class="thumbnail">
-                    <img src="{{ asset('/images/cat/' . $category->shortname . '.png') }}" alt="{{$category->name}}">
+                    <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>
diff --git a/resources/views/layout5/partials/commentform.blade.php b/resources/views/layout5/partials/commentform.blade.php
index d17e100..b813a7e 100644
--- a/resources/views/layout5/partials/commentform.blade.php
+++ b/resources/views/layout5/partials/commentform.blade.php
@@ -27,12 +27,12 @@
     <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/*.{gif,png}', GLOB_BRACE);
+                $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="//s.w0bm.com/images/comments/{{$file['basename']}}"></a>
+                <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>
diff --git a/resources/views/layout5/partials/layoutchanger.blade.php b/resources/views/layout5/partials/layoutchanger.blade.php
new file mode 100644
index 0000000..73b2ccb
--- /dev/null
+++ b/resources/views/layout5/partials/layoutchanger.blade.php
@@ -0,0 +1,16 @@
+<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