diff --git a/_config.yml b/_config.yml
index b72017c8..7546f99a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -96,7 +96,6 @@ defaults:
   - scope:
       path: ""
       type: "posts"
-      category: "release"
     values:
       layout: "post"
       lang: en
@@ -112,25 +111,6 @@ defaults:
           height: 720
           resize_style: cover
           uploads_dir: "/images"  
-  - scope:
-      path: ""
-      type: "posts"
-      category: "ramblings"
-    values:
-      layout: "page"
-      lang: en
-      permalink: /:title/
-      _options:
-        image:
-          width: 1024
-          height: 720
-          resize_style: cover
-          uploads_dir: "/images"
-        content:
-          width: 720
-          height: 720
-          resize_style: cover
-          uploads_dir: "/images" 
 
 # ---------
 # Translate
diff --git a/_layouts/post.html b/_layouts/post.html
index 08906fb6..8527a367 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,6 +1,6 @@
 ---
-lang: en
 ---
+{% if page.category == 'release' %}
 <!DOCTYPE HTML>
 <!--
   Based on _Story_ by html5up.net | @ajlkn
@@ -51,7 +51,7 @@ lang: en
         <!-- Content -->
         <div class="content">
 
-          {% if page.category == 'release' %}
+
           <!-- HERE BEGINS MADNESS -->
           {% for album in site.albums %}
           {% if page.album == album.slug %}
@@ -94,7 +94,7 @@ lang: en
 
                   <div class="plItem">
                     <div class="plNum">{{ track.common.track.no }}.</div>
-                    <div class="plTitle"><a href="{{ relBase }}/assets/albums/{{ track.albumSlug }}/{{ track.trackSlug }}.mp3">{{ track.common.title }} </a></div>
+                    <div class="plTitle"><a href="https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}.mp3">{{ track.common.title }} </a></div>
                     <div class="plLength">{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}</div>
                   </div>
 
@@ -112,36 +112,36 @@ lang: en
   </div>
 </section>
 <!-- Tracks -->
-<section id="albumdata" class="wrapper style1 align-center">
-  <div class="gallery style1 medium onscroll-fade-in">
-    {% for track in album.tracks %}
-    <article>
-      <a href="{{ relBase }}/{{ track.slug }}/" class="image">
-        <img src="{{ relBase }}{{ track.cover}}" alt="{{ track.common.title }}" />
-      </a>
-      <div class="caption">
-        <h3>{{ track.common.title }}</h3>
-        <p>
-          <strong>{{ track.common.genre }}</strong>
-          <br />{{ track.common.year }}</p>
-        <ul class="actions fixed">
-          <li><span class="editable button small icon fa-play-circle">Play</span></li>
-        </ul>
-      </div>
-    </article>
-    {% endfor %}
+{% for track in album.tracks %}
 
+<section
+  class="spotlight style4 orient-{% cycle 'left', 'right' %} content-align-left image-position-center onscroll-image-fade-in"
+  {% if forloop.index == 1 %}style="box-shadow: none;" {% endif %}>
+  <div class="content">
+    <h3>{{ track.common.title }}</h3>
+    <p>
+      {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}
+      <br /><strong>{{ track.common.genre }}</strong>
+      <br />{{ track.common.year }}</p>
 
-      {% include streamer.html %}
-
+    <ul class="actions stacked">
+      <li><a href="{{ relBase }}/albums/{{ track.slug }}/" class="button">Track</a></li>
+    </ul>
+  </div>
+  <div class="image">
+    <img src="https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}.jpeg" alt="{{ track.common.title }}" />
   </div>
 </section>
+
+{% endfor %}
+
+{% include streamer.html %}
 <!-- END Tracks -->
 
 {% break %} {% endif %} {% endfor %}
 <!-- HERE ENDS MADNESS -->
-{% endif %}
-{% if page.collection == 'posts' %}
+
+
 <section class="wrapper style1 align-center">
   <div class="inner">
     <div class="index align-left">
@@ -178,7 +178,7 @@ lang: en
     </div>
   </div>
 </section>
-{% endif %}
+
 
 {% include footer.html %}
 </div>
@@ -212,7 +212,7 @@ lang: en
           "track": {{ track.common.track.no }},
           "name": "{{ track.common.title }}",
           "length": "{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}",
-          "file": "/assets/albums/{{ track.albumSlug }}/{{ track.trackSlug }}"
+          "file": "https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}"
         }{% unless forloop.last %},{% endunless %}{% endfor %}{% break %} {% endif %}{% endfor %}],
         trackCount = tracks.length,
         npAction = $('#npAction'),
@@ -288,4 +288,111 @@ lang: en
 
 {% include cookie-consent.html %}
 </body>
-</html>
\ No newline at end of file
+</html>
+{% else %}
+
+<!DOCTYPE HTML>
+<!--
+  Based on _Story_ by html5up.net | @ajlkn
+  Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+  Remixed and Jekyllified by Setto
+-->
+<html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
+<head>
+{% seo title=false %}
+<link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
+{% include seo.html %}
+{% include relBase.html %}
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes" />
+<link rel="stylesheet" href="{{ relBase }}/assets/css/main20200519.css" />
+
+<link rel="apple-touch-icon" href="{{ site.url }}/apple-touch-icon.png">
+<link rel="icon" type="image/png" href="{{ site.url }}/touch-icon.png" sizes="192x192">
+<link rel="shortcut icon" href="{{ site.url }}{{ site.icon }}" type="image/png" />
+<noscript><link rel="stylesheet" href="{{ relBase }}/assets/css/noscript20200518-rev1.css" /></noscript>
+</head>
+
+<body class="is-preload" id="body">
+  <span id="top" style="display: none;"></span>
+  <!-- Wrapper -->
+  <div id="wrapper" class="divided">
+
+<!-- Banner -->
+<section class="banner onload-image-fade-in onload-content-fade-right style2 fullscreen content-align-center image-position-center" style="height:100vh;background-color: rgba(13,13,13,0.85);">
+
+  <div class="content">
+    <h1>{{ page.title }}</h1>
+    <p>{{ page.description }}</p>
+  </div>
+
+  <div class="image">
+    <img src="{{ page.image }}" alt="unfound page" />
+  </div>
+</section>
+<!-- Content -->
+<section class="wrapper style1 align-center">
+  <div class="inner">
+
+    <div class="index align-left">
+      <!-- Author -->
+      <section>
+        {% if page.url != '/cookies/' %}
+        {% if page.url != '/webcreds/' %}
+        {% include author.html %}
+        {% endif %}{% endif %}
+        <!-- Content -->
+        <div class="content">
+          {{ content }}
+
+        </div>
+      </section>
+    </div>
+  </div>
+</section>
+<section class="wrapper style1 align-center">
+  <div class="inner">
+    <div class="index align-left">
+      <!-- Author -->
+
+      <section>
+
+        <!-- Content -->
+        <div class="content">
+          <!-- post Naviation -->
+          <div style="text-align: center;">
+            <h3>{{ site.data.translations[page.lang].post-nav}}</h3>
+          </div>
+          <div class="post-nav">
+            <div>
+              {% if page.previous.url and page.lang == page.previous.lang %}
+              <h4><a href="{{page.previous.url}}" alt="Read {{page.previous.title}}" title="Read {{page.previous.title}}"><i class="fas fa-arrow-left"></i></a> <a
+                  href="{{page.previous.url}}">&nbsp;{{page.previous.title}}</a></h4>
+              <p style="margin-right: 20px">{{ page.previous.description }}</p>
+              {% endif %}
+            </div>
+            <div class="post-nav-next">
+              {% if page.next.url and page.lang == page.next.lang  %}
+              <h4><a href="{{page.next.url}}">&nbsp;{{page.next.title}}</a> <a href="{{page.next.url}}" alt="Read {{page.next.title}}" title="Read {{page.next.title}}"><i
+                    class="fas fa-arrow-right"></i></a></h4>
+              <p style="margin-left: 20px">{{ page.next.description }}</p>
+              {% endif %}
+            </div>
+          </div>
+          <!-- End Post Navigation -->
+        </div>
+      </section>
+
+    </div>
+  </div>
+</section>
+
+{% include footer.html %}
+
+</div>
+{% include navigation.html %}
+{% include scripts.html %}
+{% include cookie-consent.html %}
+</body>
+</html>
+{% endif %}
\ No newline at end of file
