diff --git a/.gitignore b/.gitignore
index 822c9c630..72034aa67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 _site
 .jekyll-metadata
 .sass-cache
+.jekyll-cache/Jekyll
diff --git a/Gemfile b/Gemfile
index 4511564ce..8a05e442b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,19 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'jekyll','~>3.8.0'
-gem 'redcarpet'
+gem 'jekyll','~>4.1.0'
 
 # LSI (related posts)
-# Note: You need to install nmatrix and narray first, and/or export NMATRIX=1 NARRAY=1 before running bundle install, otherwise gsl won't use them
-gem 'narray'
+# Note: You need to install one of nmatrix or narray first, and export NMATRIX=1 or NARRAY=1 before running bundle install
+# otherwise gsl won't use them. Note that you can only use one or the other, not both.
+#   see https://github.com/SciRuby/rb-gsl#nmatrix-and-narray-usage
+#
+# Both of these seem to be extremely outdated, see:
+#   https://github.com/0xdevalias/devalias.net/issues/83
+#   https://github.com/jekyll/classifier-reborn/issues/192
+#   https://github.com/SciRuby/rb-gsl/issues/63
 gem 'nmatrix'
-gem 'gsl'
+gem 'gsl' # Note: you need to install a compatible version (eg. 2.1) of gsl first: brew install gsl@2.1
 gem 'classifier-reborn'
 
 group :jekyll_plugins do
-  gem 'jekyll-admin'
+  # gem 'jekyll-admin' # using outdated 1.4.x version of sinatra, see https://github.com/jekyll/jekyll-admin/issues/601
+  gem 'jekyll-commonmark'
   gem 'jekyll-compose'
   gem 'jekyll-paginate'
+  gem 'jekyll-postfiles'
   gem 'jekyll-redirect-from'
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
@@ -24,7 +31,7 @@ group :jekyll_plugins do
   gem 'jekyll_version_plugin'
   gem 'jekyll-deploy'
   # gem 'jekyll-crosspost-to-medium'
-  gem 'jekyll-webmention_io'
+  # gem 'jekyll-webmention_io' # incompatible with jekyll 4, see https://github.com/aarongustafson/jekyll-webmention_io/issues/130
   gem 'jekyll-time-to-read'
   gem 'jekyll-twitter-plugin'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 03edd4ab3..fc53bf238 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,161 +1,109 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    backports (3.11.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    backports (3.18.1)
     classifier-reborn (2.2.0)
       fast-stemmer (~> 1.0)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
+    commonmarker (0.21.0)
+      ruby-enum (~> 0.5)
+    concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
-    execjs (2.7.0)
-    faraday (0.15.0)
+    eventmachine (1.2.7)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
-    ffi (1.9.23)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     gsl (2.1.0.3)
-    htmlbeautifier (1.3.1)
-    http (2.2.2)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    httparty (0.15.7)
-      multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.8.4)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.0)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-admin (0.8.0)
-      addressable (~> 2.4)
-      jekyll (~> 3.3)
-      sinatra (~> 1.4)
-      sinatra-contrib (~> 1.4)
-    jekyll-compose (0.8.0)
-      jekyll (~> 3.0)
+      terminal-table (~> 1.8)
+    jekyll-commonmark (1.3.1)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-compose (0.12.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-deploy (0.0.2)
-    jekyll-feed (0.9.3)
-      jekyll (~> 3.3)
+    jekyll-feed (0.15.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.9.4)
-      jekyll (~> 3.1)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.13.0)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
+    jekyll-postfiles (3.1.0)
+      jekyll (>= 3.8.6, < 5)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-time-to-read (0.1.2)
       jekyll
-    jekyll-twitter-plugin (2.0.0)
-    jekyll-watch (2.0.0)
+    jekyll-twitter-plugin (2.1.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jekyll-webmention_io (2.9.1)
-      htmlbeautifier (~> 1.1)
-      http (~> 2.0)
-      jekyll (>= 2.0, < 4.0)
-      json (~> 2.0)
-      openssl (~> 2.0)
-      string_inflection (~> 0.1)
-      uglifier (~> 3.2)
-      webmention (~> 0.1.6)
     jekyll_version_plugin (2.0.0)
-    json (2.1.0)
-    kramdown (1.16.2)
-    link_header (0.0.8)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    narray (0.6.1.2)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    multipart-post (2.1.1)
     nmatrix (0.2.4)
       packable (~> 1.3, >= 1.3.5)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    octokit (4.8.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    openssl (2.1.0)
-    packable (1.3.9)
+    packable (1.3.14)
       backports
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-protection (1.5.5)
-      rack
-    rack-test (1.0.0)
-      rack (>= 1.0, < 3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    rouge (3.1.1)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    string_inflection (0.1.2)
-    tilt (2.0.8)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    webmention (0.1.6)
-      httparty (~> 0.15.5)
-      json
-      link_header (~> 0.0.8)
-      nokogiri
+    public_suffix (4.0.5)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.4)
+    rouge (3.21.0)
+    ruby-enum (0.8.0)
+      i18n
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -163,24 +111,22 @@ PLATFORMS
 DEPENDENCIES
   classifier-reborn
   gsl
-  jekyll (~> 3.8.0)
-  jekyll-admin
+  jekyll (~> 4.1.0)
+  jekyll-commonmark
   jekyll-compose
   jekyll-deploy
   jekyll-feed
   jekyll-gist
   jekyll-github-metadata
   jekyll-paginate
+  jekyll-postfiles
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
   jekyll-time-to-read
   jekyll-twitter-plugin
-  jekyll-webmention_io
   jekyll_version_plugin
-  narray
   nmatrix
-  redcarpet
 
 BUNDLED WITH
-   1.16.1
+   2.1.4
diff --git a/PUBLISHING.md b/PUBLISHING.md
index 9b30edc5b..33443cfb8 100644
--- a/PUBLISHING.md
+++ b/PUBLISHING.md
@@ -11,5 +11,5 @@ Some useful commands to remember:
 
 ## Build & Deploy
 
-* `jekyll build --lsi`
-* `jekyll deploy`
+* `bin/build`
+* `bin/deploy`
diff --git a/README.md b/README.md
index ed20b983c..6f428d931 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@ Feel free to create an issue/pull request for any typo's/bugs you might find :)
 
 * Link to other posts
     * `[other post]({% post_url 2017-01-01-other-post %})`
+* Embed an image with [jekyll-postfiles](https://github.com/nhoizey/jekyll-postfiles#how-does-it-work)
+  * create a folder under `_posts` named the same as your post's markdown file
+  * add any images for your post there, along with the post's markdown file
+  * use a relative markdown image tag to reference and embed the images
+    * eg. `![a title or something](foo.jpg)`
 * Embed a gist with [jekyll-gist](https://github.com/jekyll/jekyll-gist)
     * `{% gist foo/12345678901234567890 %} `
 * Embed a tweet with [jekyll-twitter-plugin](https://github.com/rob-murray/jekyll-twitter-plugin)
diff --git a/_config.yml b/_config.yml
index 08789e44d..d6735f4dc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -44,7 +44,7 @@ github_branch: 'master'
 #   base_url: https://twitter.com
 
 # https://github.com/jekyll/github-metadata
-repository: alias1/devalias.net
+repository: 0xdevalias/devalias.net
 
 #google_site_verification: ""
 # webmaster_verifications:
@@ -76,15 +76,14 @@ defaults:
       navigation: True
 
 # Conversion
-markdown: redcarpet
-redcarpet:
-  extensions:
-    - "tables"
-    - "autolink"
-    - "strikethrough"
-    - "space_after_headers"
-    #- "with_toc_data"
-    - "fenced_code_blocks"
+#   https://jekyllrb.com/docs/configuration/markdown/
+#   https://github.com/jekyll/jekyll-commonmark#configuration
+markdown: CommonMark
+
+commonmark:
+  options: ["UNSAFE", "FOOTNOTES", "STRIKETHROUGH_DOUBLE_TILDE", "VALIDATE_UTF8", "GITHUB_PRE_LANG", "HARDBREAKS"]
+  extensions: ["autolink", "strikethrough", "table", "tasklist"]
+
 lsi: false # Index for related posts (enabled by command line)
 
 keep_files:
@@ -92,14 +91,11 @@ keep_files:
   - .nojekyll # To prevent GitHub re-processing
 
 exclude:
-  - "Gemfile"
-  - "Gemfile.lock"
   - "PUBLISHING.md"
   - "README.md"
   - "TODO.txt"
   - "ojekyll.txt"
   - "bin/"
-  - ".jekyll-cache/"
 
 # TODO: Enable these checks + fix any errors associated with them
 # liquid:
diff --git a/_plugins/asset_path_tag.rb.norun b/_plugins/asset_path_tag.rb.norun
deleted file mode 100644
index 44508720b..000000000
--- a/_plugins/asset_path_tag.rb.norun
+++ /dev/null
@@ -1,84 +0,0 @@
-# Title: Asset path tag for Jekyll
-# Author: Sam Rayner http://samrayner.com
-# Description: Output a relative URL for assets based on the post or page
-#
-# Syntax {% asset_path [filename] %}
-#
-# Examples:
-# {% asset_path kitten.png %} on post 2013-01-01-post-title
-# {% asset_path pirate.mov %} on page page-title
-#
-# Output:
-# /assets/posts/post-title/kitten.png
-# /assets/page-title/pirate.mov
-#
-# Looping example using a variable for the pathname:
-#
-# File _data/image.csv contains:
-#   file
-#   image_one.png
-#   image_two.png
-#
-# {% for image in site.data.images %}{% asset_path {{ image.file }} %}{% endfor %} on post 2015-03-21-post-title
-#
-# Output:
-# /assets/posts/post-title/image_one.png
-# /assets/posts/post-title/image_two.png
-#
-
-module Jekyll
-  class AssetPathTag < Liquid::Tag
-    @markup = nil
-
-    def initialize(tag_name, markup, tokens)
-      #strip leading and trailing spaces
-      @markup = markup.strip
-      super
-    end
-
-    def render(context)
-      if @markup.empty?
-        return "Error processing input, expected syntax: {% asset_path [filename] %}"
-      end
-
-      #render the markup
-      rawFilename = Liquid::Template.parse(@markup).render context
-
-      #strip leading and trailing quotes
-      filename = rawFilename.gsub(/^("|')|("|')$/, '')
-
-      path = ""
-      page = context.environments.first["page"]
-
-      #if a post
-      if page["id"]
-        #check for Jekyll version
-        if Jekyll::VERSION < '3.0.0'
-          #loop through posts to find match and get slug
-          context.registers[:site].posts.each do |post|
-            if post.id == page["id"]
-              path = "posts/#{post.slug}"
-            end
-          end
-        else
-        #loop through posts to find match and get slug, method calls for Jekyll 3
-          context.registers[:site].posts.docs.each do |post|
-            if post.id == page["id"]
-              path = "posts/#{post.data['slug']}"
-            end
-          end
-        end
-      else
-        path = page["url"]
-      end
-
-      #strip filename
-      path = File.dirname(path) if path =~ /\.\w+$/
-
-      #fix double slashes
-      "#{context.registers[:site].config['baseurl']}/assets/#{path}/#{filename}".gsub(/\/{2,}/, '/')
-    end
-  end
-end
-
-Liquid::Template.register_tag('asset_path', Jekyll::AssetPathTag)
\ No newline at end of file
diff --git a/_plugins/jekyll-autgenerator.rb b/_plugins/jekyll-autgenerator.rb
index b4a599cb8..07e4ae93a 100755
--- a/_plugins/jekyll-autgenerator.rb
+++ b/_plugins/jekyll-autgenerator.rb
@@ -1,7 +1,9 @@
+# Modified slightly from: https://github.com/jekyller/jasper2/blob/master/_plugins/jekyll-autgenerator.rb
+
 module Jekyll
 
   class AuthorsGenerator < Generator
-  
+
     safe true
 
     def generate(site)
@@ -13,8 +15,8 @@ def generate(site)
       end
     end
 
-    def build_subpages(site, type, posts) 
-      posts[1] = posts[1].sort_by { |p| -p.date.to_f }     
+    def build_subpages(site, type, posts)
+      posts[1] = posts[1].sort_by { |p| -p.date.to_f }
       atomize(site, type, posts)
       paginate(site, type, posts)
     end
@@ -35,7 +37,7 @@ def paginate(site, type, posts)
         end
         newpage = GroupSubPageAuthor.new(site, site.source, path, type, posts[0])
         newpage.pager = pager
-        site.pages << newpage 
+        site.pages << newpage
 
       end
     end
@@ -54,7 +56,7 @@ def initialize(site, base, dir, type, val)
       self.data[type] = val
     end
   end
-  
+
   class AtomPageAuthor < Page
     def initialize(site, base, dir, type, val, posts)
       @site = site
@@ -69,4 +71,4 @@ def initialize(site, base, dir, type, val, posts)
       self.data["posts"] = posts[0..9]
     end
   end
-end
\ No newline at end of file
+end
diff --git a/_plugins/jekyll-taggenerator.rb b/_plugins/jekyll-taggenerator.rb
index c5e123498..3f0baabf7 100755
--- a/_plugins/jekyll-taggenerator.rb
+++ b/_plugins/jekyll-taggenerator.rb
@@ -1,7 +1,8 @@
+# Modified slightly from: https://github.com/jekyller/jasper2/blob/master/_plugins/jekyll-tagsgenerator.rb
 module Jekyll
 
   class TagsGenerator < Generator
-  
+
     safe true
 
     def generate(site)
@@ -10,8 +11,8 @@ def generate(site)
       end
     end
 
-    def build_subpages(site, type, posts) 
-      posts[1] = posts[1].sort_by { |p| -p.date.to_f }     
+    def build_subpages(site, type, posts)
+      posts[1] = posts[1].sort_by { |p| -p.date.to_f }
       atomize(site, type, posts)
       paginate(site, type, posts)
     end
@@ -32,7 +33,7 @@ def paginate(site, type, posts)
         end
         newpage = GroupSubPageTags.new(site, site.source, path, type, posts[0])
         newpage.pager = pager
-        site.pages << newpage 
+        site.pages << newpage
 
       end
     end
@@ -66,4 +67,4 @@ def initialize(site, base, dir, type, val, posts)
       self.data["posts"] = posts[0..9]
     end
   end
-end
\ No newline at end of file
+end
diff --git a/_plugins/lazy_tweet_embedding.rb b/_plugins/lazy_tweet_embedding.rb
deleted file mode 100644
index 6aed0eaa6..000000000
--- a/_plugins/lazy_tweet_embedding.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Source: https://github.com/takuti/jekyll-lazy-tweet-embedding
-require "open-uri"
-require "json"
-
-module Jekyll
-
-  # convert tweet url to embedding html
-  class LazyTweetEmbedding
-    def get_html(id)
-        url = "https://api.twitter.com/1/statuses/oembed.json?id=#{id}"
-        JSON.parse(open(url).read, { :symbolize_names => true })[:html]
-    end
-
-    def convert(line)
-      r = /^https?:\/\/twitter\.com\/[a-zA-Z0-9_]+\/status(es)?\/([0-9]+)\/?$/
-      r =~ line ? get_html($~[2]) : line
-    end
-
-    def embed(content)
-      content.lines.collect {|line| convert(line) }.join
-    end
-  end
-
-  # for markdown, extend oroginal parser's convert method
-  module Converters
-    class Markdown < Converter
-      alias_method :parser_converter, :convert
-
-      def convert(content)
-        parser_converter(Jekyll::LazyTweetEmbedding.new.embed(content))
-      end
-    end
-  end
-
-  # for html, extend converter as a plugin
-  class EmbeddingTweetIntoHTML < Converter
-    safe true
-    priority :low
-
-    def matches(ext)
-      ext =~ /^\.html$/i
-    end
-
-    def output_ext(ext)
-      ".html"
-    end
-
-    def convert(content)
-      Jekyll::LazyTweetEmbedding.new.embed(content)
-    end
-  end
-
-end
diff --git a/_plugins/postfiles.rb b/_plugins/postfiles.rb
deleted file mode 100644
index 7a4887fa3..000000000
--- a/_plugins/postfiles.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module Jekyll
-  
-  # StaticFile subclass that properly translates paths
-  class PostFile < StaticFile
-    def path
-      File.join(@base, @name)
-    end
-  end
-
-  class Postfiles < Generator
-    safe true
-    priority :lowest
-
-    def generate(site)
-      if site.config['permalink'] != 'pretty'
-        puts "Sorry, postfiles only work with pretty permalinks."
-        puts "Change the setting in _config.yml to use postfiles."
-        return
-      end
-
-      site.posts.docs.each do |post|
-        # Go back to the single-file post name
-        postfile_id = post.id.gsub(/[\s\w\/%]*(\d{4})\/(\d\d)\/(\d\d)\/(.*)/, '\1-\2-\3-\4')
-        # Get the directory that files from this post would be in
-        postfile_dir = File.join(site.config['source'], '_postfiles', postfile_id)
-        
-        # Add a static file entry for each postfile, if any
-        Dir[File.join(postfile_dir, '/*')].each do |pf| 
-          site.static_files << PostFile.new(site, postfile_dir, CGI.unescape(post.url), File.basename(pf))
-        end
-      end
-    end
-
-  end
-
-  class PostfileTag < Liquid::Tag
-
-    def initialize(tag_name, text, tokens)
-      super
-      @text = text.strip
-    end
-
-    def render(context)
-      File.join(context['page']['url'], @text)
-    end
-  end
-end
-
-Liquid::Template.register_tag('postfile', Jekyll::PostfileTag)
\ No newline at end of file
diff --git a/_postfiles/.gitkeep b/_postfiles/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/_posts/2011-12-30-who-dares-enter-my-domain.md b/_posts/2011-12-30-who-dares-enter-my-domain/2011-12-30-who-dares-enter-my-domain.md
similarity index 92%
rename from _posts/2011-12-30-who-dares-enter-my-domain.md
rename to _posts/2011-12-30-who-dares-enter-my-domain/2011-12-30-who-dares-enter-my-domain.md
index 8f5935d9a..9b5d32b97 100644
--- a/_posts/2011-12-30-who-dares-enter-my-domain.md
+++ b/_posts/2011-12-30-who-dares-enter-my-domain/2011-12-30-who-dares-enter-my-domain.md
@@ -15,7 +15,7 @@ disqus: true
 webmention: true
 crosspost_to_medium: false
 ---
-![who dares enter my domain]({% postfile cat.jpg %})
+![who dares enter my domain](cat.jpg)
 
 Just a short one today to point out that I finally got around to configuring the domain (read: defeated the dns dragon) to work properly with tumblr!
 
diff --git a/_postfiles/2011-12-30-who-dares-enter-my-domain/cat.jpg b/_posts/2011-12-30-who-dares-enter-my-domain/cat.jpg
similarity index 100%
rename from _postfiles/2011-12-30-who-dares-enter-my-domain/cat.jpg
rename to _posts/2011-12-30-who-dares-enter-my-domain/cat.jpg
diff --git a/_posts/2012-01-10-plesk-adding-programs-to-a-chrooted-ssh.md b/_posts/2012-01-10-plesk-adding-programs-to-a-chrooted-ssh.md
index a322b4c37..43f49a621 100644
--- a/_posts/2012-01-10-plesk-adding-programs-to-a-chrooted-ssh.md
+++ b/_posts/2012-01-10-plesk-adding-programs-to-a-chrooted-ssh.md
@@ -61,7 +61,7 @@ The final (rather simple) step involves updating any chrooted directories that h
 
 This can also be done without the script:
 
-``
+```
 /usr/local/psa/admin/sbin/chrootmng --remove --source=/var/www/vhosts/chroot --target=/var/www/vhosts/<domain name>
 /usr/local/psa/admin/sbin/chrootmng --create --source=/var/www/vhosts/chroot --target=/var/www/vhosts/<domain name>
 ```
@@ -84,4 +84,4 @@ One cause of this occuring is due to the bin files for a chrooted directory not
 ```
 /usr/local/psa/admin/sbin/chrootmng --remove --source=/var/www/vhosts/chroot --target=/var/www/vhosts/<domain name>
 /usr/local/psa/admin/sbin/chrootmng --create --source=/var/www/vhosts/chroot --target=/var/www/vhosts/<domain name>
-```
\ No newline at end of file
+```
diff --git a/_posts/2013-06-17-gists-on-tumblr.md b/_posts/2013-06-17-gists-on-tumblr.md
index fc9079814..667615f23 100644
--- a/_posts/2013-06-17-gists-on-tumblr.md
+++ b/_posts/2013-06-17-gists-on-tumblr.md
@@ -16,4 +16,6 @@ crosspost_to_medium: false
 ---
 So I figured it might be useful to be able to post gists here. Turns out it's actually pretty easy thanks to soemarko
 
-{% gist soemarko/1395926 %}
+https://gist.github.com/soemarko/1395926
+
+{% gist 1395926 %}
diff --git a/_posts/2013-07-13-nmap-sh-saving-precious-seconds.md b/_posts/2013-07-13-nmap-sh-saving-precious-seconds.md
index 6a75711c9..07115bd02 100644
--- a/_posts/2013-07-13-nmap-sh-saving-precious-seconds.md
+++ b/_posts/2013-07-13-nmap-sh-saving-precious-seconds.md
@@ -22,4 +22,6 @@ In the course of my work I end up issuing the same simple commands again and aga
 
 With that in mind, here's a little bash script I threw together today to reduce the time it takes to kick off a standard (in my day to day usage) nmap scan. Hopefully you can get some use out of it.
 
-{% gist alias1/5963377 %}
+https://gist.github.com/0xdevalias/5963377
+
+{% gist 5963377 %}
diff --git a/_posts/2013-08-03-rails-lessons-learned-the-hard-way-1-db-migrate.md b/_posts/2013-08-03-rails-lessons-learned-the-hard-way-1-db-migrate.md
index 708cde9d6..0bf1fad2e 100644
--- a/_posts/2013-08-03-rails-lessons-learned-the-hard-way-1-db-migrate.md
+++ b/_posts/2013-08-03-rails-lessons-learned-the-hard-way-1-db-migrate.md
@@ -20,5 +20,6 @@ Decided I will make this a regular little mini collection of things I learned th
 
 Generate your model first, make all manual edits, and then only AFTER you have made all your manual edits (and double checked them), run rake db:migrate. It will save you a fair few headaches.
 
+https://gist.github.com/0xdevalias/5790864
 
-{% gist alias1/5790864 %}
+{% gist 5790864 %}
diff --git a/_posts/2013-08-10-erpscan-automator-because-manual-is-meh.md b/_posts/2013-08-10-erpscan-automator-because-manual-is-meh.md
index eb5af6239..67551d77d 100644
--- a/_posts/2013-08-10-erpscan-automator-because-manual-is-meh.md
+++ b/_posts/2013-08-10-erpscan-automator-because-manual-is-meh.md
@@ -22,4 +22,6 @@ Another quick little tool for you guys today that I hacked together to save myse
 
 At time of writing, configuration is all done inside the script, with no support for command line parameters (might add them in the future)
 
-{% gist alias1/6118709 %}
+https://gist.github.com/0xdevalias/6118709
+
+{% gist 6118709 %}
diff --git a/_posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md b/_posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md
similarity index 94%
rename from _posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md
rename to _posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md
index 00320c964..a4d47bf8d 100644
--- a/_posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md
+++ b/_posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july.md
@@ -20,6 +20,6 @@ I suppose it was inevitable given the lack of support over the past months, but
 
 [rockmelt](http://blog.rockmelt.com/post/55124002701/rockmelt-browser-retirement-july-31-2013):
 
-> ![Rockmelt Browser Retiring]({% postfile rockmelt-retiring.jpg %})
+> ![Rockmelt Browser Retiring](rockmelt-retiring.jpg)
 >
 > We promised to notify you when we retire the Rockmelt Browser. The date has been set for July 31st at 10am PT. After that point in time, you will no longer be able to log into the Rockmelt Browser. Please take a moment to migrate your App Edge into the new Rockmelt experience by clicking [here](http://rockmelt.com/?import=true)
diff --git a/_postfiles/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/rockmelt-retiring.jpg b/_posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/rockmelt-retiring.jpg
similarity index 100%
rename from _postfiles/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/rockmelt-retiring.jpg
rename to _posts/2013-08-16-rockmelt-blog-rockmelt-browser-retirement-july/rockmelt-retiring.jpg
diff --git a/_posts/2013-08-29-reversing-powershell-securestring-for-fun-and-profit.md b/_posts/2013-08-29-reversing-powershell-securestring-for-fun-and-profit.md
index 7533cea4c..9df86004c 100644
--- a/_posts/2013-08-29-reversing-powershell-securestring-for-fun-and-profit.md
+++ b/_posts/2013-08-29-reversing-powershell-securestring-for-fun-and-profit.md
@@ -24,4 +24,6 @@ Something that I needed to do in an engagement recently and thought it might be
 
 Just goes to show that no matter how secure a technology you create, in the end it all comes down to the underpaid, overworked IT staff that have to implement it, and the *managerial guidelines* that they need to work within.
 
-{% gist alias1/6101928 %}
+https://gist.github.com/0xdevalias/6101928
+
+{% gist 6101928 %}
diff --git a/_posts/2013-11-21-vfeed-wrapper-helper-scripts-for-speed-and-efficiency.md b/_posts/2013-11-21-vfeed-wrapper-helper-scripts-for-speed-and-efficiency.md
index 28cbe04a7..7aaf33bf3 100644
--- a/_posts/2013-11-21-vfeed-wrapper-helper-scripts-for-speed-and-efficiency.md
+++ b/_posts/2013-11-21-vfeed-wrapper-helper-scripts-for-speed-and-efficiency.md
@@ -36,4 +36,6 @@ ln -s /path/to/vFeed/bin/vfeed_update.sh vfeed_update
 
 Enjoy!
 
-{% gist alias1/7554985 %}
+https://gist.github.com/0xdevalias/7554985
+
+{% gist 7554985 %}
diff --git a/_posts/2014-02-13-y-u-no-update-kali.md b/_posts/2014-02-13-y-u-no-update-kali/2014-02-13-y-u-no-update-kali.md
similarity index 96%
rename from _posts/2014-02-13-y-u-no-update-kali.md
rename to _posts/2014-02-13-y-u-no-update-kali/2014-02-13-y-u-no-update-kali.md
index f4ae765df..05e329a26 100644
--- a/_posts/2014-02-13-y-u-no-update-kali.md
+++ b/_posts/2014-02-13-y-u-no-update-kali/2014-02-13-y-u-no-update-kali.md
@@ -24,7 +24,7 @@ disqus: true
 webmention: true
 crosspost_to_medium: false
 ---
-![Kali Linux Y U No Update]({% postfile yunoupdatekali.jpg %})
+![Kali Linux Y U No Update](yunoupdatekali.jpg)
 
 Not too long ago I was setting up a new pentest machine with Kali. Fairly straightforward a task, though slightly inconvenienced by the fact that the net was down at the time. No matter I thought, continue offline and all should be fine.. apparently not.
 
diff --git a/_postfiles/2014-02-13-y-u-no-update-kali/yunoupdatekali.jpg b/_posts/2014-02-13-y-u-no-update-kali/yunoupdatekali.jpg
similarity index 100%
rename from _postfiles/2014-02-13-y-u-no-update-kali/yunoupdatekali.jpg
rename to _posts/2014-02-13-y-u-no-update-kali/yunoupdatekali.jpg
diff --git a/_posts/2014-04-02-hacking-unicoins-for-fun-and-profit.md b/_posts/2014-04-02-hacking-unicoins-for-fun-and-profit.md
index 00e7b5b49..c651530ed 100644
--- a/_posts/2014-04-02-hacking-unicoins-for-fun-and-profit.md
+++ b/_posts/2014-04-02-hacking-unicoins-for-fun-and-profit.md
@@ -27,4 +27,6 @@ I've put together a little automagical javascript to prevent you all getting RSI
 
 Enjoy your unicoins! <3 /dev/alias
 
-{% gist alias1/9905949 %}
+https://gist.github.com/0xdevalias/9905949
+
+{% gist 9905949 %}
diff --git a/_posts/2014-05-15-java-scala-future-promise-map-headsplode.md b/_posts/2014-05-15-java-scala-future-promise-map-headsplode.md
index 170fc56ce..95f5c6948 100644
--- a/_posts/2014-05-15-java-scala-future-promise-map-headsplode.md
+++ b/_posts/2014-05-15-java-scala-future-promise-map-headsplode.md
@@ -23,4 +23,6 @@ A side by side comparison (now that I finally got it figured out!) of [Play Fram
 
 <3 /dev/alias
 
-{% gist alias1/1d3b44312d8a68ddbaa5 %}
\ No newline at end of file
+https://gist.github.com/0xdevalias/1d3b44312d8a68ddbaa5
+
+{% gist 1d3b44312d8a68ddbaa5 %}
diff --git a/_posts/2015-04-20-dogedraw-now-with-more-nyaan.md b/_posts/2015-04-20-dogedraw-now-with-more-nyaan.md
index 8b787af4a..9e1290234 100644
--- a/_posts/2015-04-20-dogedraw-now-with-more-nyaan.md
+++ b/_posts/2015-04-20-dogedraw-now-with-more-nyaan.md
@@ -25,4 +25,6 @@ Over the last few days I've been mentoring web dev at [HS.HACT.IO](http://hact.i
 
 A little while (and far too long typing out pixel art as code) later, and we have nyaan hacks! You can clear a section of the screen with a solid block of colour, or better yet, stamp out some pixel art nyaan cat across the page!
 
-{% gist alias1/e8bb28726a37854606ad %}
+https://gist.github.com/0xdevalias/e8bb28726a37854606ad
+
+{% gist e8bb28726a37854606ad %}