diff --git a/.gitmodules b/.gitmodules
index 2152082..f7eae03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "themes/pickles"]
 	path = themes/pickles
-	url = https://github.com/mismith0227/hugo_theme_pickles
-	branch = release
+	url = git@github.com:annabunches/hugo_theme_pickles.git
+	branch = develop
diff --git a/Makefile b/Makefile
index 67e418d..43bc36b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 DOCKER_IMAGE := cr.annabunch.es/annabunches-static
+DOCKER_TAG := latest
 
 .PHONY: all build push
 
@@ -8,7 +9,8 @@ serve:
 	hugo serve -D --bind 0.0.0.0 -b http://${DEV_IP}:1313/
 
 build:
-	docker build -t ${DOCKER_IMAGE} .
+	# TODO: figure out why this always uses the cache on the last step...
+	docker build --no-cache -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
 
 push:
-	docker push ${DOCKER_IMAGE}
+	docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
diff --git a/layouts/_default/li.html b/layouts/_default/li.html
deleted file mode 100755
index 5c65bf3..0000000
--- a/layouts/_default/li.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<article class="c-article p-list-article">
-  <header>
-    <h2 class="c-title c-article__title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-    <p class="c-article__meta">
-      <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-        {{ .Date.Format "2006-01-02" }}
-      </time>
-    </p>
-  </header>
-  <div class="c-article__summary">
-    {{ .Summary | plainify | safeHTML }}
-  </div>
-  {{ if .Truncated }}
-  <a href="{{ .Permalink }}" class="c-article__btn p-list-article__btn">Read more</a>
-  {{ end }}
-</article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
deleted file mode 100755
index 2b594d8..0000000
--- a/layouts/_default/single.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{ partial "header.html" . }}
-{{ $baseurl := .Site.BaseURL | sanitizeurl }}
-<article class="p-article">
-  <header>
-    <h1>{{ .Title }}</h1>
-    <div>
-      <div class="c-time">
-        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-          {{ .Date.Format "2006-01-02" }}
-        </time>
-      </div>
-      {{ range .Params.tags }}
-      <a href="{{ $baseurl }}/tags/{{ . | urlize }}" class="c-tag">{{ . }}</a>
-      {{ end }}
-    </div>
-  </header>
-  {{ with .Params.thumbnail }}
-    <img src="{{ . }}" alt="thumbnail" class="p-article__thumbnail">
-  {{ end }}
-  <section id="js-article" class="p-article__body">
-    {{ .Content }}
-  </section>
-  <footer>
-    {{ with ($.Param "disqus") }}
-    <div id="disqus_thread"></div>
-    <script>
-    var disqus_shortname = '{{ . }}';
-    (function() {
-    var d = document, s = d.createElement('script');
-    s.src = 'https://' + disqus_shortname + '.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>
-    {{ end }}
-    <nav class="p-pagination c-pagination">
-      <div class="c-pagination__ctrl">
-        <div class="c-pagination__newer">
-          {{ if .NextInSection }}
-          <a href="{{ .NextInSection.Permalink }}">Newer</a>
-          {{ else }}
-          {{ end }}
-        </div>
-        <div class="c-pagination__older">
-          {{ if .PrevInSection }}
-          <a href="{{ .PrevInSection.Permalink }}">Older</a>
-          {{ else }}
-          {{ end }}
-        </div>
-      </div>
-    </nav>
-    {{ partial "related.html" . }}
-    {{ partial "siteinfo.html" . }}
-  </footer>
-</article>
-{{ partial "footer.html" . }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
deleted file mode 100644
index 917ed75..0000000
--- a/layouts/partials/header.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-{{ partial "head.html" . }}
-<body>
-  <a href="#main" class="skip-link p-screen-reader-text">Skip to content</a>
-  {{ partial "svgpack-sprite.html" . }}
-  <header class="l-header">
-    {{ if .IsPage }}
-    <p class="c-title p-title"><a href="{{ .Site.BaseURL }}" class="p-title__link">{{ .Site.Title }}</a></p>
-    {{ else }}
-    <h1 class="c-title p-title"><a href="{{ .Site.BaseURL }}" class="p-title__link">{{ .Site.Title }}</a></h1>
-    {{ end }}
-    {{ with ($.Param "subtitle") }}
-    <p class="p-subtitle">
-      {{ . }}
-    </p>
-    {{ end }}
-  </header>
-  {{- partial "header_custom.html" . }}
-  <main id="main" class="l-main">
diff --git a/layouts/partials/timestamp.html b/layouts/partials/timestamp.html
new file mode 100644
index 0000000..48e518f
--- /dev/null
+++ b/layouts/partials/timestamp.html
@@ -0,0 +1,3 @@
+<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
+  {{ .Date.Format "2006-01-02" }}
+</time>
diff --git a/themes/pickles b/themes/pickles
index 2a618dd..14773c1 160000
--- a/themes/pickles
+++ b/themes/pickles
@@ -1 +1 @@
-Subproject commit 2a618dda48359315eda03be2816dc52a901978d9
+Subproject commit 14773c1e234d4980647f1e38f4b3cb090b2d379f
