56 changed files with 654 additions and 2590 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,80 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: CI
-
-# Controls when the action will run. 
-on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  test_stable:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        firefox: [ '73.0' ]
-        include:
-          - nim-version: 'stable'
-            cache-key: 'stable'
-    steps:
-      - uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      
-      - name: Setup firefox
-        uses: browser-actions/setup-firefox@latest
-        with:
-          firefox-version: ${{ matrix.firefox }}
-
-      - name: Get Date
-        id: get-date
-        run: echo "::set-output name=date::$(date "+%Y-%m-%d")"
-        shell: bash
-        
-      - name: Cache choosenim
-        uses: actions/cache@v2
-        with:
-          path: ~/.choosenim
-          key: ${{ runner.os }}-choosenim-${{ matrix.cache-key }}
-        
-      - name: Cache nimble
-        uses: actions/cache@v2
-        with:
-          path: ~/.nimble
-          key: ${{ runner.os }}-nimble-${{ hashFiles('*.nimble') }}
-
-      - uses: jiro4989/setup-nim-action@v1
-        with:
-          nim-version: "${{ matrix.nim-version }}"
-
-      - name: Install geckodriver
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get install autoconf libtool libsass-dev
-
-          wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux64.tar.gz
-          mkdir geckodriver
-          tar -xzf geckodriver-v0.29.1-linux64.tar.gz -C geckodriver
-          export PATH=$PATH:$PWD/geckodriver
-          
-      - name: Install choosenim
-        run: |
-          export CHOOSENIM_CHOOSE_VERSION="stable"
-          curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
-          sh init.sh -y
-          export PATH=$HOME/.nimble/bin:$PATH
-          nimble refresh -y
-          
-      - name: Run tests
-        run: |
-          export MOZ_HEADLESS=1
-          nimble -y install
-          nimble -y test
-      
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,7 @@
 # Wildcard patterns.
 *.swp
 nimcache/
-*.db*
+*.db

 # Specific paths
 /createdb
@ -12,12 +12,3 @@ nimcache/
 forum
 createdb
 editdb
-
-.vscode
-forum.json*
-browsertester
-setup_nimforum
-buildcss
-nimforum.css
-
-/src/frontend/forum.js
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,44 @@
+os:
+  - linux
+
+language: c
+
+cache:
+  directories:
+    - "$HOME/.nimble"
+    - "$HOME/.choosenim"
+
+addons:
+  firefox: "60.0.1"
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install autoconf libtool
+  - git clone -b 3.5.4 https://github.com/sass/libsass.git
+  - cd libsass
+  - autoreconf --force --install
+  - |
+      ./configure \
+        --disable-tests \
+        --disable-static \
+        --enable-shared \
+        --prefix=/usr
+  - sudo make -j5 install
+  - cd ..
+
+  - wget https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
+  - mkdir geckodriver
+  - tar -xzf geckodriver-v0.20.1-linux64.tar.gz -C geckodriver
+  - export PATH=$PATH:$PWD/geckodriver
+
+install:
+  - export CHOOSENIM_CHOOSE_VERSION="#987bf13"
+  - |
+      curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
+      sh init.sh -y
+  - export PATH=$HOME/.nimble/bin:$PATH
+  - nimble refresh -y
+
+script:
+  - export MOZ_HEADLESS=1
+  - nimble -y test
--- a/README.md
+++ b/README.md
@ -1,131 +1,67 @@
 # nimforum

-NimForum is a light-weight forum implementation
-with many similarities to Discourse. It is implemented in
-the [Nim](https://nim-lang.org) programming
-language and uses SQLite for its database.
+This is Nim's forum. Available at http://forum.nim-lang.org.

-## Examples in the wild
+## Building

-[![forum.nim-lang.org](https://i.imgur.com/hdIF5Az.png)](https://forum.nim-lang.org)
+You can use ``nimble`` (available [here](https://github.com/nim-lang/nimble))
+to get all the necessary
+[dependencies](https://github.com/nim-lang/nimforum/blob/master/nimforum.nimble#L11).

-<p align="center" margin="0"><a href="https://forum.nim-lang.org"><b>forum.nim-lang.org</b></a></p>
+Clone this repo and execute ``nimble build`` in this repositories directory.

-## Features
-
-* Efficient, type safe and clean **single-page application** developed using the
-  [Karax](https://github.com/pragmagic/karax) and
-  [Jester](https://github.com/dom96/jester) frameworks.
-* **Utilizes SQLite** making set up much easier.
-* Endlessly **customizable** using SASS.
-* Spam blocking via new user sandboxing with great tools for moderators.
-* reStructuredText enriched by Markdown to make formatting your posts a breeze.
-* Search powered by SQLite's full-text search.
-* Context-aware replies.
-* Last visit tracking.
-* Gravatar support.
-* And much more!
-
-## Setup
-
-[See this document.](https://github.com/nim-lang/nimforum/blob/master/setup.md)
+See also: <a href="#running-the-forum">Running the forum</a> for how to create the database.

 ## Dependencies

-The following lists the dependencies which you may need to install manually
-in order to get NimForum running, compiled*, or tested†.
+The code depends on the RST parser of the Nim compiler and on Jester.  
+The captchas for registration uses the [reCaptcha module](https://github.com/euantorano/recaptcha.nim).

-* libsass
-* SQLite
-* pcre
-* Nim (and the Nimble package manager)*
-* [geckodriver](https://github.com/mozilla/geckodriver)†
-  * Firefox†
+#### bcrypt

-[*] Build time dependencies
-
-[†] Test time dependencies
-
-## Development
-
-Check out the tasks defined by this project's ``nimforum.nimble`` file by
-running ``nimble tasks``, as of writing they are:
+On macosx you also need to make sure to use the bcrypt >= 0.2.1 module if that
+is not yet updated you can install it with:

 ```
-backend              Compiles and runs the forum backend
-runbackend           Runs the forum backend
-frontend             Builds the necessary JS frontend (with CSS)
-minify               Minifies the JS using Google's closure compiler
-testdb               Creates a test DB (with admin account!)
-devdb                Creates a test DB (with admin account!)
-blankdb              Creates a blank DB
-test                 Runs tester
-fasttest             Runs tester without recompiling backend
+nimble install https://github.com/oderwat/bcryptnim.git@#fix-osx
 ```

-To get up and running:
-
-```bash
-git clone https://github.com/nim-lang/nimforum
-cd nimforum
-git submodule update --init --recursive
-
-# Setup the db with user: admin, pass: admin and some other users
-nimble devdb
-
-# Run this again if frontend code changes
-nimble frontend
-
-# Will start a server at localhost:5000
-nimble backend
-```
-
-Development typically involves running `nimble devdb` which sets up the
-database for development and testing, then `nimble backend`
-which compiles and runs the forum's backend, and `nimble frontend`
-separately to build the frontend. When making changes to the frontend it
-should be enough to simply run `nimble frontend` again to rebuild. This command
-will also build the SASS ``nimforum.scss`` file in the `public/css` directory.
-
-### With docker
-
-You can easily launch site on localhost if you have `docker` and `docker-compose`.
-You don't have to setup dependencies (libsass, sglite, pcre, etc...) on you host PC.
-
-To get up and running:
-
-```bash
-cd docker
-docker-compose build
-docker-compose up
-```
-
-And you can access local NimForum site.
-Open http://localhost:5000 .
-
-# Troubleshooting
-
-You might have to run `nimble install karax@#5f21dcd`, if setup fails
-with:
+You may also need to change `nimforum.nimble` such that it uses 0.2.1 by
+changing the dependencies slightly.

 ```
-andinus@circinus ~/projects/forks/nimforum> nimble --verbose devdb
-[...]
- Installing karax@#5f21dcd
-       Tip: 24 messages have been suppressed, use --verbose to show them.
-     Error: No binaries built, did you specify a valid binary name?
-[...]
-     Error: Exception raised during nimble script execution
+[Deps]
+Requires: "nim >= 0.14.0, jester#head, bcrypt >= 0.2.1, recaptcha >= 1.0.0"
 ```

-The hash needs to be replaced with the one specified in output.
+# Running the forum
+
+**Important: You need to compile and run `createdb` to generate the initial database
+before you can run `forum` the first time**!
+
+**Note: If you do not have a mail server set up locally, you can specify
+``-d:dev`` during compilation to prevent nimforum from attempting to send
+emails and to automatically activate user accounts**
+
+This is as simple as:
+
+```
+nim c -r createdb
+```
+
+After that you can just run `forum` and if everything is ok you will get the info which URL you need to open in your browser (http://localhost:5000) to access it.
+
+_There is an update helper `editdb` which you can safely ignore for now._
+
+_The file `cache.nim` is included by `forum.nim` and do
+not need to be compiled by you._

 # Copyright

-Copyright (c) 2012-2018 Andreas Rumpf, Dominik Picheta.
+Copyright (c) 2012-2017 Andreas Rumpf, Dominik Picheta.

 All rights reserved.

 # License

-NimForum is licensed under the MIT license.
+Nimforum is licensed under the MIT license.
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,14 +0,0 @@
-FROM nimlang/nim:1.2.6-ubuntu
-
-RUN apt-get update -yqq \
-    && apt-get install -y --no-install-recommends \
-               libsass-dev \
-               sqlite3 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-COPY . /app
-
-# install dependencies
-RUN nimble install -Y
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -1,12 +0,0 @@
-version: "3.7"
-
-services:
-  forum:
-    build:
-      context: ../
-      dockerfile: ./docker/Dockerfile
-    volumes:
-      - "../:/app"
-    ports:
-      - "5000:5000"
-    entrypoint: "/app/docker/entrypoint.sh"
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-git submodule update --init --recursive
-
-# setup
-nimble c -d:release src/setup_nimforum.nim
-./src/setup_nimforum --dev
-
-# build frontend
-nimble c -r src/buildcss
-nimble js -d:release src/frontend/forum.nim
-mkdir -p public/js
-cp src/frontend/forum.js public/js/forum.js
-
-# build backend
-nimble c src/forum.nim
-./src/forum
--- a/forum.json.example
+++ b/forum.json.example
@ -0,0 +1,4 @@
+{
+    "recaptchaSecretKey": "",
+    "recaptchaSiteKey": ""
+}
--- a/license.txt
+++ b/license.txt
@ -1,4 +1,4 @@
-Copyright (C) 2018 Andreas Rumpf, Dominik Picheta
+Copyright (C) 2015 Andreas Rumpf, Dominik Picheta

 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
@ -7,7 +7,7 @@ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 of the Software, and to permit persons to whom the Software is furnished to do 
 so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all 
 copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
--- a/localhost.local/public/css/custom-style.scss
+++ b/localhost.local/public/css/custom-style.scss
@ -9,8 +9,4 @@ $secondary-btn-color: #f1f1f1;
 $body-bg: #ffffff;
 $navbar-color: $body-bg;
 $navbar-border-color-dark: $body-bg;
-$navbar-primary-color: #e80080;
-
-#main-navbar input#search-box {
-  border: 1px solid #e6e6e6;
-}
+$navbar-primary-color: #e80080;
--- a/nimforum.nimble
+++ b/nimforum.nimble
@ -1,5 +1,5 @@
 # Package
-version       = "2.1.0"
+version       = "0.1.0"
 author        = "Dominik Picheta"
 description   = "The Nim forum"
 license       = "MIT"
@ -12,16 +12,16 @@ skipExt = @["nim"]

 # Dependencies

-requires "nim >= 1.0.6"
-requires "jester#405be2e"
-requires "bcrypt#440c5676ff6"
+requires "nim >= 0.14.0"
+requires "jester#64295c8"
+requires "bcrypt#head"
 requires "hmac#9c61ebe2fd134cf97"
-requires "recaptcha#d06488e"
-requires "sass#649e0701fa5c"
+requires "recaptcha 1.0.2"
+requires "sass"

-requires "karax#5f21dcd"
+requires "https://github.com/dom96/karax#7a884fb"

-requires "webdriver#429933a"
+requires "webdriver#a2be578"

 # Tasks

@ -32,33 +32,26 @@ task backend, "Compiles and runs the forum backend":
 task runbackend, "Runs the forum backend":
  exec "./src/forum"

-task testbackend, "Runs the forum backend in test mode":
-  exec "nimble c -r -d:skipRateLimitCheck src/forum.nim"
-
 task frontend, "Builds the necessary JS frontend (with CSS)":
  exec "nimble c -r src/buildcss"
  exec "nimble js -d:release src/frontend/forum.nim"
  mkDir "public/js"
-  cpFile "src/frontend/forum.js", "public/js/forum.js"
+  cpFile "src/frontend/nimcache/forum.js", "public/js/forum.js"

 task minify, "Minifies the JS using Google's closure compiler":
  exec "closure-compiler public/js/forum.js --js_output_file public/js/forum.js.opt"

-task testdb, "Creates a test DB (with admin account!)":
+task testdb, "Creates a test DB":
  exec "nimble c src/setup_nimforum"
  exec "./src/setup_nimforum --test"

-task devdb, "Creates a test DB (with admin account!)":
+task devdb, "Creates a test DB":
  exec "nimble c src/setup_nimforum"
  exec "./src/setup_nimforum --dev"

-task blankdb, "Creates a blank DB":
-  exec "nimble c src/setup_nimforum"
-  exec "./src/setup_nimforum --blank"
-
 task test, "Runs tester":
  exec "nimble c -y src/forum.nim"
-  exec "nimble c -y -r -d:actionDelayMs=0 tests/browsertester"
+  exec "nimble c -y -r tests/browsertester"

 task fasttest, "Runs tester without recompiling backend":
-  exec "nimble c -r -d:actionDelayMs=0 tests/browsertester"
+  exec "nimble c -r tests/browsertester"
--- a/public/css/nimforum.scss
+++ b/public/css/nimforum.scss
@ -22,7 +22,6 @@ table th {
 // Custom styles.
 // - Navigation bar.
 $navbar-height: 60px;
-$default-category-color: #a3a3a3;
 $logo-height: $navbar-height - 20px;

 .navbar-button {
@ -51,7 +50,6 @@ $logo-height: $navbar-height - 20px;
  // Unfortunately we must colour the controls in the navbar manually.
  .search-input {
    @extend .form-input;
-    min-width: 120px;
    border-color: $navbar-border-color-dark;
  }

@ -109,51 +107,12 @@ $logo-height: $navbar-height - 20px;
  }
 }

-#category-selection {
-  .dropdown {
-    .btn {
-      margin-right: 0px;
-    }
-  }
-  .plus-btn {
-    margin-right: 0px;
-    i {
-      margin-right: 0px;
-    }
-  }
-}
-
-.category-description {
-  opacity: 0.6;
-  font-size: small;
-}
-
-.category-status {
-  font-size: small;
-  font-weight: bold;
-
-  .topic-count {
-    margin-left: 5px;
-    opacity: 0.7;
-    font-size: small;
-  }
-}
-
-.category {
-  white-space: nowrap;
-}
-
 #new-thread {
  .modal-container .modal-body {
    max-height: none;
  }

-  .panel-body {
-    padding-top: $control-padding-y*2;
-    padding-bottom: $control-padding-y*2;
-  }
-
-  .form-input[name='subject'] {
+  .form-input {
    margin-bottom: $control-padding-y*2;
  }

@ -184,33 +143,6 @@ $logo-height: $navbar-height - 20px;
  }
 }

-.thread-list {
-  @extend .container;
-  @extend .grid-xl;
-}
-
-.category-list {
-  @extend .thread-list;
-
-
-  .category-title {
-    @extend .thread-title;
-    a, a:hover {
-      color: lighten($body-font-color, 10%);
-      text-decoration: none;
-    }
-  }
-
-  .category-description {
-    opacity: 0.6;
-  }
-}
-
-#categories-list .category {
-  border-left: 6px solid;
-  border-left-color: $default-category-color;
-}
-
 $super-popular-color: #f86713;
 $popular-color: darken($super-popular-color, 25%);
 $threads-meta-color: #545d70;
@ -259,12 +191,14 @@ $threads-meta-color: #545d70;
  }
 }

-.category-color {
+.triangle {
+  // TODO: Abstract this into a "category" class.
  width: 0;
  height: 0;
-  border: 0.25rem solid $default-category-color;
+  border-left: 0.3rem solid transparent;
+  border-right: 0.3rem solid transparent;
+  border-bottom: 0.6rem solid #98c766;
  display: inline-block;
-  margin-right: 5px;
 }

 .load-more-separator {
@ -301,14 +235,6 @@ $threads-meta-color: #545d70;
  }
 }

-.thread-replies, .thread-time, .views-text, .popular-text, .centered-header {
-  text-align: center;
-}
-
-.thread-users {
-  text-align: left;
-}
-
 .thread-time {
  color: $threads-meta-color;

@ -322,11 +248,8 @@ $threads-meta-color: #545d70;

 }

-// Hide all the avatars but the first on small screens.
-@media screen and (max-width: 600px) {
-  #threads-list a:not(:first-child) > .avatar {
-    display: none;
-  }
+#threads-list tr.banned {
+  display: none; // TODO: Fix server so that it doesn't send banned threads.
 }

 .posts, .about {
@ -430,7 +353,7 @@ $threads-meta-color: #545d70;
  }
 }

-.post-content, .about {
+.post-content {
  img {
    max-width: 100%;
  }
@ -560,12 +483,6 @@ blockquote {
  display: none;
 }

-.post-content {
-  pre:not(.code) {
-    overflow: scroll;
-  }
-}
-
 .information {
  @extend .tile;
  border-top: 1px solid $border-color;
@ -779,3 +696,18 @@ hr {
    margin-top: $control-padding-y*2;
  }
 }
+
+// - Hide features that have not been implemented yet.
+#main-buttons > section.navbar-section:nth-child(1) {
+  display: none;
+}
+
+#threads-list.table {
+  tr > th:nth-child(2), tr > td:nth-child(2) {
+    display: none;
+  }
+}
+
+.category, div.flag-button {
+  display: none;
+}
--- a/public/karax.html
+++ b/public/karax.html
@ -11,21 +11,12 @@
  <link rel="stylesheet" href="/css/nimforum.css">
  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.12/css/all.css" integrity="sha384-G0fIWCsCzJIMAVNQPfjH08cyYaUtMwjJwqiRKxxE/rx96Uroj1BtIQ6MLJuheaO9" crossorigin="anonymous">
  <link rel="icon" href="/images/favicon.png">
-
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=$ga"></script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-
-    gtag('config', '$ga');
-  </script>
 </head>

 <body>
-  <div id="ROOT"></div>
+  <div id="ROOT" />

  <script type="text/javascript" src="/js/forum.js?t=$timestamp"></script>
+  $scripts
 </body>
 </html>
--- a/public/rst.rst
+++ b/public/rst.rst
@ -1,5 +1,5 @@
-Markdown and RST supported by this forum
-========================================
+reStructuredText cheat sheet
+===========================================================================

 This is a cheat sheet for the *reStructuredText* dialect as implemented by
 Nim's documentation generator which has been reused for this forum.
@ -11,6 +11,7 @@ for further information.

 Elements of **markdown** are also supported.

+
 Inline elements
 ---------------

@ -27,18 +28,6 @@ Plain text                        Result
 ``\\escape``                      \\escape
 ===============================   ============================================

-Quoting other users can be done by prefixing their message with ``>``::
-
-  > Hello World
-
-  Hi!
-
-Which will result in:
-
-> Hello World
-
-Hi!
-
 Links
 -----

@ -55,22 +44,33 @@ Or like this::
 Code blocks
 -----------

-The code blocks can be written in the same style as most common Markdown
-flavours::
-
-  ```nim
-    if x == "abc":
-      echo "xyz"
-  ```
-
-or using RST syntax::
+are done this way::

  .. code-block:: nim
    
    if x == "abc":
      echo "xyz"

-Both are rendered as:
+
+Is rendered as:
+
+.. code-block:: nim
+  
+  if x == "abc":
+    echo "xyz"
+
+
+Except Nim, the programming languages C, C++, Java and C# have highlighting
+support.
+
+An alternative github-like syntax is also supported. This has the advantage
+that no excessive indentation is needed::
+
+  ```nim  
+    if x == "abc":
+      echo "xyz"```
+
+Is rendered as:

 .. code-block:: nim
  
@ -78,20 +78,18 @@ Both are rendered as:
    echo "xyz"


-Apart from Nim, the programming languages C, C++, Java and C# also
-have highlighting support.

 Literal blocks
 --------------

-These are introduced by '::' and a newline. The block is indicated by indentation:
+Are introduced by '::' and a newline. The block is indicated by indentation: 

 ::
  ::
    if x == "abc":
      echo "xyz"
      
-The above is rendered as::
+Is rendered as::

    if x == "abc":
      echo "xyz"
@ -101,7 +99,7 @@ The above is rendered as::
 Bullet lists
 ------------

-Bullet lists look like this::
+look like this::

  * Item 1
  * Item 2 that
@ -112,7 +110,7 @@ Bullet lists look like this::
    - item 3b
    - valid bullet characters are ``+``, ``*`` and ``-``

-The above rendered as:
+Is rendered as:
 * Item 1
 * Item 2 that
  spans over multiple lines
@ -126,7 +124,7 @@ The above rendered as:
 Enumerated lists
 ----------------

-Enumerated lists are written like this::
+are written like this::

  1. This is the first item
  2. This is the second item
@ -134,13 +132,60 @@ Enumerated lists are written like this::
     single letters, or roman numerals
  #. This item is auto-enumerated 

-They are rendered as:
+Is rendered as:

 1. This is the first item
 2. This is the second item
 3. Enumerators are arabic numbers,
   single letters, or roman numerals
-#. This item is auto-enumerated
+#. This item is auto-enumerated 
+
+
+Quoting someone
+---------------
+
+quotes are just::
+
+    **Someone said**:  Indented paragraphs,
+
+        and they may nest. 
+
+Is rendered as:
+
+    **Someone said**:  Indented paragraphs,
+
+        and they may nest. 
+
+
+
+Definition lists
+----------------
+
+are written like this::
+
+  what
+    Definition lists associate a term with
+    a definition.
+
+  how
+    The term is a one-line phrase, and the
+    definition is one or more paragraphs or
+    body elements, indented relative to the
+    term. Blank lines are not allowed
+    between term and definition.
+
+and look like:
+
+what
+  Definition lists associate a term with
+  a definition.
+
+how
+  The term is a one-line phrase, and the
+  definition is one or more paragraphs or
+  body elements, indented relative to the
+  term. Blank lines are not allowed
+  between term and definition.


 Tables
@ -176,35 +221,6 @@ Cell 7                  Cell 8                Cell 9
 Images
 ------

-Image embedding is supported. This includes GIFs as well as mp4 (for which a
-<video> tag will be automatically generated).
-
-For example:
-
 ```
-.. image:: https://upload.wikimedia.org/wikipedia/commons/6/69/Dog_morphological_variation.png
-```
-
-Will render as:
-
-.. image:: https://upload.wikimedia.org/wikipedia/commons/6/69/Dog_morphological_variation.png
-
-And a GIF example:
-
-```
-.. image:: https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif
-```
-
-Will render as:
-
-.. image:: https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif
-
-You can also specify the size of the image:
-
-```
-.. image:: https://upload.wikimedia.org/wikipedia/commons/6/69/Dog_morphological_variation.png
-   :width: 40%
-```
-
-.. image:: https://upload.wikimedia.org/wikipedia/commons/6/69/Dog_morphological_variation.png
-   :width: 40%
+.. image:: path/to/img.png
+```
--- a/setup.md
+++ b/setup.md
@ -1,171 +0,0 @@
-# NimForum setup
-
-This document describes the steps needed to setup a working NimForum instance.
-
-## Requirements
-
-* Ubuntu 16.04+
-* Some Linux knowledge
-
-## Installation
-
-Begin by downloading the latest NimForum release from
-[here](https://github.com/nim-lang/nimforum/releases). The macOS releases are
-mainly provided for testing.
-
-Extract the downloaded tarball on your server. These steps can be done using
-the following commands:
-
-```
-wget https://github.com/nim-lang/nimforum/releases/download/v2.0.0/nimforum_2.0.0_linux.tar.xz
-tar -xf nimforum_2.0.0_linux.tar.xz
-```
-
-Then ``cd`` into the forum's directory:
-
-```
-cd nimforum_2.0.0_linux
-```
-
-### Dependencies
-
-The following may need to be installed on your server:
-
-```
-sudo apt install libsass-dev sqlite3
-```
-
-## Configuration and DB creation
-
-The NimForum release comes with a handy ``setup_nimforum`` program. Run
-it to begin the setup process:
-
-```
-./setup_nimforum --setup
-```
-
-The program will ask you multiple questions which will require some
-additional setup, including mail server info and recaptcha keys. You can
-just specify dummy values if you want to play around with the forum as
-quickly as possible and set these up later.
-
-This program will create a ``nimforum.db`` file, this contains your forum's
-database. It will also create a ``forum.json`` file, you can modify this
-file after running the ``setup_nimforum`` script if you've made any mistakes
-or just want to change things.
-
-## Running the forum
-
-Executing the forum is simple, just run the ``forum`` binary:
-
-```
-./forum
-```
-
-The forum will start listening to HTTP requests on port 5000 (by default, this
-can be changed in ``forum.json``).
-
-On your server you should set up a separate HTTP server. The recommended choice
-is nginx. You can then use it as a reverse proxy for NimForum.
-
-### HTTP server
-
-#### nginx
-
-Once you have nginx installed on your server, you will need to configure it.
-Create a ``forum.hostname.com`` file (replace the hostname with your forum's
-hostname) inside ``/etc/nginx/sites-available/``.
-
-Place the following inside it:
-
-```
-server {
-        server_name forum.hostname.com;
-        autoindex off;
-
-        location / {
-                proxy_pass http://localhost:5000;
-                proxy_set_header Host $host;
-                proxy_set_header X-Real_IP $remote_addr;
-        }
-}
-```
-
-Again, be sure to replace ``forum.hostname.com`` with your forum's
-hostname.
-
-You should then create a symlink to this file inside ``/etc/nginx/sites-enabled/``:
-
-```
-ln -s /etc/nginx/sites-available/<forum.hostname.com> /etc/nginx/sites-enabled/<forum.hostname.com>
-```
-
-Then reload nginx configuration by running ``sudo nginx -s reload``.
-
-### Supervisor
-
-#### systemd
-
-In order to ensure the forum is always running, even after a crash or a server
-reboot, you should create a systemd service file.
-
-Create a new file called ``nimforum.service`` inside ``/lib/systemd/system/nimforum.service``.
-
-Place the following inside it:
-
-```
-[Unit]
-Description=nimforum
-After=network.target httpd.service
-Wants=network-online.target
-
-[Service]
-Type=simple
-WorkingDirectory=/home/<user>/nimforum-2.0.0/ # MODIFY THIS
-ExecStart=/usr/bin/stdbuf -oL /home/<user>/nimforum-2.0.0/forum # MODIFY THIS
-# Restart when crashes.
-Restart=always
-RestartSec=1
-
-User=dom
-
-StandardOutput=syslog+console
-StandardError=syslog+console
-
-[Install]
-WantedBy=multi-user.target
-```
-
-**Be sure to specify the correct ``WorkingDirectory`` and ``ExecStart``!**
-
-You can then enable and start the service by running the following:
-
-```
-sudo systemctl enable nimforum
-sudo systemctl start nimforum
-```
-
-To check that everything is in order, run this:
-
-```
-systemctl status nimforum
-```
-
-You should see something like this:
-
-```
-● nimforum.service - nimforum
-   Loaded: loaded (/lib/systemd/system/nimforum.service; enabled; vendor preset: enabled)
-   Active: active (running) since Fri 2018-05-25 22:09:59 UTC; 1 day 22h ago
- Main PID: 21474 (forum)
-    Tasks: 1
-   Memory: 55.2M
-      CPU: 1h 15min 31.905s
-   CGroup: /system.slice/nimforum.service
-           └─21474 /home/dom/nimforum/src/forum
-```
-
-## Conclusion
-
-That should be all you need to get started. Your forum should now be accessible
-via your hostname, assuming that it points to your VPS' IP address.
--- a/src/auth.nim
+++ b/src/auth.nim
@ -71,13 +71,13 @@ when isMainModule:
      "test",
      "$2a$08$bY85AhoD1e9u0IsD9sM7Ee6kFSLeXRLxJ6rMgfb1wDnU9liaymoTG",
      1526908753,
-      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\\um"
+      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\um"
    )
    let ident2 = makeIdentHash(
      "test",
      "$2a$08$bY85AhoD1e9u0IsD9sM7Ee6kFSLeXRLxJ6rMgfb1wDnU9liaymoTG",
      1526908753,
-      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\\um"
+      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\um"
    )
    doAssert ident == ident2

@ -85,6 +85,6 @@ when isMainModule:
      "test",
      "$2a$08$bY85AhoD1e9u0IsD9sM7Ee6kFSLeXRLxJ6rMgfb1wDnU9liaymoTG",
      1526908754,
-      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\\um"
+      "*B2a] IL\"~sh)q-GBd/i$^>.TL]PR~>1IX>Fp-:M3pCm^cFD\um"
    )
-    doAssert ident != invalid
+    doAssert ident != invalid
--- a/src/buildcss.nim
+++ b/src/buildcss.nim
@ -1,4 +1,4 @@
-import os
+import os, strutils

 import sass

--- a/src/email.nim
+++ b/src/email.nim
@ -20,7 +20,7 @@ proc newMailer*(config: Config): Mailer =
 proc rateCheck(mailer: Mailer, address: string): bool =
  ## Returns true if we've emailed the address too much.
  let diff = getTime() - mailer.lastReset
-  if diff.inHours >= 1:
+  if diff.hours >= 1:
    mailer.lastReset = getTime()
    mailer.emailsSent.clear()

@ -30,6 +30,7 @@ proc rateCheck(mailer: Mailer, address: string): bool =
 proc sendMail(
  mailer: Mailer,
  subject, message, recipient: string,
+  fromAddr = "forum@nim-lang.org",
  otherHeaders:seq[(string, string)] = @[]
 ) {.async.} =
  # Ensure we aren't emailing this address too much.
@ -40,37 +41,21 @@ proc sendMail(
  if mailer.config.smtpAddress.len == 0:
    warn("Cannot send mail: no smtp server configured (smtpAddress).")
    return
-  if mailer.config.smtpFromAddr.len == 0:
-    warn("Cannot send mail: no smtp from address configured (smtpFromAddr).")
-    return
-
-  var client: AsyncSmtp
-  if mailer.config.smtpTls:
-    client = newAsyncSmtp(useSsl=false)
-    await client.connect(mailer.config.smtpAddress, Port(mailer.config.smtpPort))
-    await client.startTls()
-  elif mailer.config.smtpSsl:
-    client = newAsyncSmtp(useSsl=true)
-    await client.connect(mailer.config.smtpAddress, Port(mailer.config.smtpPort))
-  else:
-    client = newAsyncSmtp(useSsl=false)
-    await client.connect(mailer.config.smtpAddress, Port(mailer.config.smtpPort))

+  var client = newAsyncSmtp()
+  await client.connect(mailer.config.smtpAddress, Port(mailer.config.smtpPort))
  if mailer.config.smtpUser.len > 0:
    await client.auth(mailer.config.smtpUser, mailer.config.smtpPassword)

  let toList = @[recipient]

  var headers = otherHeaders
-  headers.add(("From", mailer.config.smtpFromAddr))
-
-  let dateHeader = now().utc().format("ddd, dd MMM yyyy hh:mm:ss") & " +0000"
-  headers.add(("Date", dateHeader))
+  headers.add(("From", fromAddr))

  let encoded = createMessage(subject, message,
      toList, @[], headers)

-  await client.sendMail(mailer.config.smtpFromAddr, toList, $encoded)
+  await client.sendMail(fromAddr, toList, $encoded)

 proc sendPassReset(mailer: Mailer, email, user, resetUrl: string) {.async.} =
  let message = """Hello $1,
@ -148,4 +133,4 @@ proc sendSecureEmail*(
    if emailSentFut.error of ForumError:
      raise emailSentFut.error
    else:
-      raise newForumError("Couldn't send email", @["email"])
+      raise newForumError("Couldn't send email", @["email"])
--- a/src/forum.nim
+++ b/src/forum.nim
@ -8,7 +8,7 @@
 import system except Thread
 import
  os, strutils, times, md5, strtabs, math, db_sqlite,
-  jester, asyncdispatch, asyncnet, sequtils,
+  scgi, jester, asyncdispatch, asyncnet, sequtils,
  parseutils, random, rst, recaptcha, json, re, sugar,
  strformat, logging
 import cgi except setCookie
@ -76,6 +76,7 @@ proc getGravatarUrl(email: string, size = 80): string =


 # -----------------------------------------------------------------------------
+template `||`(x: untyped): untyped = (if not isNil(x): x else: "")

 proc validateCaptcha(recaptchaResp, ip: string) {.async.} =
  # captcha validation:
@ -104,8 +105,7 @@ proc sendResetPassword(
  if row[0] == "":
    raise newForumError("Email or username not found", @["email"])

-  if not c.loggedIn:
-    await validateCaptcha(recaptchaResp, userIp)
+  await validateCaptcha(recaptchaResp, userIp)

  await sendSecureEmail(
    mailer,
@ -114,27 +114,27 @@ proc sendResetPassword(
  )

 proc logout(c: TForumData) =
-  const query = sql"delete from session where key = ?"
+  const query = sql"delete from session where ip = ? and key = ?"
  c.username = ""
  c.userpass = ""
-  exec(db, query, c.req.cookies["sid"])
+  exec(db, query, c.req.ip, c.req.cookies["sid"])

 proc checkLoggedIn(c: TForumData) =
  if not c.req.cookies.hasKey("sid"): return
  let sid = c.req.cookies["sid"]
  if execAffectedRows(db,
       sql("update session set lastModified = DATETIME('now') " &
-           "where key = ?"),
-           sid) > 0:
+           "where ip = ? and key = ?"),
+           c.req.ip, sid) > 0:
    c.userid = getValue(db,
-      sql"select userid from session where key = ?",
-      sid)
+      sql"select userid from session where ip = ? and key = ?",
+      c.req.ip, sid)

    let row = getRow(db,
      sql"select name, email, status from person where id = ?", c.userid)
-    c.username = row[0]
-    c.email = row[1]
-    c.rank = parseEnum[Rank](row[2])
+    c.username = ||row[0]
+    c.email = ||row[1]
+    c.rank = parseEnum[Rank](||row[2])

    # In order to handle the "last visit" line appropriately, i.e.
    # it shouldn't disappear after a refresh, we need to manage a
@ -151,7 +151,7 @@ proc checkLoggedIn(c: TForumData) =
    )
    c.previousVisitAt = personRow[1].parseInt
    let diff = getTime() - fromUnix(personRow[0].parseInt)
-    if diff.inMinutes > 30:
+    if diff.minutes > 30:
      c.previousVisitAt = personRow[0].parseInt
      db.exec(
        sql"""
@ -238,7 +238,7 @@ proc verifyIdentHash(
  let newIdent = makeIdentHash(name, row[0], epoch, row[1])
  # Check that it hasn't expired.
  let diff = getTime() - epoch.fromUnix()
-  if diff.inHours > 2:
+  if diff.hours > 2:
    raise newForumError("Link expired")
  if newIdent != ident:
    raise newForumError("Invalid ident hash")
@ -267,7 +267,7 @@ proc initialise() =
    {
      "title": config.title,
      "timestamp": encodeUrl(CompileDate & CompileTime),
-      "ga": config.ga
+      "scripts": config.scripts
    }.newStringTable()


@ -276,26 +276,25 @@ template createTFD() =
  new(c)
  init(c)
  c.req = request
-  if cookies(request).len > 0:
+  if request.cookies.len > 0:
    checkLoggedIn(c)

 #[ DB functions. TODO: Move to another module? ]#

 proc selectUser(userRow: seq[string], avatarSize: int=80): User =
  result = User(
-    id: userRow[0],
-    name: userRow[1],
-    avatarUrl: userRow[2].getGravatarUrl(avatarSize),
-    lastOnline: userRow[3].parseInt,
-    previousVisitAt: userRow[4].parseInt,
-    rank: parseEnum[Rank](userRow[5]),
-    isDeleted: userRow[6] == "1"
+    name: userRow[0],
+    avatarUrl: userRow[1].getGravatarUrl(avatarSize),
+    lastOnline: userRow[2].parseInt,
+    previousVisitAt: userRow[3].parseInt,
+    rank: parseEnum[Rank](userRow[4]),
+    isDeleted: userRow[5] == "1"
  )

  # Don't give data about a deleted user.
  if result.isDeleted:
    result.name = "DeletedUser"
-    result.avatarUrl = getGravatarUrl(result.name & userRow[2], avatarSize)
+    result.avatarUrl = getGravatarUrl(result.name & userRow[1], avatarSize)

 proc selectPost(postRow: seq[string], skippedPosts: seq[int],
                replyingTo: Option[PostLink], history: seq[PostInfo],
@ -303,7 +302,7 @@ proc selectPost(postRow: seq[string], skippedPosts: seq[int],
  return Post(
    id: postRow[0].parseInt,
    replyingTo: replyingTo,
-    author: selectUser(postRow[5..11]),
+    author: selectUser(postRow[5..10]),
    likes: likes,
    seen: false, # TODO:
    history: history,
@ -319,7 +318,7 @@ proc selectReplyingTo(replyingTo: string): Option[PostLink] =

  const replyingToQuery = sql"""
    select p.id, strftime('%s', p.creation), p.thread,
-           u.id, u.name, u.email, strftime('%s', u.lastOnline),
+           u.name, u.email, strftime('%s', u.lastOnline),
           strftime('%s', u.previousVisitAt), u.status,
           u.isDeleted,
           t.name
@ -335,7 +334,7 @@ proc selectReplyingTo(replyingTo: string): Option[PostLink] =
    topic: row[^1],
    threadId: row[2].parseInt(),
    postId: row[0].parseInt(),
-    author: some(selectUser(row[3..9]))
+    author: some(selectUser(row[3..8]))
  ))

 proc selectHistory(postId: int): seq[PostInfo] =
@ -354,7 +353,7 @@ proc selectHistory(postId: int): seq[PostInfo] =

 proc selectLikes(postId: int): seq[User] =
  const likeQuery = sql"""
-    select u.id, u.name, u.email, strftime('%s', u.lastOnline),
+    select u.name, u.email, strftime('%s', u.lastOnline),
           strftime('%s', u.previousVisitAt), u.status,
           u.isDeleted
    from like h, person u
@ -369,7 +368,7 @@ proc selectLikes(postId: int): seq[User] =
 proc selectThreadAuthor(threadId: int): User =
  const authorQuery =
    sql"""
-      select id, name, email, strftime('%s', lastOnline),
+      select name, email, strftime('%s', lastOnline),
             strftime('%s', previousVisitAt), status, isDeleted
      from person where id in (
        select author from post
@ -381,13 +380,13 @@ proc selectThreadAuthor(threadId: int): User =

  return selectUser(getRow(db, authorQuery, threadId))

-proc selectThread(threadRow: seq[string], author: User): Thread =
+proc selectThread(threadRow: seq[string]): Thread =
  const postsQuery =
    sql"""select count(*), min(strftime('%s', creation)) from post
          where thread = ?;"""
  const usersListQuery =
    sql"""
-      select u.id, name, email, strftime('%s', lastOnline),
+      select name, email, strftime('%s', lastOnline),
             strftime('%s', previousVisitAt), status, u.isDeleted,
             count(*)
      from person u, post p where p.author = u.id and p.thread = ?
@ -400,10 +399,10 @@ proc selectThread(threadRow: seq[string], author: User): Thread =
    id: threadRow[0].parseInt,
    topic: threadRow[1],
    category: Category(
-      id: threadRow[6].parseInt,
-      name: threadRow[7],
-      description: threadRow[8],
-      color: threadRow[9]
+      id: threadRow[5].parseInt,
+      name: threadRow[6],
+      description: threadRow[7],
+      color: threadRow[8]
    ),
    users: @[],
    replies: posts[0].parseInt-1,
@ -412,7 +411,6 @@ proc selectThread(threadRow: seq[string], author: User): Thread =
    creation: posts[1].parseInt,
    isLocked: threadRow[4] == "1",
    isSolved: false, # TODO: Add a field to `post` to identify the solution.
-    isPinned: threadRow[5] == "1"
  )

  # Gather the users list.
@ -420,7 +418,7 @@ proc selectThread(threadRow: seq[string], author: User): Thread =
    thread.users.add(selectUser(user))

  # Grab the author.
-  thread.author = author
+  thread.author = selectThreadAuthor(thread.id)

  return thread

@ -436,9 +434,8 @@ proc executeReply(c: TForumData, threadId: int, content: string,
    else:
      raise newForumError("You are not allowed to post")

-  when not defined(skipRateLimitCheck):
-    if rateLimitCheck(c):
-      raise newForumError("You're posting too fast!")
+  if rateLimitCheck(c):
+    raise newForumError("You're posting too fast!")

  if content.strip().len == 0:
    raise newForumError("Message cannot be empty")
@ -450,7 +447,9 @@ proc executeReply(c: TForumData, threadId: int, content: string,
  let isLocked = getValue(
    db,
    sql"""
-      select isLocked from thread where id = ?;
+      select isLocked from thread where id in (
+        select thread from post where id = ?
+      )
    """,
    threadId
  )
@ -460,21 +459,13 @@ proc executeReply(c: TForumData, threadId: int, content: string,
  if isLocked == "1":
    raise newForumError("Cannot reply to a locked thread.")

-  var retID: int64
-
-  if replyingTo.isSome():
-    retID = insertID(
-      db,
-      crud(crCreate, "post", "author", "ip", "content", "thread", "replyingTo"),
-      c.userId, c.req.ip, content, $threadId, $replyingTo.get()
-    )
-  else:
-    retID = insertID(
-      db,
-      crud(crCreate, "post", "author", "ip", "content", "thread"),
-      c.userId, c.req.ip, content, $threadId
-    )
-
+  let retID = insertID(
+    db,
+    crud(crCreate, "post", "author", "ip", "content", "thread", "replyingTo"),
+    c.userId, c.req.ip, content, $threadId,
+    if replyingTo.isSome(): $replyingTo.get()
+    else: nil
+  )
  discard tryExec(
    db,
    crud(crCreate, "post_fts", "id", "content"),
@ -500,10 +491,10 @@ proc updatePost(c: TForumData, postId: int, content: string,

  # Verify that the current user has permissions to edit the specified post.
  let creation = fromUnix(postRow[1].parseInt)
-  let isArchived = (getTime() - creation).inHours >= 2
+  let isArchived = (getTime() - creation).weeks > 8
  let canEdit = c.rank == Admin or c.userid == postRow[0]
-  if isArchived and c.rank < Admin:
-    raise newForumError("This post is too old and can no longer be edited")
+  if isArchived:
+    raise newForumError("This post is archived and can no longer be edited")
  if not canEdit:
    raise newForumError("You cannot edit this post")

@ -530,20 +521,10 @@ proc updatePost(c: TForumData, postId: int, content: string,
    if row[0] == $postId:
      exec(db, crud(crUpdate, "thread", "name"), subject.get(), threadId)

-proc updateThread(c: TForumData, threadId: string, queryKeys: seq[string], queryValues: seq[string]) =
-  let threadAuthor = selectThreadAuthor(threadId.parseInt)
-
-  # Verify that the current user has permissions to edit the specified thread.
-  let canEdit = c.rank in {Admin, Moderator} or c.userid == threadAuthor.id
-  if not canEdit:
-    raise newForumError("You cannot edit this thread")
-
-  exec(db, crud(crUpdate, "thread", queryKeys), queryValues)
-
-proc executeNewThread(c: TForumData, subject, msg, categoryID: string): (int64, int64) =
+proc executeNewThread(c: TForumData, subject, msg: string): (int64, int64) =
  const
    query = sql"""
-      insert into thread(name, views, modified, category) values (?, 0, DATETIME('now'), ?)
+      insert into thread(name, views, modified) values (?, 0, DATETIME('now'))
    """

  assert c.loggedIn()
@ -563,18 +544,13 @@ proc executeNewThread(c: TForumData, subject, msg, categoryID: string): (int64,
  if msg.len == 0:
    raise newForumError("Message is empty", @["msg"])

-  let catID = getInt(categoryID, -1)
-  if catID == -1:
-    raise newForumError("CategoryID is invalid", @["categoryId"])
-
  if not validateRst(c, msg):
    raise newForumError("Message needs to be valid RST", @["msg"])

-  when not defined(skipRateLimitCheck):
-    if rateLimitCheck(c):
-      raise newForumError("You're posting too fast!")
+  if rateLimitCheck(c):
+    raise newForumError("You're posting too fast!")

-  result[0] = tryInsertID(db, query, subject, categoryID).int
+  result[0] = tryInsertID(db, query, subject).int
  if result[0] < 0:
    raise newForumError("Subject already exists", @["subject"])

@ -633,7 +609,7 @@ proc executeRegister(c: TForumData, name, pass, antibot, userIp,
    raise newForumError("Invalid username", @["username"])
  if getValue(
    db,
-    sql"select name from person where name = ? collate nocase and isDeleted = 0",
+    sql"select name from person where name = ? and isDeleted = 0",
    name
  ).len > 0:
    raise newForumError("Username already exists", @["username"])
@ -676,18 +652,6 @@ proc executeLike(c: TForumData, postId: int) =
  # Save the like.
  exec(db, crud(crCreate, "like", "author", "post"), c.userid, postId)

-proc executeNewCategory(c: TForumData, name, color, description: string): int64 =
-
-  let canAdd = c.rank == Admin
-
-  if not canAdd:
-    raise newForumError("You do not have permissions to add a category.")
-
-  if name.len == 0:
-    raise newForumError("Category name must not be empty!", @["name"])
-
-  result = insertID(db, crud(crCreate, "category", "name", "color", "description"), name, color, description)
-
 proc executeUnlike(c: TForumData, postId: int) =
  # Verify the post and like exists for the current user.
  const likeQuery = sql"""
@ -710,25 +674,15 @@ proc executeLockState(c: TForumData, threadId: int, locked: bool) =
  # Save the like.
  exec(db, crud(crUpdate, "thread", "isLocked"), locked.int, threadId)

-proc executePinState(c: TForumData, threadId: int, pinned: bool) =
-  if c.rank < Moderator:
-    raise newForumError("You do not have permission to pin this thread.")
-
-  # (Un)pin this thread
-  exec(db, crud(crUpdate, "thread", "isPinned"), pinned.int, threadId)
-
 proc executeDeletePost(c: TForumData, postId: int) =
  # Verify that this post belongs to the user.
  const postQuery = sql"""
-    select p.author, p.id from post p
+    select p.id from post p
    where p.author = ? and p.id = ?
  """
-  let
-    row = getRow(db, postQuery, c.username, postId)
-    author = row[0]
-    id = row[1]
+  let id = getValue(db, postQuery, postId, c.username)

-  if id.len == 0 and not (c.rank == Admin or c.userid == author):
+  if id.len == 0 and c.rank < Admin:
    raise newForumError("You cannot delete this post")

  # Set the `isDeleted` flag.
@ -783,7 +737,7 @@ proc updateProfile(
      raise newForumError("Rank needs a change when setting new email.")

    await sendSecureEmail(
-      mailer, ActivateEmail, c.req, row[0], row[1], email, row[3]
+      mailer, ActivateEmail, c.req, row[0], row[1], row[2], row[3]
    )

  validateEmail(email, checkDuplicated=wasEmailChanged)
@ -798,70 +752,26 @@ include "main.tmpl"

 initialise()

-settings:
-  port = config.port.Port
-
 routes:

-  get "/categories.json":
-    # TODO: Limit this query in the case of many many categories
-    const categoriesQuery =
-      sql"""
-        select c.*, count(thread.category)
-        from category c
-        left join thread on c.id == thread.category
-        group by c.id;
-      """
-
-    var list = CategoryList(categories: @[])
-    for data in getAllRows(db, categoriesQuery):
-      let category = Category(
-        id: data[0].getInt, name: data[1], description: data[2], color: data[3], numTopics: data[4].parseInt
-      )
-      list.categories.add(category)
-
-    resp $(%list), "application/json"
-
  get "/threads.json":
    var
      start = getInt(@"start", 0)
      count = getInt(@"count", 30)
-      categoryId = getInt(@"categoryId", -1)
-
-    var
-      categorySection = ""
-      categoryArgs: seq[string] = @[$start, $count]
-      countQuery = sql"select count(*) from thread;"
-      countArgs: seq[string] = @[]
-
-    if categoryId != -1:
-      categorySection = "c.id == ? and "
-      countQuery = sql"select count(*) from thread t, category c where category == c.id and c.id == ?;"
-      countArgs.add($categoryId)
-      categoryArgs.insert($categoryId, 0)

    const threadsQuery =
-      """select t.id, t.name, views, strftime('%s', modified), isLocked, isPinned,
-                   c.id, c.name, c.description, c.color,
-                   u.id, u.name, u.email, strftime('%s', u.lastOnline),
-                   strftime('%s', u.previousVisitAt), u.status, u.isDeleted
-            from thread t, category c, person u
-            where t.isDeleted = 0 and category = c.id and $#
-                  u.status <> 'Spammer' and u.status <> 'Troll' and
-                  u.id = (
-                    select p.author from post p
-                    where p.thread = t.id
-                    order by p.author
-                    limit 1
-                  )
-            order by isPinned desc, modified desc limit ?, ?;"""
+      sql"""select t.id, t.name, views, strftime('%s', modified), isLocked,
+                   c.id, c.name, c.description, c.color
+            from thread t, category c
+            where isDeleted = 0 and category = c.id
+            order by modified desc limit ?, ?;"""

-    let thrCount = getValue(db, countQuery, countArgs).parseInt()
+    let thrCount = getValue(db, sql"select count(*) from thread;").parseInt()
    let moreCount = max(0, thrCount - (start + count))

    var list = ThreadList(threads: @[], moreCount: moreCount)
-    for data in getAllRows(db, sql(threadsQuery % categorySection), categoryArgs):
-      let thread = selectThread(data[0 .. 9], selectUser(data[10 .. ^1]))
+    for data in getAllRows(db, threadsQuery, start, count):
+      let thread = selectThread(data)
      list.threads.add(thread)

    resp $(%list), "application/json"
@ -876,24 +786,19 @@ routes:
      count = 10

    const threadsQuery =
-      sql"""select t.id, t.name, views, strftime('%s', modified), isLocked, isPinned,
+      sql"""select t.id, t.name, views, strftime('%s', modified), isLocked,
                   c.id, c.name, c.description, c.color
            from thread t, category c
            where t.id = ? and isDeleted = 0 and category = c.id;"""

    let threadRow = getRow(db, threadsQuery, id)
-    if threadRow[0].len == 0:
-      let err = PostError(
-        message: "Specified thread does not exist"
-      )
-      resp Http404, $(%err), "application/json"
-    let thread = selectThread(threadRow, selectThreadAuthor(id))
+    let thread = selectThread(threadRow)

    let postsQuery =
      sql(
        """select p.id, p.content, strftime('%s', p.creation), p.author,
                  p.replyingTo,
-                  u.id, u.name, u.email, strftime('%s', u.lastOnline),
+                  u.name, u.email, strftime('%s', u.lastOnline),
                  strftime('%s', u.previousVisitAt), u.status,
                  u.isDeleted
           from post p, person u
@ -932,20 +837,15 @@ routes:

  get "/specific_posts.json":
    createTFD()
-    var ids: JsonNode
-    try:
+    var
      ids = parseJson(@"ids")
-    except JsonParsingError:
-      let err = PostError(
-        message: "Invalid JSON in the `ids` parameter"
-      )
-      resp Http400, $(%err), "application/json"
+
    cond ids.kind == JArray
    let intIDs = ids.elems.map(x => x.getInt())
    let postsQuery = sql("""
      select p.id, p.content, strftime('%s', p.creation), p.author,
             p.replyingTo,
-             u.id, u.name, u.email, strftime('%s', u.lastOnline),
+             u.name, u.email, strftime('%s', u.lastOnline),
             strftime('%s', u.previousVisitAt), u.status,
             u.isDeleted
      from post p, person u
@ -1014,7 +914,7 @@ routes:
    """ % postsFrom)

    let userQuery = sql("""
-      select id, name, email, strftime('%s', lastOnline),
+      select name, email, strftime('%s', lastOnline),
             strftime('%s', previousVisitAt), status, isDeleted,
             strftime('%s', creation), id
      from person
@ -1040,7 +940,7 @@ routes:
      getValue(db, sql("select count(*) " & threadsFrom), userID).parseInt()

    if c.rank >= Admin or c.username == username:
-      profile.email = some(userRow[2])
+      profile.email = some(userRow[1])

    for row in db.getAllRows(postsQuery, username):
      profile.posts.add(
@ -1111,22 +1011,8 @@ routes:
      let session = executeLogin(c, username, password)
      setCookie("sid", session)
      resp Http200, "{}", "application/json"
-    except ForumError as exc:
-      resp Http400, $(%exc.data), "application/json"
-
-  post "/createCategory":
-    createTFD()
-    let formData = request.formData
-
-    let name = formData["name"].body
-    let color = formData["color"].body.replace("#", "")
-    let description = formData["description"].body
-
-    try:
-      let id = executeNewCategory(c, name, color, description)
-      let category = Category(id: id.int, name: name, color: color, description: description)
-      resp Http200, $(%category), "application/json"
-    except ForumError as exc:
+    except ForumError:
+      let exc = (ref ForumError)(getCurrentException())
      resp Http400, $(%exc.data), "application/json"

  get "/status.json":
@ -1175,8 +1061,7 @@ routes:
    except EParseError:
      let err = PostError(
        errorFields: @[],
-        message: "Message needs to be valid RST! Error: " &
-                 getCurrentExceptionMsg()
+        message: getCurrentExceptionMsg()
      )
      resp Http400, $(%err), "application/json"

@ -1240,45 +1125,6 @@ routes:
    except ForumError as exc:
      resp Http400, $(%exc.data), "application/json"

-  post "/updateThread":
-    # TODO: Add some way of keeping track of modifications for historical
-    # purposes
-    createTFD()
-    if not c.loggedIn():
-      let err = PostError(
-        errorFields: @[],
-        message: "Not logged in."
-      )
-      resp Http401, $(%err), "application/json"
-
-    let formData = request.formData
-
-    cond "threadId" in formData
-
-    let threadId = formData["threadId"].body
-
-    # TODO: might want to add more properties here under a tighter permissions
-    # model
-    let keys = ["name", "category", "solution"]
-
-    # optional parameters
-    var
-      queryValues: seq[string] = @[]
-      queryKeys: seq[string] = @[]
-
-    for key in keys:
-      if key in formData:
-        queryKeys.add(key)
-        queryValues.add(formData[key].body)
-
-    if queryKeys.len() > 0:
-      queryValues.add(threadId)
-      try:
-        updateThread(c, threadId, queryKeys, queryValues)
-        resp Http200, "{}", "application/json"
-      except ForumError as exc:
-        resp Http400, $(%exc.data), "application/json"
-
  post "/newthread":
    createTFD()
    if not c.loggedIn():
@ -1291,14 +1137,13 @@ routes:
    let formData = request.formData
    cond "msg" in formData
    cond "subject" in formData
-    cond "categoryId" in formData

    let msg = formData["msg"].body
    let subject = formData["subject"].body
-    let categoryID = formData["categoryId"].body
+    # TODO: category

    try:
-      let res = executeNewThread(c, subject, msg, categoryID)
+      let res = executeNewThread(c, subject, msg)
      resp Http200, $(%[res[0], res[1]]), "application/json"
    except ForumError as exc:
      resp Http400, $(%exc.data), "application/json"
@ -1357,33 +1202,6 @@ routes:
    except ForumError as exc:
      resp Http400, $(%exc.data), "application/json"

-  post re"/(pin|unpin)":
-    createTFD()
-    if not c.loggedIn():
-      let err = PostError(
-        errorFields: @[],
-        message: "Not logged in."
-      )
-      resp Http401, $(%err), "application/json"
-
-    let formData = request.formData
-    cond "id" in formData
-
-    let threadId = getInt(formData["id"].body, -1)
-    cond threadId != -1
-
-    try:
-      case request.path
-      of "/pin":
-        executePinState(c, threadId, true)
-      of "/unpin":
-        executePinState(c, threadId, false)
-      else:
-        assert false
-      resp Http200, "{}", "application/json"
-    except ForumError as exc:
-      resp Http400, $(%exc.data), "application/json"
-
  post re"/delete(Post|Thread)":
    createTFD()
    if not c.loggedIn():
@ -1452,7 +1270,8 @@ routes:
    try:
      await updateProfile(c, username, email, rank)
      resp Http200, "{}", "application/json"
-    except ForumError as exc:
+    except ForumError:
+      let exc = (ref ForumError)(getCurrentException())
      resp Http400, $(%exc.data), "application/json"

  post "/sendResetPassword":
@ -1470,7 +1289,7 @@ routes:
        if "g-recaptcha-response" notin formData:
          let err = PostError(
            errorFields: @[],
-            message: "Not logged in and no recaptcha."
+            message: "Not logged in."
          )
          resp Http401, $(%err), "application/json"

@ -1480,7 +1299,8 @@ routes:
        c, formData["email"].body, recaptcha, request.host
      )
      resp Http200, "{}", "application/json"
-    except ForumError as exc:
+    except ForumError:
+      let exc = (ref ForumError)(getCurrentException())
      resp Http400, $(%exc.data), "application/json"

  post "/resetPassword":
@ -1518,7 +1338,7 @@ routes:
      )
      resp Http200, "{}", "application/json"
    except ForumError as exc:
-      resp Http400, $(%exc.data), "application/json"
+      resp Http400, $(%exc.data),"application/json"

  post "/activateEmail":
    createTFD()
@ -1539,7 +1359,7 @@ routes:
      )
      resp Http200, "{}", "application/json"
    except ForumError as exc:
-      resp Http400, $(%exc.data), "application/json"
+      resp Http400, $(%exc.data),"application/json"

  get "/t/@id":
    cond "id" in request.params
@ -1559,12 +1379,11 @@ routes:
  get "/profile/@username":
    cond "username" in request.params

-    let username = decodeUrl(@"username")
    const threadsQuery =
      sql"""select name from person where name = ? and isDeleted = 0;"""

-    let value = getValue(db, threadsQuery, username)
-    if value == username:
+    let value = getValue(db, threadsQuery, @"username")
+    if value == @"username":
      pass
    else:
      redirect uri("/404")
@ -1580,10 +1399,6 @@ routes:
      }.newStringTable()
    resp content.rstToHtml()

-  get "/about/rst.html":
-    let content = readFile("public/rst.rst")
-    resp content.rstToHtml()
-
  get "/threadActivity.xml":
    createTFD()
    resp genThreadsRSS(c), "application/atom+xml"
@ -1616,7 +1431,7 @@ routes:
          postId: rowFT[2].parseInt(),
          postContent: content,
          creation: rowFT[4].parseInt(),
-          author: selectUser(rowFT[5 .. 11]),
+          author: selectUser(rowFT[5 .. 10]),
        )
      )

@ -1624,4 +1439,4 @@ routes:

  get re"/(.*)":
    cond request.matches[0].splitFile.ext == ""
-    resp karaxHtml
+    resp karaxHtml
--- a/src/frontend/about.nim
+++ b/src/frontend/about.nim
@ -1,11 +1,11 @@
 when defined(js):
-  import sugar, httpcore
+  import sugar, httpcore, options, json
  import dom except Event

  include karax/prelude
-  import karax / [kajax]
+  import karax / [kajax, kdom]

-  import error
+  import error, replybox, threadlist, post
  import karaxutils

  type
--- a/src/frontend/activateemail.nim
+++ b/src/frontend/activateemail.nim
@ -5,7 +5,7 @@ when defined(js):
  include karax/prelude
  import karax / [kajax, kdom]

-  import error
+  import error, replybox, threadlist, post
  import karaxutils

  type
@ -13,12 +13,17 @@ when defined(js):
      loading: bool
      status: HttpCode
      error: Option[PostError]
+      newPassword: kstring

  proc newActivateEmail*(): ActivateEmail =
    ActivateEmail(
-      status: Http200
+      status: Http200,
+      newPassword: ""
    )

+  proc onPassChange(e: Event, n: VNode, state: ActivateEmail) =
+    state.newPassword = n.value
+
  proc onPost(httpStatus: int, response: kstring, state: ActivateEmail) =
    postFinished:
      navigateTo(makeUri("/activateEmail/success"))
--- a/src/frontend/addcategorymodal.nim
+++ b/src/frontend/addcategorymodal.nim
@ -1,87 +0,0 @@
-when defined(js):
-  import sugar, httpcore, options, json, strutils
-  import dom except Event
-  import jsffi except `&`
-
-  include karax/prelude
-  import karax / [kajax, kdom, vdom]
-
-  import error, category
-  import category, karaxutils
-
-  type
-    AddCategoryModal* = ref object of VComponent
-      modalShown: bool
-      loading: bool
-      error: Option[PostError]
-      onAddCategory: CategoryEvent
-
-  let nullCategory: CategoryEvent = proc (category: Category) = discard
-
-  proc newAddCategoryModal*(onAddCategory=nullCategory): AddCategoryModal =
-    result = AddCategoryModal(
-      modalShown: false,
-      loading: false,
-      onAddCategory: onAddCategory
-    )
-
-  proc onAddCategoryPost(httpStatus: int, response: kstring, state: AddCategoryModal) =
-    postFinished:
-      state.modalShown = false
-      let j = parseJson($response)
-      let category = j.to(Category)
-
-      state.onAddCategory(category)
-
-  proc onAddCategoryClick(state: AddCategoryModal) =
-    state.loading = true
-    state.error = none[PostError]()
-
-    let uri = makeUri("createCategory")
-    let form = dom.document.getElementById("add-category-form")
-    let formData = newFormData(form)
-
-    ajaxPost(uri, @[], formData.to(cstring),
-             (s: int, r: kstring) => onAddCategoryPost(s, r, state))
-
-  proc setModalShown*(state: AddCategoryModal, visible: bool) =
-    state.modalShown = visible
-    state.markDirty()
-
-  proc onModalClose(state: AddCategoryModal, ev: Event, n: VNode) =
-    state.setModalShown(false)
-    ev.preventDefault()
-
-  proc render*(state: AddCategoryModal): VNode =
-    result = buildHtml():
-      tdiv(class=class({"active": state.modalShown}, "modal modal-sm")):
-        a(href="", class="modal-overlay", "aria-label"="close",
-          onClick=(ev: Event, n: VNode) => onModalClose(state, ev, n))
-        tdiv(class="modal-container"):
-          tdiv(class="modal-header"):
-            tdiv(class="card-title h5"):
-              text "Add New Category"
-          tdiv(class="modal-body"):
-            form(id="add-category-form"):
-              genFormField(
-                state.error, "name", "Name", "text", false,
-                placeholder="Category Name")
-              genFormField(
-                state.error, "color", "Color", "color", false,
-                placeholder="#XXYYZZ"
-              )
-              genFormField(
-                state.error,
-                "description",
-                "Description",
-                "text",
-                true,
-                placeholder="Description"
-              )
-          tdiv(class="modal-footer"):
-            button(
-              id="add-category-btn",
-              class="btn btn-primary",
-              onClick=(ev: Event, n: VNode) =>
-                    state.onAddCategoryClick()):
-              text "Add"
--- a/src/frontend/category.nim
+++ b/src/frontend/category.nim
@ -5,44 +5,24 @@ type
    name*: string
    description*: string
    color*: string
-    numTopics*: int

-  CategoryList* = ref object
-    categories*: seq[Category]
-
-  CategoryEvent* = proc (category: Category) {.closure.}
-  CategoryChangeEvent* = proc (oldCategory: Category, newCategory: Category) {.closure.}
-
-const categoryDescriptionCharLimit = 250
-
-proc cmpNames*(cat1: Category, cat2: Category): int =
-  cat1.name.cmp(cat2.name)

 when defined(js):
  include karax/prelude
-  import karax / [vstyles]
+  import karax / [vstyles, kajax, kdom]
+
  import karaxutils

-  proc render*(category: Category, compact=true): VNode =
-    if category.name.len == 0:
-      return buildHtml():
-        span()
-
-    result = buildhtml(tdiv):
-      tdiv(class="category-status"):
+  proc render*(category: Category): VNode =
+    result = buildHtml():
+      if category.name.len >= 0:
        tdiv(class="category",
-             title=category.description,
             "data-color"="#" & category.color):
-          tdiv(class="category-color",
+          tdiv(class="triangle",
               style=style(
-                 (StyleAttr.border,
-                  kstring"0.25rem solid #" & category.color)
+                 (StyleAttr.borderBottom,
+                  kstring"0.6rem solid #" & category.color)
          ))
-          span(class="category-name"):
-            text category.name
-          if not compact:
-            span(class="topic-count"):
-              text "× " & $category.numTopics
-      if not compact:
-        tdiv(class="category-description"):
-          text category.description.limit(categoryDescriptionCharLimit)
+          text category.name
+      else:
+        span()
--- a/src/frontend/categorylist.nim
+++ b/src/frontend/categorylist.nim
@ -1,105 +0,0 @@
-import options, json, httpcore
-
-import category
-
-when defined(js):
-  import sugar
-  include karax/prelude
-  import karax / [vstyles, kajax]
-
-  import karaxutils, error, user, mainbuttons, addcategorymodal
-
-  type
-    State = ref object
-      list: Option[CategoryList]
-      loading: bool
-      mainButtons: MainButtons
-      status: HttpCode
-      addCategoryModal: AddCategoryModal
-
-  var state: State
-
-  proc newState(): State =
-    State(
-      list: none[CategoryList](),
-      loading: false,
-      mainButtons: newMainButtons(),
-      status: Http200,
-      addCategoryModal: newAddCategoryModal(
-        onAddCategory=
-          (category: Category) => state.list.get().categories.add(category)
-      )
-    )
-
-  state = newState()
-
-  proc genCategory(category: Category, noBorder = false): VNode =
-    result = buildHtml():
-      tr(class=class({"no-border": noBorder})):
-        td(style=style((StyleAttr.borderLeftColor, kstring("#" & category.color))), class="category"):
-          h4(class="category-title", id="category-" & category.name.slug):
-            a(href=makeUri("/c/" & $category.id)):
-              tdiv():
-                tdiv(class="category-name"):
-                  text category.name
-          tdiv(class="category-description"):
-            text category.description
-        td(class="topics"):
-          text $category.numTopics
-
-  proc onCategoriesRetrieved(httpStatus: int, response: kstring) =
-    state.loading = false
-    state.status = httpStatus.HttpCode
-    if state.status != Http200: return
-
-    let parsed = parseJson($response)
-    let list = to(parsed, CategoryList)
-
-    if state.list.isSome:
-      state.list.get().categories.add(list.categories)
-    else:
-      state.list = some(list)
-
-  proc renderCategoryHeader*(currentUser: Option[User]): VNode =
-    result = buildHtml(tdiv(id="add-category")):
-      text "Category"
-      if currentUser.isAdmin():
-        button(class="plus-btn btn btn-link",
-              onClick=(ev: Event, n: VNode) => (
-                state.addCategoryModal.setModalShown(true)
-              )):
-          italic(class="fas fa-plus")
-        render(state.addCategoryModal)
-
-  proc renderCategories(currentUser: Option[User]): VNode =
-    if state.status != Http200:
-      return renderError("Couldn't retrieve threads.", state.status)
-
-    if state.list.isNone:
-      if not state.loading:
-        state.loading = true
-        ajaxGet(makeUri("categories.json"), @[], onCategoriesRetrieved)
-
-      return buildHtml(tdiv(class="loading loading-lg"))
-
-    let list = state.list.get()
-
-    return buildHtml():
-      section(class="category-list"):
-        table(id="categories-list", class="table"):
-          thead():
-            tr:
-              th:
-                renderCategoryHeader(currentUser)
-              th(text "Topics")
-          tbody():
-            for i in 0 ..< list.categories.len:
-              let category = list.categories[i]
-
-              let isLastCategory = i+1 == list.categories.len
-              genCategory(category, noBorder=isLastCategory)
-
-  proc renderCategoryList*(currentUser: Option[User]): VNode =
-    result = buildHtml(tdiv):
-      state.mainButtons.render(currentUser)
-      renderCategories(currentUser)
--- a/src/frontend/categorypicker.nim
+++ b/src/frontend/categorypicker.nim
@ -1,135 +0,0 @@
-when defined(js):
-  import sugar, httpcore, options, json, strutils, algorithm
-  import dom except Event
-
-  include karax/prelude
-  import karax / [kajax, kdom, vdom]
-
-  import error, category, user
-  import category, karaxutils, addcategorymodal
-
-  type
-    CategoryPicker* = ref object of VComponent
-      list: Option[CategoryList]
-      selectedCategoryID*: int
-      loading: bool
-      addEnabled: bool
-      status: HttpCode
-      error: Option[PostError]
-      addCategoryModal: AddCategoryModal
-      onCategoryChange: CategoryChangeEvent
-      onAddCategory: CategoryEvent
-
-  proc onCategoryLoad(state: CategoryPicker): proc (httpStatus: int, response: kstring) =
-    return
-      proc (httpStatus: int, response: kstring) =
-        state.loading = false
-        state.status = httpStatus.HttpCode
-        if state.status != Http200: return
-
-        let parsed = parseJson($response)
-        let list = parsed.to(CategoryList)
-        list.categories.sort(cmpNames)
-
-        if state.list.isSome:
-          state.list.get().categories.add(list.categories)
-        else:
-          state.list = some(list)
-
-        if state.selectedCategoryID > state.list.get().categories.len():
-          state.selectedCategoryID = 0
-
-  proc loadCategories(state: CategoryPicker) =
-    if not state.loading:
-      state.loading = true
-      ajaxGet(makeUri("categories.json"), @[], onCategoryLoad(state))
-
-  proc `[]`*(state: CategoryPicker, id: int): Category =
-    for cat in state.list.get().categories:
-      if cat.id == id:
-        return cat
-    raise newException(IndexError, "Category at " & $id & " not found!")
-
-  let nullAddCategory: CategoryEvent = proc (category: Category) = discard
-  let nullCategoryChange: CategoryChangeEvent = proc (oldCategory: Category, newCategory: Category) = discard
-
-  proc select*(state: CategoryPicker, id: int) =
-    state.selectedCategoryID = id
-    state.markDirty()
-
-  proc onCategory(state: CategoryPicker): CategoryEvent =
-    result =
-      proc (category: Category) =
-        state.list.get().categories.add(category)
-        state.list.get().categories.sort(cmpNames)
-        state.select(category.id)
-        state.onAddCategory(category)
-
-  proc newCategoryPicker*(onCategoryChange=nullCategoryChange, onAddCategory=nullAddCategory): CategoryPicker =
-    result = CategoryPicker(
-      list: none[CategoryList](),
-      selectedCategoryID: 0,
-      loading: false,
-      addEnabled: false,
-      status: Http200,
-      error: none[PostError](),
-      onCategoryChange: onCategoryChange,
-      onAddCategory: onAddCategory
-    )
-
-    let state = result
-    result.addCategoryModal = newAddCategoryModal(
-      onAddCategory=onCategory(state)
-    )
-
-  proc setAddEnabled*(state: CategoryPicker, enabled: bool) =
-    state.addEnabled = enabled
-
-  proc onCategoryClick(state: CategoryPicker, category: Category): proc (ev: Event, n: VNode) =
-    # this is necessary to capture the right value
-    let cat = category
-    return
-      proc (ev: Event, n: VNode) =
-        let oldCategory = state[state.selectedCategoryID]
-        state.select(cat.id)
-        state.onCategoryChange(oldCategory, cat)
-
-  proc genAddCategory(state: CategoryPicker): VNode =
-    result = buildHtml():
-      tdiv(id="add-category"):
-        button(class="plus-btn btn btn-link",
-               onClick=(ev: Event, n: VNode) => (
-                 state.addCategoryModal.setModalShown(true)
-               )):
-          italic(class="fas fa-plus")
-        render(state.addCategoryModal)
-
-  proc render*(state: CategoryPicker, currentUser: Option[User], compact=true): VNode =
-    state.setAddEnabled(currentUser.isAdmin())
-
-    if state.status != Http200:
-      return renderError("Couldn't retrieve categories.", state.status)
-
-    if state.list.isNone:
-      state.loadCategories()
-      return buildHtml(tdiv(class="loading loading-lg"))
-
-    let list = state.list.get().categories
-    let selectedCategory = state[state.selectedCategoryID]
-
-    result = buildHtml():
-      tdiv(id="category-selection", class="input-group"):
-        tdiv(class="dropdown"):
-          a(class="btn btn-link dropdown-toggle", tabindex="0"):
-            tdiv(class="selected-category d-inline-block"):
-              render(selectedCategory)
-            text " "
-            italic(class="fas fa-caret-down")
-          ul(class="menu"):
-            for category in list:
-              li(class="menu-item"):
-                a(class="category-" & $category.id & " " & category.name.slug,
-                  onClick=onCategoryClick(state, category)):
-                  render(category, compact)
-        if state.addEnabled:
-          genAddCategory(state)
--- a/src/frontend/delete.nim
+++ b/src/frontend/delete.nim
@ -1,7 +1,6 @@
 when defined(js):
  import sugar, httpcore, options, json
  import dom except Event
-  import jsffi except `&`

  include karax/prelude
  import karax / [kajax, kdom]
@ -60,7 +59,7 @@ when defined(js):
      formData.append("id", $state.post.id)
    of DeleteThread:
      formData.append("id", $state.thread.id)
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onDeletePost(s, r, state))

  proc onClose(ev: Event, n: VNode, state: DeleteModal) =
@ -95,7 +94,7 @@ when defined(js):
  proc render*(state: DeleteModal): VNode =
    result = buildHtml():
      tdiv(class=class({"active": state.shown}, "modal modal-sm"),
-           id="delete-modal"):
+           id="login-modal"):
        a(href="", class="modal-overlay", "aria-label"="close",
          onClick=(ev: Event, n: VNode) => onClose(ev, n, state))
        tdiv(class="modal-container"):
@ -123,11 +122,11 @@ when defined(js):

            button(class=class(
                    {"loading": state.loading},
-                    "btn btn-primary delete-btn"
+                    "btn btn-primary"
                   ),
                   onClick=(ev: Event, n: VNode) => onDelete(ev, n, state)):
              italic(class="fas fa-trash-alt")
              text " Delete"
-            button(class="btn cancel-btn",
+            button(class="btn",
                   onClick=(ev: Event, n: VNode) => (state.shown = false)):
-              text "Cancel"
+              text "Cancel"
--- a/src/frontend/editbox.nim
+++ b/src/frontend/editbox.nim
@ -1,6 +1,5 @@
 when defined(js):
  import httpcore, options, sugar, json
-  import jsffi except `&`

  include karax/prelude
  import karax/kajax
@ -55,7 +54,7 @@ when defined(js):
    formData.append("postId", $state.post.id)
    # TODO: Subject
    let uri = makeUri("/updatePost")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onEditPost(s, r, state))

  proc render*(state: EditBox, post: Post): VNode =
@ -88,7 +87,7 @@ when defined(js):
            text state.error.get().message

        tdiv(class="edit-buttons"):
-          tdiv(class="cancel-button"):
+          tdiv(class="reply-button"):
            button(class="btn btn-link",
                   onClick=(e: Event, n: VNode) => (state.onEditCancel())):
              text " Cancel"
@ -96,4 +95,4 @@ when defined(js):
            button(class=class({"loading": state.loading}, "btn btn-primary"),
                   onClick=(e: Event, n: VNode) => state.save()):
              italic(class="fas fa-check")
-              text " Save"
+              text " Save"
--- a/src/frontend/error.nim
+++ b/src/frontend/error.nim
@ -1,12 +1,13 @@
-import httpcore
+import options, httpcore
 type
  PostError* = object
    errorFields*: seq[string] ## IDs of the fields with an error.
    message*: string

 when defined(js):
-  import json, options
+  import json
  include karax/prelude
+  import karax / [vstyles, kajax, kdom]

  import karaxutils

@ -85,8 +86,8 @@ when defined(js):

        state.error = some(error)
      except:
-        echo getCurrentExceptionMsg()
+        kout(getCurrentExceptionMsg().cstring)
        state.error = some(PostError(
          errorFields: @[],
          message: "Unknown error occurred."
-        ))
+        ))
--- a/src/frontend/forum.nim
+++ b/src/frontend/forum.nim
@ -1,18 +1,15 @@
-import options, tables, sugar, httpcore
-from dom import window, Location, document, decodeURI
+import strformat, times, options, json, tables, sugar, httpcore, uri
+from dom import window, Location

 include karax/prelude
-import karax/[kdom]
 import jester/[patterns]

 import threadlist, postlist, header, profile, newthread, error, about
-import categorylist
 import resetpassword, activateemail, search
 import karaxutils

 type
  State = ref object
-    originalTitle: cstring
    url: Location
    profile: ProfileState
    newThread: NewThread
@ -36,7 +33,6 @@ proc copyLocation(loc: Location): Location =

 proc newState(): State =
  State(
-    originalTitle: document.title,
    url: copyLocation(window.location),
    profile: newProfileState(),
    newThread: newNewThread(),
@ -51,8 +47,7 @@ proc onPopState(event: dom.Event) =
  # This event is usually only called when the user moves back in their
  # history. I fire it in karaxutils.anchorCB as well to ensure the URL is
  # always updated. This should be moved into Karax in the future.
-  echo "New URL: ", window.location.href, " ", state.url.href
-  document.title = state.originalTitle
+  kout(kstring"New URL: ", window.location.href, " ", state.url.href)
  if state.url.href != window.location.href:
    state = newState() # Reload the state to remove stale data.
  state.url = copyLocation(window.location)
@ -83,27 +78,13 @@ proc render(): VNode =
  result = buildHtml(tdiv()):
    renderHeader()
    route([
-      r("/categories",
-        (params: Params) =>
-          (renderCategoryList(getLoggedInUser()))
-      ),
-      r("/c/@id",
-        (params: Params) =>
-          (renderThreadList(getLoggedInUser(), some(params["id"].parseInt)))
-      ),
      r("/newthread",
        (params: Params) =>
-          (render(state.newThread, getLoggedInUser()))
+          (render(state.newThread))
      ),
      r("/profile/@username",
        (params: Params) =>
-          (
-            render(
-              state.profile,
-              decodeURI(params["username"]),
-              getLoggedInUser()
-            )
-          )
+          (render(state.profile, params["username"], getLoggedInUser()))
      ),
      r("/t/@id",
        (params: Params) =>
--- a/src/frontend/header.nim
+++ b/src/frontend/header.nim
@ -1,13 +1,12 @@
-import options, httpcore
+import options, times, httpcore, json, sugar

-import user
+import threadlist, user
 type
  UserStatus* = object
    user*: Option[User]
    recaptchaSiteKey*: Option[string]

 when defined(js):
-  import times, json, sugar
  include karax/prelude
  import karax / [kajax, kdom]

@ -32,7 +31,7 @@ when defined(js):
  var
    state = newState()

-  proc getStatus(logout=false)
+  proc getStatus(logout: bool=false)
  proc newState(): State =
    State(
      data: none[UserStatus](),
@ -61,10 +60,10 @@ when defined(js):

    state.lastUpdate = getTime()

-  proc getStatus(logout=false) =
+  proc getStatus(logout: bool=false) =
    if state.loading: return
    let diff = getTime() - state.lastUpdate
-    if diff.inMinutes < 5:
+    if diff.minutes < 5:
      return

    state.loading = true
@ -96,8 +95,8 @@ when defined(js):
          section(class="navbar-section"):
            tdiv(class="input-group input-inline"):
              input(class="search-input input-sm",
-                    `type`="search", placeholder="Search",
-                    id="search-box", required="required",
+                    `type`="text", placeholder="search",
+                    id="search-box",
                    onKeyDown=onKeyDown)
            if state.loading:
              tdiv(class="loading")
@ -114,6 +113,7 @@ when defined(js):
              render(state.userMenu, user.get())

      # Modals
+      render(state.loginModal)
+
      if state.data.isSome():
-        render(state.loginModal, state.data.get().recaptchaSiteKey)
        render(state.signupModal, state.data.get().recaptchaSiteKey)
--- a/src/frontend/karaxutils.nim
+++ b/src/frontend/karaxutils.nim
@ -1,15 +1,4 @@
-import strutils, strformat, parseutils, tables
-
-proc limit*(str: string, n: int): string =
-  ## Limit the number of characters in a string. Ends with a elipsis
-  if str.len > n:
-    return str[0..<n-3] & "..."
-  else:
-    return str
-
-proc slug*(name: string): string =
-  ## Transforms text into a url slug
-  name.strip().replace(" ", "-").toLowerAscii
+import strutils, options, strformat, parseutils, tables

 proc parseIntSafe*(s: string, value: var int) {.noSideEffect.} =
  ## parses `s` into an integer in the range `validRange`. If successful,
@ -36,7 +25,7 @@ proc getInt64*(s: string, default = 0): int64 =

 when defined(js):
  include karax/prelude
-  import karax / [kdom, kajax]
+  import karax / [kdom]

  from dom import nil

@ -88,20 +77,24 @@ when defined(js):
    # Fire the popState event.
    dom.dispatchEvent(dom.window, dom.newEvent("popstate"))

-  proc anchorCB*(e: Event, n: VNode) =
-    let mE = e.MouseEvent
-    if not (mE.metaKey or mE.ctrlKey):
-      e.preventDefault()
+  proc anchorCB*(e: kdom.Event, n: VNode) = # TODO: Why does this need disamb?
+    e.preventDefault()

-      # TODO: Why does Karax have it's own Node type? That's just silly.
-      let url = n.getAttr("href")
+    # TODO: Why does Karax have it's own Node type? That's just silly.
+    let url = n.getAttr("href")

-      navigateTo(url)
+    navigateTo(url)

+  type
+    FormData* = ref object
+  proc newFormData*(): FormData
+    {.importcpp: "new FormData()", constructor.}
  proc newFormData*(form: dom.Element): FormData
    {.importcpp: "new FormData(@)", constructor.}
  proc get*(form: FormData, key: cstring): cstring
    {.importcpp: "#.get(@)".}
+  proc append*(form: FormData, key, val: cstring)
+    {.importcpp: "#.append(@)".}

  proc renderProfileUrl*(username: string): string =
    makeUri(fmt"/profile/{username}")
@ -125,4 +118,4 @@ when defined(js):
      inc(i) # Skip =
      i += query.parseUntil(val, '&', i)
      inc(i) # Skip &
-      result[$decodeUri(key)] = $decodeUri(val)
+      result[$decodeUri(key)] = $decodeUri(val)
--- a/src/frontend/login.nim
+++ b/src/frontend/login.nim
@ -1,7 +1,6 @@
 when defined(js):
  import sugar, httpcore, options, json
-  import dom except Event, KeyboardEvent
-  import jsffi except `&`
+  import dom except Event

  include karax/prelude
  import karax / [kajax, kdom]
@ -31,7 +30,7 @@ when defined(js):
    let form = dom.document.getElementById("login-form")
    # TODO: This is a hack, karax should support this.
    let formData = newFormData(form)
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onLogInPost(s, r, state))

  proc onClose(ev: Event, n: VNode, state: LoginModal) =
@ -54,7 +53,7 @@ when defined(js):
    if event.key == "Enter":
      onLogInClick(e, n, state)

-  proc render*(state: LoginModal, recaptchaSiteKey: Option[string]): VNode =
+  proc render*(state: LoginModal): VNode =
    result = buildHtml(tdiv()):
      tdiv(class=class({"active": state.shown}, "modal modal-sm"),
           id="login-modal"):
@ -94,4 +93,4 @@ when defined(js):
                    (state.onSignUp(); state.shown = false)):
              text "Create account"

-      render(state.resetPasswordModal, recaptchaSiteKey)
+      render(state.resetPasswordModal)
--- a/src/frontend/mainbuttons.nim
+++ b/src/frontend/mainbuttons.nim
@ -1,58 +0,0 @@
-import options
-import user
-
-when defined(js):
-  include karax/prelude
-  import karax / [kdom]
-
-  import karaxutils, user, categorypicker, category
-
-  let buttons = [
-    (name: "Latest", url: makeUri("/"), id: "latest-btn"),
-    (name: "Categories", url: makeUri("/categories"), id: "categories-btn"),
-  ]
-
-  proc onSelectedCategoryChanged(oldCategory: Category, newCategory: Category) =
-    let uri = makeUri("/c/" & $newCategory.id)
-    navigateTo(uri)
-
-  type
-    MainButtons* = ref object
-      categoryPicker: CategoryPicker
-      onCategoryChange*: CategoryChangeEvent
-
-  proc newMainButtons*(onCategoryChange: CategoryChangeEvent = onSelectedCategoryChanged): MainButtons =
-    new result
-    result.onCategoryChange = onCategoryChange
-    result.categoryPicker = newCategoryPicker(
-      onCategoryChange = proc (oldCategory, newCategory: Category) =
-        onSelectedCategoryChanged(oldCategory, newCategory)
-        result.onCategoryChange(oldCategory, newCategory)
-    )
-
-  proc render*(state: MainButtons, currentUser: Option[User], categoryId = none(int)): VNode =
-    result = buildHtml():
-      section(class="navbar container grid-xl", id="main-buttons"):
-        section(class="navbar-section"):
-          #[tdiv(class="dropdown"):
-            a(href="#", class="btn dropdown-toggle"):
-              text "Filter "
-              italic(class="fas fa-caret-down")
-            ul(class="menu"):
-              li: text "community"
-              li: text "dev" ]#
-          if categoryId.isSome:
-            state.categoryPicker.selectedCategoryID = categoryId.get()
-            render(state.categoryPicker, currentUser, compact=false)
-
-          for btn in buttons:
-            let active = btn.url == window.location.href
-            a(id=btn.id, href=btn.url):
-              button(class=class({"btn-primary": active, "btn-link": not active}, "btn")):
-                text btn.name
-        section(class="navbar-section"):
-          if currentUser.isSome():
-            a(id="new-thread-btn", href=makeUri("/newthread"), onClick=anchorCB):
-              button(class="btn btn-secondary"):
-                italic(class="fas fa-plus")
-                text " New Thread"
--- a/src/frontend/newthread.nim
+++ b/src/frontend/newthread.nim
@ -1,13 +1,12 @@
 when defined(js):
  import sugar, httpcore, options, json
  import dom except Event
-  import jsffi except `&`

  include karax/prelude
  import karax / [kajax, kdom]

-  import error, replybox, threadlist, post, user
-  import karaxutils, categorypicker
+  import error, replybox, threadlist, post
+  import karaxutils

  type
    NewThread* = ref object
@ -15,13 +14,11 @@ when defined(js):
      error: Option[PostError]
      replyBox: ReplyBox
      subject: kstring
-      categoryPicker: CategoryPicker

  proc newNewThread*(): NewThread =
    NewThread(
      replyBox: newReplyBox(nil),
-      subject: "",
-      categoryPicker: newCategoryPicker()
+      subject: ""
    )

  proc onSubjectChange(e: Event, n: VNode, state: NewThread) =
@ -40,40 +37,31 @@ when defined(js):
    let uri = makeUri("newthread")
    # TODO: This is a hack, karax should support this.
    let formData = newFormData()
-    let categoryID = state.categoryPicker.selectedCategoryID
-
    formData.append("subject", state.subject)
    formData.append("msg", state.replyBox.getText())
-    formData.append("categoryId", $categoryID)
-
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onCreatePost(s, r, state))

-  proc render*(state: NewThread, currentUser: Option[User]): VNode =
+  proc render*(state: NewThread): VNode =
    result = buildHtml():
      section(class="container grid-xl"):
        tdiv(id="new-thread"):
          tdiv(class="title"):
            p(): text "New Thread"
          tdiv(class="content"):
-            input(id="thread-title", class="form-input", `type`="text", name="subject",
+            input(class="form-input", `type`="text", name="subject",
                  placeholder="Type the title here",
                  oninput=(e: Event, n: VNode) => onSubjectChange(e, n, state))
            if state.error.isSome():
              p(class="text-error"):
                text state.error.get().message
-            tdiv():
-              label(class="d-inline-block form-label"):
-                text "Category"
-              render(state.categoryPicker, currentUser, compact=false)
            renderContent(state.replyBox, none[Thread](), none[Post]())
          tdiv(class="footer"):

-            button(id="create-thread-btn",
-                   class=class(
-                     {"loading": state.loading},
-                     "btn btn-primary"
+            button(class=class(
+                    {"loading": state.loading},
+                    "btn btn-primary"
                   ),
                   onClick=(ev: Event, n: VNode) =>
                    (onCreateClick(ev, n, state))):
-              text "Create thread"
+              text "Create thread"
--- a/src/frontend/post.nim
+++ b/src/frontend/post.nim
@ -1,6 +1,6 @@
-import options
+import strformat, options

-import user
+import user, threadlist

 type
  PostInfo* = object
@ -32,8 +32,7 @@ proc lastEdit*(post: Post): PostInfo =
  post.history[^1]

 proc isModerated*(post: Post): bool =
-  ## Determines whether the specified post is under moderation
-  ## (i.e. whether the post is invisible to ordinary users).
+  ## Determines whether the specified thread is under moderation.
  post.author.rank <= Moderated

 proc isLikedBy*(post: Post, user: Option[User]): bool =
@ -58,10 +57,10 @@ type
    email*: Option[string]

 when defined(js):
-  import karaxutils, threadlist
+  import karaxutils

  proc renderPostUrl*(post: Post, thread: Thread): string =
    renderPostUrl(thread.id, post.id)

  proc renderPostUrl*(link: PostLink): string =
-    renderPostUrl(link.threadId, link.postId)
+    renderPostUrl(link.threadId, link.postId)
--- a/src/frontend/postbutton.nim
+++ b/src/frontend/postbutton.nim
@ -3,11 +3,10 @@
 ##
 ## Used for password reset emails.

-import options, httpcore, json, sugar, sequtils, strutils
+import options, httpcore, json, sugar
 when defined(js):
  include karax/prelude
  import karax/[kajax, kdom]
-  import jsffi except `&`

  import error, karaxutils, post, user, threadlist

@ -117,7 +116,7 @@ when defined(js):
        makeUri("/unlike")
      else:
        makeUri("/like")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) =>
                onPost(s, r, state, post, currentUser.get()))

@ -140,8 +139,7 @@ when defined(js):
               onmouseleave=(e: Event, n: VNode) =>
                  (state.error = none[PostError]())):
          if post.likes.len > 0:
-            let names = post.likes.map(x => x.name).join(", ")
-            span(class="like-count tooltip", "data-tooltip"=names):
+            span(class="like-count"):
              text $post.likes.len

          italic(class=class({"far": not liked, "fas": liked}, "fa-heart"))
@ -173,7 +171,7 @@ when defined(js):
        makeUri("/unlock")
      else:
        makeUri("/lock")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) =>
                onPost(s, r, state, thread))

@ -190,7 +188,7 @@ when defined(js):
      else: ""

    result = buildHtml():
-      button(class="btn btn-secondary", id="lock-btn",
+      button(class="btn btn-secondary",
           onClick=(e: Event, n: VNode) =>
              onLockClick(e, n, state, thread),
           "data-tooltip"=tooltip,
@ -201,61 +199,4 @@ when defined(js):
          text " Unlock Thread"
        else:
          italic(class="fas fa-lock")
-          text " Lock Thread"
-
-  type
-    PinButton* = ref object
-      error: Option[PostError]
-      loading: bool
-
-  proc newPinButton*(): PinButton =
-    PinButton()
-
-  proc onPost(httpStatus: int, response: kstring, state: PinButton,
-              thread: var Thread) =
-    postFinished:
-      thread.isPinned = not thread.isPinned
-
-  proc onPinClick(ev: Event, n: VNode, state: PinButton, thread: var Thread) =
-    if state.loading: return
-
-    state.loading = true
-    state.error = none[PostError]()
-
-    # Same as LockButton so the following is still a hack and karax should support this.
-    var formData = newFormData()
-    formData.append("id", $thread.id)
-    let uri =
-      if thread.isPinned:
-        makeUri("/unpin")
-      else:
-        makeUri("/pin")
-    ajaxPost(uri, @[], formData.to(cstring),
-              (s: int, r: kstring) => onPost(s, r, state, thread))
- 
-    ev.preventDefault()
-
-  proc render*(state: PinButton, thread: var Thread,
-              currentUser: Option[User]): VNode =
-    if currentUser.isNone() or
-       currentUser.get().rank < Moderator:
-      return buildHtml(tdiv())
-
-    let tooltip =
-      if state.error.isSome(): state.error.get().message
-      else: ""
-
-    result = buildHtml():
-      button(class="btn btn-secondary", id="pin-btn",
-           onClick=(e: Event, n: VNode) =>
-              onPinClick(e, n, state, thread),
-           "data-tooltip"=tooltip,
-           onmouseleave=(e: Event, n: VNode) =>
-            (state.error = none[PostError]())):
-        if thread.isPinned:
-          italic(class="fas fa-thumbtack")
-          text " Unpin Thread"
-        else:
-          italic(class="fas fa-thumbtack")
-          text " Pin Thread"
-
+          text " Lock Thread"
--- a/src/frontend/postlist.nim
+++ b/src/frontend/postlist.nim
@ -1,6 +1,6 @@

 import system except Thread
-import options, json, times, httpcore, sugar, strutils
+import options, json, times, httpcore, strformat, sugar, math, strutils
 import sequtils

 import threadlist, category, post, user
@ -14,21 +14,18 @@ type
    posts*: seq[Post]

 when defined(js):
-  from dom import document
-  import jsffi except `&`
+  from dom import nil

  include karax/prelude
-  import karax / [kajax, kdom]
+  import karax / [vstyles, kajax, kdom]

  import karaxutils, error, replybox, editbox, postbutton, delete
-  import categorypicker

  type
    State = ref object
      list: Option[PostList]
      loading: bool
      status: HttpCode
-      error: Option[PostError]
      replyingTo: Option[Post]
      replyBox: ReplyBox
      editing: Option[Post] ## If in edit mode, this contains the post.
@ -36,11 +33,8 @@ when defined(js):
      likeButton: LikeButton
      deleteModal: DeleteModal
      lockButton: LockButton
-      pinButton: PinButton
-      categoryPicker: CategoryPicker

  proc onReplyPosted(id: int)
-  proc onCategoryChanged(oldCategory: Category, newCategory: Category)
  proc onEditPosted(id: int, content: string, subject: Option[string])
  proc onEditCancelled()
  proc onDeletePost(post: Post)
@ -50,38 +44,17 @@ when defined(js):
      list: none[PostList](),
      loading: false,
      status: Http200,
-      error: none[PostError](),
      replyingTo: none[Post](),
      replyBox: newReplyBox(onReplyPosted),
      editBox: newEditBox(onEditPosted, onEditCancelled),
      likeButton: newLikeButton(),
      deleteModal: newDeleteModal(onDeletePost, onDeleteThread, nil),
-      lockButton: newLockButton(),
-      pinButton: newPinButton(),
-      categoryPicker: newCategoryPicker(onCategoryChanged)
+      lockButton: newLockButton()
    )

  var
    state = newState()

-  proc onCategoryPost(httpStatus: int, response: kstring, state: State) =
-    state.loading = false
-    postFinished:
-      discard
-      # TODO: show success message
-
-  proc onCategoryChanged(oldCategory: Category, newCategory: Category) =
-    let uri = makeUri("/updateThread")
-
-    let formData = newFormData()
-    formData.append("threadId", $state.list.get().thread.id)
-    formData.append("category", $newCategory.id)
-
-    state.loading = true
-
-    ajaxPost(uri, @[], formData.to(cstring),
-             (s: int, r: kstring) => onCategoryPost(s, r, state))
-
  proc onPostList(httpStatus: int, response: kstring, postId: Option[int]) =
    state.loading = false
    state.status = httpStatus.HttpCode
@ -92,9 +65,6 @@ when defined(js):

    state.list = some(list)

-    dom.document.title = list.thread.topic & " - " & dom.document.title
-    state.categoryPicker.select(list.thread.category.id)
-
    # The anchor should be jumped to once all the posts have been loaded.
    if postId.isSome():
      discard setTimeout(
@ -207,20 +177,6 @@ when defined(js):
              span(class="more-post-count"):
                text "(" & $post.moreBefore.len & ")"

-  proc genCategories(thread: Thread, currentUser: Option[User]): VNode =
-    let loggedIn = currentUser.isSome()
-    let authoredByUser =
-      loggedIn and currentUser.get().name == thread.author.name
-    let canChangeCategory =
-      loggedIn and currentUser.get().rank in {Admin, Moderator}
-
-    result = buildHtml():
-      tdiv():
-        if authoredByUser or canChangeCategory:
-          render(state.categoryPicker, currentUser, compact=false)
-        else:
-          render(thread.category)
-
  proc genPostButtons(post: Post, currentUser: Option[User]): Vnode =
    let loggedIn = currentUser.isSome()
    let authoredByUser =
@ -262,11 +218,8 @@ when defined(js):
  ): VNode =
    let postCopy = post # TODO: Another workaround here, closure capture :(

-    let originalPost = thread.author == post.author
-
    result = buildHtml():
-      tdiv(class=class({"highlight": highlight, "original-post": originalPost}, "post"),
-           id = $post.id):
+      tdiv(class=class({"highlight": highlight}, "post"), id = $post.id):
        tdiv(class="post-icon"):
          render(post.author, "post-avatar")
        tdiv(class="post-main"):
@ -328,12 +281,12 @@ when defined(js):
        ]
    var diffStr = tmpl[0]
    let diff = latestTime - prevPost.info.creation.fromUnix()
-    if diff.inWeeks > 48:
-      let years = diff.inWeeks div 48
+    if diff.weeks > 48:
+      let years = diff.weeks div 48
      diffStr =
        (if years == 1: tmpl[1] else: tmpl[2]) % $years
-    elif diff.inWeeks > 4:
-      let months = diff.inWeeks div 4
+    elif diff.weeks > 4:
+      let months = diff.weeks div 4
      diffStr =
        (if months == 1: tmpl[3] else: tmpl[4]) % $months
    else:
@ -362,20 +315,15 @@ when defined(js):
      if postId.isSome():
        params.add(("anchor", $postId.get()))
      let uri = makeUri("posts.json", params)
-      if not state.loading:
-        state.loading = true
-        ajaxGet(uri, @[], (s: int, r: kstring) => onPostList(s, r, postId))
+      ajaxGet(uri, @[], (s: int, r: kstring) => onPostList(s, r, postId))

      return buildHtml(tdiv(class="loading loading-lg"))

    let list = state.list.get()
    result = buildHtml():
      section(class="container grid-xl"):
-        tdiv(id="thread-title", class="title"):
-          if state.error.isSome():
-            span(class="text-error"):
-              text state.error.get().message
-          p(class="title-text"): text list.thread.topic
+        tdiv(class="title"):
+          p(): text list.thread.topic
          if list.thread.isLocked:
            italic(class="fas fa-lock fa-xs",
                   title="Thread cannot be replied to")
@ -388,7 +336,7 @@ when defined(js):
            italic(class="fas fa-check-square fa-xs",
                   title="Thread has a solution")
            text "Solved"
-          genCategories(list.thread, currentUser)
+          render(list.thread.category)
        tdiv(class="posts"):
          var prevPost: Option[Post] = none[Post]()
          for i, post in list.posts:
@ -413,8 +361,7 @@ when defined(js):
              text " Reply"

            render(state.lockButton, list.thread, currentUser)
-            render(state.pinButton, list.thread, currentUser)

          render(state.replyBox, list.thread, state.replyingTo, false)

-          render(state.deleteModal)
+          render(state.deleteModal)
--- a/src/frontend/profile.nim
+++ b/src/frontend/profile.nim
@ -1,12 +1,11 @@
-import options, httpcore, json, sugar, times, strutils
+import options, httpcore, json, sugar, times, strformat, strutils

-import threadlist, post, error, user
+import threadlist, post, category, error, user

 when defined(js):
-  from dom import document
  include karax/prelude
  import karax/[kajax, kdom]
-  import karaxutils, profilesettings
+  import karaxutils, postbutton, delete, profilesettings

  type
    ProfileTab* = enum
@ -38,8 +37,6 @@ when defined(js):
    state.profile = some(profile)
    state.settings = some(newProfileSettings(profile))

-    dom.document.title = profile.user.name & " - " & dom.document.title
-
  proc genPostLink(link: PostLink): VNode =
    let url = renderPostUrl(link)
    result = buildHtml():
@ -56,10 +53,9 @@ when defined(js):

  proc render*(
    state: ProfileState,
-    username: kstring,
+    username: string,
    currentUser: Option[User]
  ): VNode =
-
    if state.profile.isSome() and state.profile.get().user.name != username:
      state.profile = none[Profile]()
      state.status = Http200
@ -68,10 +64,8 @@ when defined(js):
      return renderError("Couldn't retrieve profile.", state.status)

    if state.profile.isNone:
-      if not state.loading:
-        state.loading = true
-        let uri = makeUri("profile.json", ("username", $username))
-        ajaxGet(uri, @[], (s: int, r: kstring) => onProfile(s, r, state))
+      let uri = makeUri("profile.json", ("username", username))
+      ajaxGet(uri, @[], (s: int, r: kstring) => onProfile(s, r, state))

      return buildHtml(tdiv(class="loading loading-lg"))

@ -119,7 +113,7 @@ when defined(js):
                 ),
                 onClick=(e: Event, n: VNode) => (state.currentTab = Overview)
                ):
-                a(id="overview-tab", class="c-hand"):
+                a(class="c-hand"):
                  text "Overview"
              li(class=class(
                  {"active": state.currentTab == Settings},
@ -127,7 +121,7 @@ when defined(js):
                 ),
                 onClick=(e: Event, n: VNode) => (state.currentTab = Settings)
                ):
-                a(id="settings-tab", class="c-hand"):
+                a(class="c-hand"):
                  italic(class="fas fa-cog")
                  text " Settings"

@ -147,4 +141,4 @@ when defined(js):
                    genPostLink(thread)
        of Settings:
          if state.settings.isSome():
-            render(state.settings.get(), currentUser)
+            render(state.settings.get(), currentUser)
--- a/src/frontend/profilesettings.nim
+++ b/src/frontend/profilesettings.nim
@ -1,11 +1,10 @@
 when defined(js):
  import httpcore, options, sugar, json, strutils, strformat
-  import jsffi except `&`

  include karax/prelude
  import karax/[kajax, kdom]

-  import post, karaxutils, postbutton, error, delete, user
+  import replybox, post, karaxutils, postbutton, error, delete, user

  type
    ProfileSettings* = ref object
@ -69,7 +68,7 @@ when defined(js):
    formData.append("rank", $state.rank)
    formData.append("username", $state.profile.user.name)
    let uri = makeUri("/saveProfile")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onProfilePost(s, r, state))

  proc needsSave(state: ProfileSettings): bool =
@ -89,7 +88,7 @@ when defined(js):
               class="form-select", value = $state.rank,
               onchange=(e: Event, n: VNode) => onRankChange(e, n, state)):
          for r in Rank:
-            option(text $r, id="rank-" & toLowerAscii($r))
+            option(text $r)
        p(class="form-input-hint text-warning"):
          text "You can modify anyone's rank. Remember: with " &
               "great power comes great responsibility."
@ -166,8 +165,7 @@ when defined(js):
                label(class="form-label"):
                  text "Account"
              tdiv(class="col-9 col-sm-12"):
-                button(id="delete-account-btn",
-                       class="btn btn-secondary", `type`="button",
+                button(class="btn btn-secondary", `type`="button",
                       onClick=(e: Event, n: VNode) =>
                       (state.deleteModal.show(state.profile.user))):
                  italic(class="fas fa-times")
@ -178,19 +176,16 @@ when defined(js):
              span(class="text-error"):
                text state.error.get().message

-            button(id="cancel-btn",
-                   class=class(
+            button(class=class(
                    {"disabled": not needsSave(state)}, "btn btn-link"
                   ),
                   onClick=(e: Event, n: VNode) => (resetSettings(state))):
              text "Cancel"

-            button(id="save-btn",
-                   class=class(
+            button(class=class(
                    {"disabled": not needsSave(state)}, "btn btn-primary"
                   ),
-                   onClick=(e: Event, n: VNode) => save(state),
-                   id="save-btn"):
+                   onClick=(e: Event, n: VNode) => save(state)):
              italic(class="fas fa-save")
              text " Save"

@ -203,4 +198,4 @@ when defined(js):
      rankField.setInputText($state.rank)
    let emailField = getVNodeById("email-field")
    if not emailField.isNil:
-      emailField.setInputText($state.email)
+      emailField.setInputText($state.email)
--- a/src/frontend/replybox.nim
+++ b/src/frontend/replybox.nim
@ -1,6 +1,5 @@
 when defined(js):
  import strformat, options, httpcore, json, sugar
-  import jsffi except `&`

  from dom import getElementById, scrollIntoView, setTimeout

@ -27,7 +26,7 @@ when defined(js):

  proc performScroll() =
    let replyBox = dom.document.getElementById("reply-box")
-    replyBox.scrollIntoView()
+    replyBox.scrollIntoView(false)

  proc show*(state: ReplyBox) =
    # Scroll to the reply box.
@ -45,7 +44,7 @@ when defined(js):

  proc onPreviewPost(httpStatus: int, response: kstring, state: ReplyBox) =
    postFinished:
-      echo response
+      kout(response)
      state.rendering = some[kstring](response)

  proc onPreviewClick(e: Event, n: VNode, state: ReplyBox) =
@ -57,7 +56,7 @@ when defined(js):
    let formData = newFormData()
    formData.append("msg", state.text)
    let uri = makeUri("/preview")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onPreviewPost(s, r, state))

  proc onMessageClick(e: Event, n: VNode, state: ReplyBox) =
@ -81,7 +80,7 @@ when defined(js):
    if replyingTo.isSome:
      formData.append("replyingTo", $replyingTo.get().id)
    let uri = makeUri("/createPost")
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onReplyPost(s, r, state))

  proc onCancelClick(e: Event, n: VNode, state: ReplyBox) =
@ -89,8 +88,9 @@ when defined(js):
    state.shown = false

  proc onChange(e: Event, n: VNode, state: ReplyBox) =
-    # TODO: Please document this better in Karax.
-    state.text = n.value
+    # TODO: There should be a karax-way to do this. I guess I can just call
+    # `value` on the node? We need to document this better :)
+    state.text = cast[dom.TextAreaElement](n.dom).value

  proc renderContent*(state: ReplyBox, thread: Option[Thread],
                      post: Option[Post]): VNode =
@ -115,13 +115,10 @@ when defined(js):
            elif state.rendering.isSome():
              verbatim(state.rendering.get())
          else:
-            textarea(id="reply-textarea",
-                     class="form-input post-text-area", rows="5",
+            textarea(class="form-input post-text-area", rows="5",
                     onChange=(e: Event, n: VNode) =>
                        onChange(e, n, state),
                     value=state.text)
-            a(href=makeUri("/about/rst"), target="blank_"):
-              text "Styling with RST is supported"

          if state.error.isSome():
            span(class="text-error",
@ -164,4 +161,4 @@ when defined(js):
                  button(class="btn"):
                    italic(class="fas fa-arrow-up")
          tdiv(class="information-content"):
-            renderContent(state, some(thread), post)
+            renderContent(state, some(thread), post)
--- a/src/frontend/resetpassword.nim
+++ b/src/frontend/resetpassword.nim
@ -1,12 +1,11 @@
 when defined(js):
  import sugar, httpcore, options, json
-  import dom except Event, KeyboardEvent
-  import jsffi except `&`
+  import dom except Event

  include karax/prelude
  import karax / [kajax, kdom]

-  import error
+  import error, replybox, threadlist, post
  import karaxutils

  type
@ -87,11 +86,9 @@ when defined(js):
    let form = dom.document.getElementById("resetpassword-form")
    # TODO: This is a hack, karax should support this.
    let formData = newFormData(form)
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onPost(s, r, state))

-    ev.preventDefault()
-
  proc onClose(ev: Event, n: VNode, state: ResetPasswordModal) =
    state.shown = false
    ev.preventDefault()
@ -109,8 +106,7 @@ when defined(js):
    if event.key == "Enter":
      onClick(e, n, state)

-  proc render*(state: ResetPasswordModal,
-               recaptchaSiteKey: Option[string]): VNode =
+  proc render*(state: ResetPasswordModal): VNode =
    result = buildHtml():
      tdiv(class=class({"active": state.shown}, "modal"),
           id="resetpassword-modal"):
@ -136,11 +132,6 @@ when defined(js):
                  true,
                  placeholder="Username or email"
                )
-                if recaptchaSiteKey.isSome:
-                  tdiv(id="recaptcha"):
-                    tdiv(class="g-recaptcha",
-                         "data-sitekey"=recaptchaSiteKey.get())
-                    script(src="https://www.google.com/recaptcha/api.js")
          tdiv(class="modal-footer"):
            if state.sent:
              span(class="text-success"):
@ -151,6 +142,5 @@ when defined(js):
                      {"loading": state.loading},
                      "btn btn-primary"
                     ),
-                     `type`="button",
                     onClick=(ev: Event, n: VNode) => onClick(ev, n, state)):
-                text "Reset password"
+                text "Reset password"
--- a/src/frontend/search.nim
+++ b/src/frontend/search.nim
@ -20,7 +20,7 @@ when defined(js):
  from dom import nil

  include karax/prelude
-  import karax / [kajax]
+  import karax / [vstyles, kajax, kdom]

  import karaxutils, error, threadlist, sugar

--- a/src/frontend/signup.nim
+++ b/src/frontend/signup.nim
@ -1,7 +1,6 @@
 when defined(js):
  import sugar, httpcore, options, json
  import dom except Event
-  import jsffi except `&`

  include karax/prelude
  import karax / [kajax, kdom]
@ -29,7 +28,7 @@ when defined(js):
    let form = dom.document.getElementById("signup-form")
    # TODO: This is a hack, karax should support this.
    let formData = newFormData(form)
-    ajaxPost(uri, @[], formData.to(cstring),
+    ajaxPost(uri, @[], cast[cstring](formData),
             (s: int, r: kstring) => onSignUpPost(s, r, state))

  proc onClose(ev: Event, n: VNode, state: SignupModal) =
@ -79,19 +78,18 @@ when defined(js):
                         "data-sitekey"=recaptchaSiteKey.get())
                    script(src="https://www.google.com/recaptcha/api.js")
          tdiv(class="modal-footer"):
-            button(class=class({"loading": state.loading},
-                               "btn btn-primary create-account-btn"),
-                   onClick=(ev: Event, n: VNode) => onSignUpClick(ev, n, state)):
+            button(class=class({"loading": state.loading}, "btn btn-primary"),
+                  onClick=(ev: Event, n: VNode) => onSignUpClick(ev, n, state)):
              text "Create account"
-            button(class="btn login-btn",
+            button(class="btn",
                   onClick=(ev: Event, n: VNode) =>
                    (state.onLogIn(); state.shown = false)):
              text "Log in"

            p(class="license-text text-gray"):
              text "By registering, you agree to the "
-              a(id="license", href=makeUri("/about/license"),
+              a(href=makeUri("/about/license"),
                onClick=(ev: Event, n: VNode) =>
                    (state.shown = false; anchorCB(ev, n))):
                text "content license"
-              text "."
+              text "."
--- a/src/frontend/threadlist.nim
+++ b/src/frontend/threadlist.nim
@ -15,7 +15,6 @@ type
    creation*: int64 ## Unix timestamp
    isLocked*: bool
    isSolved*: bool
-    isPinned*: bool

  ThreadList* = ref object
    threads*: seq[Thread]
@ -23,38 +22,29 @@ type

 proc isModerated*(thread: Thread): bool =
  ## Determines whether the specified thread is under moderation.
-  ## (i.e. whether the specified thread is invisible to ordinary users).
  thread.author.rank <= Moderated

 when defined(js):
-  import sugar
  include karax/prelude
  import karax / [vstyles, kajax, kdom]

-  import karaxutils, error, user, mainbuttons
+  import karaxutils, error, user

  type
    State = ref object
      list: Option[ThreadList]
-      refreshList: bool
      loading: bool
      status: HttpCode
-      mainButtons: MainButtons
-
-  var state: State

  proc newState(): State =
    State(
      list: none[ThreadList](),
      loading: false,
-      status: Http200,
-      mainButtons: newMainButtons(
-        onCategoryChange =
-          (oldCategory: Category, newCategory: Category) => (state.list = none[ThreadList]())
-      )
+      status: Http200
    )

-  state = newState()
+  var
+    state = newState()

  proc visibleTo*[T](thread: T, user: Option[User]): bool =
    ## Determines whether the specified thread (or post) should be
@ -63,19 +53,38 @@ when defined(js):
    ##
    ## The rules for this are determined by the rank of the user, their
    ## settings (TODO), and whether the thread's creator is moderated or not.
-    ##
-    ## The ``user`` argument refers to the currently logged in user.
    mixin isModerated
    if user.isNone(): return not thread.isModerated

    let rank = user.get().rank
-    if rank < Rank.Moderator and thread.isModerated:
+    if rank < Moderator and thread.isModerated:
      return thread.author == user.get()

    return true

+  proc genTopButtons(currentUser: Option[User]): VNode =
+    result = buildHtml():
+      section(class="navbar container grid-xl", id="main-buttons"):
+        section(class="navbar-section"):
+          tdiv(class="dropdown"):
+            a(href="#", class="btn dropdown-toggle"):
+              text "Filter "
+              italic(class="fas fa-caret-down")
+            ul(class="menu"):
+              li: text "community"
+              li: text "dev"
+          button(class="btn btn-primary"): text "Latest"
+          button(class="btn btn-link"): text "Most Active"
+          button(class="btn btn-link"): text "Categories"
+        section(class="navbar-section"):
+          if currentUser.isSome():
+            a(href=makeUri("/newthread"), onClick=anchorCB):
+              button(class="btn btn-secondary"):
+                italic(class="fas fa-plus")
+                text " New Thread"
+
  proc genUserAvatars(users: seq[User]): VNode =
-    result = buildHtml(td(class="thread-users")):
+    result = buildHtml(td):
      for user in users:
        render(user, "avatar avatar-sm", showStatus=true)
        text " "
@ -86,48 +95,44 @@ when defined(js):
    let duration = currentTime - activityTime
    if currentTime.local().year != activityTime.local().year:
      return activityTime.local().format("MMM yyyy")
-    elif duration.inDays > 30 and duration.inDays < 300:
+    elif duration.days > 30 and duration.days < 300:
      return activityTime.local().format("MMM dd")
-    elif duration.inDays != 0:
-      return $duration.inDays & "d"
-    elif duration.inHours != 0:
-      return $duration.inHours & "h"
-    elif duration.inMinutes != 0:
-      return $duration.inMinutes & "m"
+    elif duration.days != 0:
+      return $duration.days & "d"
+    elif duration.hours != 0:
+      return $duration.hours & "h"
+    elif duration.minutes != 0:
+      return $duration.minutes & "m"
    else:
-      return $duration.inSeconds & "s"
+      return $duration.seconds & "s"

-  proc genThread(pos: int, thread: Thread, isNew: bool, noBorder: bool, displayCategory=true): VNode =
-    let isOld = (getTime() - thread.creation.fromUnix).inWeeks > 2
-    let isBanned = thread.author.rank.isBanned()
+  proc genThread(thread: Thread, isNew: bool, noBorder: bool): VNode =
+    let isOld = (getTime() - thread.creation.fromUnix).weeks > 2
+    let isBanned = thread.author.rank < Moderated
    result = buildHtml():
-      tr(class=class({"no-border": noBorder, "banned": isBanned, "pinned": thread.isPinned, "thread-" & $pos: true})):
+      tr(class=class({"no-border": noBorder, "banned": isBanned})):
        td(class="thread-title"):
          if thread.isLocked:
            italic(class="fas fa-lock fa-xs",
                   title="Thread cannot be replied to")
-          if thread.isPinned:
-            italic(class="fas fa-thumbtack fa-xs", 
-                   title="Pinned post")
-          if isBanned:
-            italic(class="fas fa-ban fa-xs",
-                   title="Thread author is banned")
          if thread.isModerated:
-            italic(class="fas fa-eye-slash fa-xs",
-                   title="Thread is moderated")
+            if isBanned:
+              italic(class="fas fa-ban fa-xs",
+                     title="Thread author is banned")
+            else:
+              italic(class="fas fa-eye-slash fa-xs",
+                     title="Thread is moderated")
          if thread.isSolved:
            italic(class="fas fa-check-square fa-xs",
                   title="Thread has a solution")
-          a(href=makeUri("/t/" & $thread.id), onClick=anchorCB):
+          a(href=makeUri("/t/" & $thread.id),
+            onClick=anchorCB):
            text thread.topic
-          tdiv(class="show-sm" & class({"d-none": not displayCategory})):
-            render(thread.category)
-
-        td(class="hide-sm" & class({"d-none": not displayCategory})):
+        td():
          render(thread.category)
        genUserAvatars(thread.users)
-        td(class="thread-replies"): text $thread.replies
-        td(class="hide-sm" & class({
+        td(): text $thread.replies
+        td(class=class({
            "views-text": thread.views < 999,
            "popular-text": thread.views > 999 and thread.views < 5000,
            "super-popular-text": thread.views > 5000
@ -161,13 +166,10 @@ when defined(js):
    else:
      state.list = some(list)

-  proc onLoadMore(ev: Event, n: VNode, categoryId: Option[int]) =
+  proc onLoadMore(ev: Event, n: VNode) =
    state.loading = true
    let start = state.list.get().threads.len
-    if categoryId.isSome:
-      ajaxGet(makeUri("threads.json?start=" & $start & "&categoryId=" & $categoryId.get()), @[], onThreadList)
-    else:
-      ajaxGet(makeUri("threads.json?start=" & $start), @[], onThreadList)
+    ajaxGet(makeUri("threads.json?start=" & $start), @[], onThreadList)

  proc getInfo(
    list: seq[Thread], i: int, currentUser: Option[User]
@ -192,34 +194,29 @@ when defined(js):
      isNew: thread.creation > previousVisitAt
    )

-  proc genThreadList(currentUser: Option[User], categoryId: Option[int]): VNode =
+  proc genThreadList(currentUser: Option[User]): VNode =
    if state.status != Http200:
      return renderError("Couldn't retrieve threads.", state.status)

    if state.list.isNone:
      if not state.loading:
        state.loading = true
-        if categoryId.isSome:
-          ajaxGet(makeUri("threads.json?categoryId=" & $categoryId.get()), @[], onThreadList)
-        else:
-          ajaxGet(makeUri("threads.json"), @[], onThreadList)
+        ajaxGet(makeUri("threads.json"), @[], onThreadList)

      return buildHtml(tdiv(class="loading loading-lg"))

-    let displayCategory = categoryId.isNone
-
    let list = state.list.get()
    result = buildHtml():
-      section(class="thread-list"):
+      section(class="container grid-xl"): # TODO: Rename to `.thread-list`.
        table(class="table", id="threads-list"):
          thead():
            tr:
              th(text "Topic")
-              th(class="hide-sm" & class({"d-none": not displayCategory})): text "Category"
-              th(class="thread-users"): text "Users"
-              th(class="centered-header"): text "Replies"
-              th(class="hide-sm centered-header"): text "Views"
-              th(class="centered-header"): text "Activity"
+              th(text "Category")
+              th(style=style((StyleAttr.width, kstring"8rem"))): text "Users"
+              th(text "Replies")
+              th(text "Views")
+              th(text "Activity")
          tbody():
            for i in 0 ..< list.threads.len:
              let thread = list.threads[i]
@ -227,10 +224,9 @@ when defined(js):

              let isLastThread = i+1 == list.threads.len
              let (isLastUnseen, isNew) = getInfo(list.threads, i, currentUser)
-              genThread(i+1, thread, isNew,
-                        noBorder=isLastUnseen or isLastThread,
-                        displayCategory=displayCategory)
-              if isLastUnseen and (not isLastThread):
+              genThread(thread, isNew,
+                        noBorder=isLastUnseen or isLastThread)
+              if isLastUnseen:
                tr(class="last-visit-separator"):
                  td(colspan="6"):
                    span(text "last visit")
@ -241,11 +237,10 @@ when defined(js):
                  td(colspan="6"):
                    tdiv(class="loading loading-lg")
                else:
-                  td(colspan="6",
-                     onClick = (ev: Event, n: VNode) => (onLoadMore(ev, n, categoryId))):
+                  td(colspan="6", onClick=onLoadMore):
                    span(text "load more threads")

-  proc renderThreadList*(currentUser: Option[User], categoryId = none(int)): VNode =
+  proc renderThreadList*(currentUser: Option[User]): VNode =
    result = buildHtml(tdiv):
-      state.mainButtons.render(currentUser, categoryId=categoryId)
-      genThreadList(currentUser, categoryId)
+      genTopButtons(currentUser)
+      genThreadList(currentUser)
--- a/src/frontend/user.nim
+++ b/src/frontend/user.nim
@ -1,13 +1,12 @@
-import times, options
+import times

 type
-  # If you add more "Banned" states, be sure to modify forum's threadsQuery too.
  Rank* {.pure.} = enum ## serialized as 'status'
    Spammer          ## spammer: every post is invisible
-    Moderated        ## new member: posts manually reviewed before everybody
-                     ## can see them
    Troll            ## troll: cannot write new posts
    Banned           ## A non-specific ban
+    Moderated        ## new member: posts manually reviewed before everybody
+                     ## can see them
    EmailUnconfirmed ## member with unconfirmed email address. Their posts
                     ## are visible, but cannot make new posts. This is so that
                     ## when a user with existing posts changes their email,
@ -17,7 +16,6 @@ type
    Admin            ## Admin: can do everything

  User* = object
-    id*: string
    name*: string
    avatarUrl*: string
    lastOnline*: int64
@ -28,9 +26,6 @@ type
 proc isOnline*(user: User): bool =
  return getTime().toUnix() - user.lastOnline < (60*5)

-proc isAdmin*(user: Option[User]): bool =
-  return user.isSome and user.get().rank == Admin
-
 proc `==`*(u1, u2: User): bool =
  u1.name == u2.name

@ -38,9 +33,6 @@ proc canPost*(rank: Rank): bool =
  ## Determines whether the specified rank can make new posts.
  rank >= Rank.User or rank == Moderated

-proc isBanned*(rank: Rank): bool =
-  rank in {Spammer, Troll, Banned}
-
 when defined(js):
  include karax/prelude
  import karaxutils
@ -76,4 +68,4 @@ when defined(js):
               title="User is a moderator")
      of Admin:
        italic(class="fas fa-chess-knight",
-               title="User is an admin")
+               title="User is an admin")
--- a/src/frontend/usermenu.nim
+++ b/src/frontend/usermenu.nim
@ -24,7 +24,7 @@ when defined(js):

  proc render*(state: UserMenu, user: User): VNode =
    result = buildHtml():
-      tdiv(id="profile-btn"):
+      tdiv():
        figure(class="avatar c-hand",
               onClick=(e: Event, n: VNode) => onClick(e, n, state)):
          img(src=user.avatarUrl, title=user.name)
@ -52,15 +52,13 @@ when defined(js):
              tdiv(class="tile-icon"):
                img(class="avatar", src=user.avatarUrl,
                    title=user.name)
-              tdiv(id="profile-name", class="tile-content"):
+              tdiv(class="tile-content"):
                text user.name
          li(class="divider")
          li(class="menu-item"):
-            a(id="myprofile-btn",
-              href=makeUri("/profile/" & user.name)):
+            a(href=makeUri("/profile/" & user.name)):
              text "My profile"
          li(class="menu-item c-hand"):
-            a(id="logout-btn",
-              onClick = (e: Event, n: VNode) =>
+            a(onClick = (e: Event, n: VNode) =>
                (state.shown=false; state.onLogout())):
-              text "Logout"
+              text "Logout"
--- a/src/fts.sql
+++ b/src/fts.sql
@ -7,7 +7,6 @@ SELECT
        post_id,
        post_content,
        cdate,
-        person.id,
        person.name AS author,
        person.email AS email,
        strftime('%s', person.lastOnline) AS lastOnline,
@ -47,7 +46,6 @@ SELECT
            THEN snippet(post_fts, '**', '**', '...', what, -45)
            ELSE SUBSTR(post_fts.content, 1, 200) END AS content,
        cdate,
-        person.id,
        person.name AS author,
        person.email AS email,
        strftime('%s', person.lastOnline) AS lastOnline,
--- a/src/setup_nimforum.nim
+++ b/src/setup_nimforum.nim
@ -7,7 +7,7 @@
 #
 # Script to initialise the nimforum.

-import strutils, db_sqlite, os, times, json, options, terminal
+import strutils, db_sqlite, os, times, json, options

 import auth, frontend/user

@ -22,25 +22,10 @@ proc backup(path: string, contents: Option[string]=none[string]()) =
    echo(path, " already exists. Moving to ", backupPath)
    moveFile(path, backupPath)

-proc createUser(db: DbConn, user: tuple[username, password, email: string],
-                rank: Rank) =
-  assert user.username.len != 0
-  let salt = makeSalt()
-  let password = makePassword(user.password, salt)
-
-  exec(db, sql"""
-    INSERT INTO person(name, password, email, salt, status, lastOnline)
-    VALUES (?, ?, ?, ?, ?, DATETIME('now'))
-  """, user.username, password, user.email, salt, $rank)
-
 proc initialiseDb(admin: tuple[username, password, email: string],
                  filename="nimforum.db") =
-  let
-    path = getCurrentDir() / filename
-    isTest = "-test" in filename
-    isDev = "-dev" in filename
-
-  if not isDev and not isTest:
+  let path = getCurrentDir() / filename
+  if "-dev" notin filename and "-test" notin filename:
    backup(path)

  removeFile(path)
@ -66,7 +51,7 @@ proc initialiseDb(admin: tuple[username, password, email: string],

  db.exec(sql"""
    insert into category (id, name, description, color)
-    values (0, 'Unsorted', 'No category has been chosen yet.', '');
+    values (0, 'Default', '', '');
  """)

  # -- Thread
@ -81,7 +66,6 @@ proc initialiseDb(admin: tuple[username, password, email: string],
    isLocked boolean not null default 0,
    solution integer,
    isDeleted boolean not null default 0,
-    isPinned boolean not null default 0,

    foreign key (category) references category(id),
    foreign key (solution) references post(id)
@ -114,24 +98,13 @@ proc initialiseDb(admin: tuple[username, password, email: string],
  db.exec sql"create index PersonStatusIdx on person(status);"

  # Create default user.
-  db.createUser(admin, Admin)
-
-  # Create some test data for development
-  if isTest or isDev:
-    for rank in Spammer..Moderator:
-      let rankLower = toLowerAscii($rank)
-      let user = (username: $rankLower,
-                  password: $rankLower,
-                  email: $rankLower & "@localhost.local")
-      db.createUser(user, rank)
-
+  if admin.username.len != 0:
+    let salt = makeSalt()
+    let password = makePassword(admin.password, salt)
    db.exec(sql"""
-      insert into category (name, description, color)
-      values ('Libraries', 'Libraries and library development', '0198E1'),
-             ('Announcements', 'Announcements by Nim core devs', 'FFEB3B'),
-             ('Fun', 'Posts that are just for fun', '00897B'),
-             ('Potential Issues', 'Potential Nim compiler issues', 'E53935');
-    """)
+      insert into person (id, name, password, email, salt, status)
+      values (1, ?, ?, ?, ?, ?);
+    """, admin.username, password, admin.email, salt, $Admin)

  # -- Post

@ -235,10 +208,9 @@ proc initialiseDb(admin: tuple[username, password, email: string],
 proc initialiseConfig(
  name, title, hostname: string,
  recaptcha: tuple[siteKey, secretKey: string],
-  smtp: tuple[address, user, password, fromAddr: string, tls: bool],
+  smtp: tuple[address, user, password: string],
  isDev: bool,
-  dbPath: string,
-  ga: string=""
+  dbPath: string
 ) =
  let path = getCurrentDir() / "forum.json"

@ -251,13 +223,9 @@ proc initialiseConfig(
    "smtpAddress": %smtp.address,
    "smtpUser": %smtp.user,
    "smtpPassword": %smtp.password,
-    "smtpFromAddr": %smtp.fromAddr,
-    "smtpTls": %smtp.tls,
    "isDev": %isDev,
    "dbPath": %dbPath
  }
-  if ga.len > 0:
-    j["ga"] = %ga

  backup(path, some(pretty(j)))
  writeFile(path, pretty(j))
@ -267,69 +235,6 @@ proc question(q: string): string =
    stdout.write(q)
    result = stdin.readLine()

-proc setup() =
-  echo("""
-Welcome to the NimForum setup script. Please answer the following questions.
-These can be changed later in the generated forum.json file.
-  """)
-
-  let name = question("Forum full name: ")
-  let title = question("Forum short name: ")
-
-  let hostname = question("Forum hostname: ")
-
-  let adminUser = question("Admin username: ")
-  let adminPass = readPasswordFromStdin("Admin password: ")
-  let adminEmail = question("Admin email: ")
-
-  echo("")
-  echo("The following question are related to recaptcha. \nYou must set up a " &
-       "recaptcha v2 for your forum before answering them. \nPlease do so now " &
-       "and then answer these questions: https://www.google.com/recaptcha/admin")
-  let recaptchaSiteKey = question("Recaptcha site key: ")
-  let recaptchaSecretKey = question("Recaptcha secret key: ")
-
-
-  echo("The following questions are related to smtp. You must set up a \n" &
-       "mailing server for your forum or use an external service.")
-  let smtpAddress = question("SMTP address (eg: mail.hostname.com): ")
-  let smtpUser = question("SMTP user: ")
-  let smtpPassword = readPasswordFromStdin("SMTP pass: ")
-  let smtpFromAddr = question("SMTP sending email address (eg: mail@mail.hostname.com): ")
-  let smtpTls = parseBool(question("Enable TLS for SMTP: "))
-
-  echo("The following is optional. You can specify your Google Analytics ID " &
-       "if you wish. Otherwise just leave it blank.")
-  stdout.write("Google Analytics (eg: UA-12345678-1): ")
-  let ga = stdin.readLine().strip()
-
-  let dbPath = "nimforum.db"
-  initialiseConfig(
-    name, title, hostname, (recaptchaSiteKey, recaptchaSecretKey),
-    (smtpAddress, smtpUser, smtpPassword, smtpFromAddr, smtpTls), isDev=false,
-    dbPath, ga
-  )
-
-  initialiseDb(
-    admin=(adminUser, adminPass, adminEmail),
-    dbPath
-  )
-
-  echo("Setup complete!")
-
-proc echoHelp() =
-    quit("""
-Usage: setup_nimforum opts
-
-Options:
-  --setup         Performs first time setup for end users.
-
-Development options:
-  --dev           Creates a new development DB and config.
-  --test          Creates a new test DB and config.
-  --blank         Creates a new blank DB.
-  """)
-
 when isMainModule:
  if paramCount() > 0:
    case paramStr(1)
@ -341,7 +246,7 @@ when isMainModule:
        "Development Forum",
        "localhost",
        recaptcha=("", ""),
-        smtp=("", "", "", "", false),
+        smtp=("", "", ""),
        isDev=true,
        dbPath
      )
@ -358,7 +263,7 @@ when isMainModule:
        "Test Forum",
        "localhost",
        recaptcha=("", ""),
-        smtp=("", "", "", "", false),
+        smtp=("", "", ""),
        isDev=true,
        dbPath
      )
@ -374,11 +279,5 @@ when isMainModule:
        admin=("", "", ""),
        dbPath
      )
-    of "--setup":
-      setup()
    else:
-      echoHelp()
-  else:
-    echoHelp()
-
-
+      quit("--dev|--test|--prod")
--- a/src/utils.nim
+++ b/src/utils.nim
@ -1,24 +1,26 @@
 import asyncdispatch, smtp, strutils, json, os, rst, rstgen, xmltree, strtabs,
  htmlparser, streams, parseutils, options, logging
-from times import getTime, utc, format
+from times import getTime, getGMTime, format

 # Used to be:
 # {'A'..'Z', 'a'..'z', '0'..'9', '_', '\128'..'\255'}
 let
-  UsernameIdent* = IdentChars + {'-'} # TODO: Double check that everyone follows this.
+  UsernameIdent* = IdentChars # TODO: Double check that everyone follows this.

 import frontend/[karaxutils, error]
 export parseInt

+proc `%`*[T](opt: Option[T]): JsonNode =
+  ## Generic constructor for JSON data. Creates a new ``JNull JsonNode``
+  ## if ``opt`` is empty, otherwise it delegates to the underlying value.
+  if opt.isSome: %opt.get else: newJNull()
+
 type
  Config* = object
    smtpAddress*: string
    smtpPort*: int
    smtpUser*: string
    smtpPassword*: string
-    smtpFromAddr*: string
-    smtpTls*: bool
-    smtpSsl*: bool
    mlistAddress*: string
    recaptchaSecretKey*: string
    recaptchaSiteKey*: string
@ -26,8 +28,7 @@ type
    dbPath*: string
    hostname*: string
    name*, title*: string
-    ga*: string
-    port*: int
+    scripts*: string

  ForumError* = object of Exception
    data*: PostError
@ -53,12 +54,9 @@ proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config =
                  smtpPassword: "", mlistAddress: "")
  let root = parseFile(filename)
  result.smtpAddress = root{"smtpAddress"}.getStr("")
-  result.smtpPort = root{"smtpPort"}.getInt(25)
+  result.smtpPort = root{"smtpPort"}.getNum(25).int
  result.smtpUser = root{"smtpUser"}.getStr("")
  result.smtpPassword = root{"smtpPassword"}.getStr("")
-  result.smtpFromAddr = root{"smtpFromAddr"}.getStr("")
-  result.smtpTls = root{"smtpTls"}.getBool(false)
-  result.smtpSsl = root{"smtpSsl"}.getBool(false)
  result.mlistAddress = root{"mlistAddress"}.getStr("")
  result.recaptchaSecretKey = root{"recaptchaSecretKey"}.getStr("")
  result.recaptchaSiteKey = root{"recaptchaSiteKey"}.getStr("")
@ -67,8 +65,7 @@ proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config =
  result.hostname = root["hostname"].getStr()
  result.name = root["name"].getStr()
  result.title = root["title"].getStr()
-  result.ga = root{"ga"}.getStr()
-  result.port = root{"port"}.getInt(5000)
+  result.scripts = root{"scripts"}.getStr()

 proc processGT(n: XmlNode, tag: string): (int, XmlNode, string) =
  result = (0, newElement(tag), tag)
@ -163,7 +160,7 @@ proc processMentions(node: XmlNode): XmlNode =
      result.add(child)
  of xnElement:
    case node.tag
-    of "pre", "code", "tt", "a":
+    of "pre", "code", "tt":
      return node
    else:
      result = newElement(node.tag)
--- a/tests/browsertester.nim
+++ b/tests/browsertester.nim
@ -23,7 +23,7 @@ const baseUrl = "http://localhost:" & $port & "/"
 template withBackend(body: untyped): untyped =
  ## Starts a new backend instance.

-  spawn runProcess("nimble -y testbackend")
+  spawn runProcess("nimble -y runbackend")
  defer:
    discard execCmd("killall " & backend)

@ -43,11 +43,9 @@ template withBackend(body: untyped): untyped =

  body

-import browsertests/[scenario1, threads, issue181, categories]
+import browsertests/scenario1

-proc main() =
-  # Kill any already running instances
-  discard execCmd("killall geckodriver")
+when isMainModule:
  spawn runProcess("geckodriver -p 4444 --log config")
  defer:
    discard execCmd("killall geckodriver")
@ -65,14 +63,8 @@ proc main() =

    withBackend:
      scenario1.test(session, baseUrl)
-      threads.test(session, baseUrl)
-      categories.test(session, baseUrl)
-      issue181.test(session, baseUrl)

    session.close()
  except:
    sleep(10000) # See if we can grab any more output.
-    raise
-
-when isMainModule:
-  main()
+    raise
--- a/tests/browsertester.nims
+++ b/tests/browsertester.nims
@ -1,2 +1 @@
--threads:on
--path:"../src/frontend"
+--threads:on
--- a/tests/browsertests/categories.nim
+++ b/tests/browsertests/categories.nim
@ -1,214 +0,0 @@
-import unittest, common
-import webdriver
-
-import karaxutils
-
-proc selectCategory(session: Session, name: string) =
-  with session:
-    click "#category-selection .dropdown-toggle"
-    click "#category-selection ." & name
-
-proc createCategory(session: Session, baseUrl, name, color, description: string) =
-  with session:
-    navigate baseUrl
-    click "#categories-btn"
-
-    ensureExists "#add-category"
-
-    click "#add-category .plus-btn"
-
-    clear "#add-category input[name='name']"
-    clear "#add-category input[name='description']"
-
-    sendKeys "#add-category input[name='name']", name
-    setColor "#add-category input[name='color']", color
-    sendKeys "#add-category input[name='description']", description
-
-    click "#add-category #add-category-btn"
-
-    checkText "#category-" & name.slug(), name
-
-proc categoriesUserTests(session: Session, baseUrl: string) =
-  let
-    title = "Category Test"
-    content = "Choosing category test"
-
-  suite "user tests":
-
-    with session:
-      navigate baseUrl
-      login "user", "user"
-
-    setup:
-      with session:
-        navigate baseUrl
-
-    test "no category add available":
-      with session:
-        click "#new-thread-btn"
-
-        checkIsNone "#add-category"
-
-    test "no category add available category page":
-      with session:
-        click "#categories-btn"
-        checkIsNone "#add-category"
-
-    test "can create category thread":
-      with session:
-        click "#new-thread-btn"
-        sendKeys "#thread-title", title
-
-        selectCategory "fun"
-        sendKeys "#reply-textarea", content
-
-        click "#create-thread-btn"
-        checkText "#thread-title .category", "Fun"
-
-        navigate baseUrl
-
-        ensureExists title, LinkTextSelector
-
-    test "can create category thread and change category":
-      with session:
-        let newTitle = title & " Selection"
-        click "#new-thread-btn"
-        sendKeys "#thread-title", newTitle
-
-        selectCategory "fun"
-        sendKeys "#reply-textarea", content
-
-        click "#create-thread-btn"
-        checkText "#thread-title .category", "Fun"
-
-        selectCategory "announcements"
-
-        checkText "#thread-title .category", "Announcements"
-
-        # Make sure there is no error
-        checkIsNone "#thread-title .text-error"
-
-        navigate baseUrl
-
-        ensureExists newTitle, LinkTextSelector
-
-    test "can navigate to categories page":
-      with session:
-        click "#categories-btn"
-
-        ensureExists "#categories-list"
-
-    test "can view post under category":
-      with session:
-
-        # create a few threads
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "Post 1"
-
-        selectCategory "fun"
-        sendKeys "#reply-textarea", "Post 1"
-
-        click "#create-thread-btn"
-        navigate baseUrl
-
-
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "Post 2"
-
-        selectCategory "announcements"
-        sendKeys "#reply-textarea", "Post 2"
-
-        click "#create-thread-btn"
-        navigate baseUrl
-
-
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "Post 3"
-
-        selectCategory "unsorted"
-        sendKeys "#reply-textarea", "Post 3"
-
-        click "#create-thread-btn"
-        navigate baseUrl
-
-
-        click "#categories-btn"
-        ensureExists "#categories-list"
-
-        click "#category-unsorted"
-        checkText "#threads-list .thread-title a", "Post 3"
-        for element in session.waitForElements("#threads-list .category-name"):
-          # Have to user "innerText" because elements are hidden on this page
-          assert element.getProperty("innerText") == "Unsorted"
-
-        selectCategory "announcements"
-        checkText "#threads-list .thread-title a", "Post 2"
-        for element in session.waitForElements("#threads-list .category-name"):
-          assert element.getProperty("innerText") == "Announcements"
-
-        selectCategory "fun"
-        checkText "#threads-list .thread-title a", "Post 1"
-        for element in session.waitForElements("#threads-list .category-name"):
-          assert element.getProperty("innerText") == "Fun"
-
-    session.logout()
-
-proc categoriesAdminTests(session: Session, baseUrl: string) =
-  suite "admin tests":
-    with session:
-      navigate baseUrl
-      login "admin", "admin"
-
-    test "can create category via dropdown":
-      let
-        name = "Category Test"
-        color = "#720904"
-        description = "This is a description"
-
-      with session:
-        click "#new-thread-btn"
-
-        ensureExists "#add-category"
-
-        click "#add-category .plus-btn"
-
-        clear "#add-category input[name='name']"
-        clear "#add-category input[name='description']"
-
-        sendKeys "#add-category input[name='name']", name
-        setColor "#add-category input[name='color']", color
-        sendKeys "#add-category input[name='description']", description
-
-        click "#add-category #add-category-btn"
-
-        checkText "#category-selection .selected-category", name
-
-    test "can create category on category page":
-      let
-        name = "Category Test Page"
-        color = "#70B4D4"
-        description = "This is a description on category page"
-
-      with session:
-        createCategory baseUrl, name, color, description
-
-    test "category adding disabled on admin logout":
-      with session:
-        navigate(baseUrl & "c/0")
-        ensureExists "#add-category"
-        logout()
-
-        checkIsNone "#add-category"
-        navigate baseUrl
-
-        login "admin", "admin"
-
-    session.logout()
-
-proc test*(session: Session, baseUrl: string) =
-  session.navigate(baseUrl)
-
-  categoriesUserTests(session, baseUrl)
-  categoriesAdminTests(session, baseUrl)
-
-  session.navigate(baseUrl)
--- a/tests/browsertests/common.nim
+++ b/tests/browsertests/common.nim
@ -1,189 +0,0 @@
-import os, options, unittest, strutils
-import webdriver
-import macros
-
-const actionDelayMs {.intdefine.} = 0
-## Inserts a delay in milliseconds between automated actions. Useful for debugging tests
-
-macro with*(obj: typed, code: untyped): untyped =
-  ## Execute a set of statements with an object
-  expectKind code, nnkStmtList
-
-  template checkCompiles(res, default) =
-    when compiles(res):
-      res
-    else:
-      default
-
-  result = code.copy
-
-  # Simply inject obj into call
-  for i in 0 ..< result.len:
-    if result[i].kind in {nnkCommand, nnkCall}:
-      result[i].insert(1, obj)
-
-  result = getAst(checkCompiles(result, code))
-
-proc elementIsSome(element: Option[Element]): bool =
-  return element.isSome
-
-proc elementIsNone(element: Option[Element]): bool =
-  return element.isNone
-
-proc waitForElement*(session: Session, selector: string, strategy=CssSelector, timeout=20000, pollTime=50,
-  waitCondition: proc(element: Option[Element]): bool = elementIsSome): Option[Element]
-
-proc click*(session: Session, element: string, strategy=CssSelector) =
-  let el = session.waitForElement(element, strategy)
-  el.get().click()
-
-proc sendKeys*(session: Session, element, keys: string) =
-  let el = session.waitForElement(element)
-  el.get().sendKeys(keys)
-
-proc clear*(session: Session, element: string) =
-  let el = session.waitForElement(element)
-  el.get().clear()
-
-proc sendKeys*(session: Session, element: string, keys: varargs[Key]) =
-  let el = session.waitForElement(element)
-
-  # focus
-  el.get().click()
-  for key in keys:
-    session.press(key)
-
-proc ensureExists*(session: Session, element: string, strategy=CssSelector) =
-  discard session.waitForElement(element, strategy)
-
-template check*(session: Session, element: string, function: untyped) =
-  let el = session.waitForElement(element)
-  check function(el)
-
-template check*(session: Session, element: string,
-                strategy: LocationStrategy, function: untyped) =
-  let el = session.waitForElement(element, strategy)
-  check function(el)
-
-proc setColor*(session: Session, element, color: string, strategy=CssSelector) =
-  let el = session.waitForElement(element, strategy)
-  discard session.execute("arguments[0].setAttribute('value', '" & color & "')", el.get())
-
-proc checkIsNone*(session: Session, element: string, strategy=CssSelector) =
-  discard session.waitForElement(element, strategy, waitCondition=elementIsNone)
-
-template checkText*(session: Session, element, expectedValue: string) =
-  let el = session.waitForElement(element)
-  check el.get().getText() == expectedValue
-
-proc waitForElement*(
-  session: Session, selector: string, strategy=CssSelector,
-  timeout=20000, pollTime=50,
-  waitCondition: proc(element: Option[Element]): bool = elementIsSome
-): Option[Element] =
-  var waitTime = 0
-
-  when actionDelayMs > 0:
-    sleep(actionDelayMs)
-
-  while true:
-    try:
-      let loading = session.findElement(selector, strategy)
-      if waitCondition(loading):
-        return loading
-    finally:
-      discard
-    sleep(pollTime)
-    waitTime += pollTime
-
-    if waitTime > timeout:
-      doAssert false, "Wait for load time exceeded"
-
-proc waitForElements*(
-  session: Session, selector: string, strategy=CssSelector,
-  timeout=20000, pollTime=50
-): seq[Element] =
-  var waitTime = 0
-
-  when actionDelayMs > 0:
-    sleep(actionDelayMs)
-
-  while true:
-    let loading = session.findElements(selector, strategy)
-    if loading.len > 0:
-      return loading
-    sleep(pollTime)
-    waitTime += pollTime
-
-    if waitTime > timeout:
-      doAssert false, "Wait for load time exceeded"
-
-proc setUserRank*(session: Session, baseUrl, user, rank: string) =
-  with session:
-    navigate(baseUrl & "profile/" & user)
-
-    click "#settings-tab"
-
-    click "#rank-field"
-    click("#rank-field option#rank-" & rank.toLowerAscii)
-
-    click "#save-btn"
-
-proc logout*(session: Session) =
-  with session:
-    click "#profile-btn"
-    click "#profile-btn #logout-btn"
-
-    # Verify we have logged out by looking for the log in button.
-    ensureExists "#login-btn"
-
-proc login*(session: Session, user, password: string) =
-  with session:
-    click "#login-btn"
-
-    clear "#login-form input[name='username']"
-    clear "#login-form input[name='password']"
-
-    sendKeys "#login-form input[name='username']", user
-    sendKeys "#login-form input[name='password']", password
-
-    sendKeys "#login-form input[name='password']", Key.Enter
-
-    # Verify that the user menu has been initialised properly.
-    click "#profile-btn"
-    checkText "#profile-btn #profile-name", user
-    click "#profile-btn"
-
-proc register*(session: Session, user, password: string, verify = true) =
-  with session:
-    click "#signup-btn"
-
-    clear "#signup-form input[name='email']"
-    clear "#signup-form input[name='username']"
-    clear "#signup-form input[name='password']"
-
-    sendKeys "#signup-form input[name='email']", user & "@" & user & ".com"
-    sendKeys "#signup-form input[name='username']", user
-    sendKeys "#signup-form input[name='password']", password
-
-    click "#signup-modal .create-account-btn"
-
-    if verify:
-      with session:
-        # Verify that the user menu has been initialised properly.
-        click "#profile-btn"
-        checkText "#profile-btn #profile-name", user
-        # close menu
-        click "#profile-btn"
-
-proc createThread*(session: Session, title, content: string) =
-  with session:
-    click "#new-thread-btn"
-
-    sendKeys "#thread-title", title
-    sendKeys "#reply-textarea", content
-
-    click "#create-thread-btn"
-
-    checkText "#thread-title .title-text", title
-    checkText ".original-post div.post-content", content
--- a/tests/browsertests/issue181.nim
+++ b/tests/browsertests/issue181.nim
@ -1,36 +0,0 @@
-import unittest, common
-
-import webdriver
-
-proc test*(session: Session, baseUrl: string) =
-  session.navigate(baseUrl)
-
-  test "can see banned posts":
-    with session:
-      register("issue181", "issue181")
-      logout()
-
-      # Change rank to `user` so they can post.
-      login("admin", "admin")
-      setUserRank(baseUrl, "issue181", "user")
-      logout()
-
-      login("issue181", "issue181")
-      navigate(baseUrl)
-
-      const title = "Testing issue 181."
-      createThread(title, "Test for issue #181")
-
-      logout()
-
-      login("admin", "admin")
-
-      # Ban our user.
-      setUserRank(baseUrl, "issue181", "banned")
-
-      # Make sure the banned user's thread is still visible.
-      navigate(baseUrl)
-      ensureExists("tr.banned")
-      checkText("tr.banned .thread-title > a", title)
-      logout()
-      checkText("tr.banned .thread-title > a", title)
--- a/tests/browsertests/scenario1.nim
+++ b/tests/browsertests/scenario1.nim
@ -1,43 +1,115 @@
-import unittest, common
+import unittest, options, os

 import webdriver

+proc waitForLoad(session: Session, timeout=20000) =
+  var waitTime = 0
+  sleep(2000)
+
+  while true:
+    let loading = session.findElement(".loading")
+    if loading.isNone: return
+    sleep(1000)
+    waitTime += 1000
+
+    if waitTime > timeout:
+      doAssert false, "Wait for load time exceeded"
+
 proc test*(session: Session, baseUrl: string) =
  session.navigate(baseUrl)

+  waitForLoad(session)
+
  # Sanity checks
  test "shows sign up":
-    session.checkText("#signup-btn", "Sign up")
+    let signUp = session.findElement("#signup-btn")
+    check signUp.get().getText() == "Sign up"

  test "shows log in":
-    session.checkText("#login-btn", "Log in")
+    let logIn = session.findElement("#login-btn")
+    check logIn.get().getText() == "Log in"

  test "is empty":
-    session.checkIsNone("tr > td.thread-title")
+    let thread = session.findElement("tr > td.thread-title")
+    check thread.isNone()

  # Logging in
  test "can login/logout":
-    with session:
-      login("admin", "admin")
+    let logIn = session.findElement("#login-btn").get()
+    logIn.click()

-      # Check whether we can log out.
-      logout()
-      # Verify we have logged out by looking for the log in button.
-      ensureExists "#login-btn"
+    let usernameField = session.findElement(
+      "#login-form input[name='username']"
+    )
+    check usernameField.isSome()
+    let passwordField = session.findElement(
+      "#login-form input[name='password']"
+    )
+    check passwordField.isSome()
+
+    usernameField.get().sendKeys("admin")
+    passwordField.get().sendKeys("admin")
+    passwordField.get().click() # Focus field.
+    session.press(Key.Enter)
+
+    waitForLoad(session, 5000)
+
+    # Verify that the user menu has been initialised properly.
+    let profileButton = session.findElement(
+      "#main-navbar figure.avatar"
+    ).get()
+    profileButton.click()
+
+    let profileName = session.findElement(
+      "#main-navbar .menu-right div.tile-content"
+    ).get()
+
+    check profileName.getText() == "admin"
+
+    # Check whether we can log out.
+    let logoutLink = session.findElement(
+      "Logout",
+      LinkTextSelector
+    ).get()
+    logoutLink.click()
+
+    # Verify we have logged out by looking for the log in button.
+    check session.findElement("#login-btn").isSome()

  test "can register":
-    with session:
-      register("test", "test")
-      logout()
+    let signup = session.findElement("#signup-btn").get()
+    signup.click()

-  test "can't register same username with different case":
-    with session:
-      register "test1", "test1", verify = false
-      logout()
+    let emailField = session.findElement(
+      "#signup-form input[name='email']"
+    ).get()
+    let usernameField = session.findElement(
+      "#signup-form input[name='username']"
+    ).get()
+    let passwordField = session.findElement(
+      "#signup-form input[name='password']"
+    ).get()

-      navigate baseUrl
+    emailField.sendKeys("test@test.com")
+    usernameField.sendKeys("test")
+    passwordField.sendKeys("test")

-      register "TEst1", "test1", verify = false
+    let createAccount = session.findElement(
+      "#signup-modal .modal-footer .btn-primary"
+    ).get()

-      ensureExists "#signup-form .has-error"
-      navigate baseUrl
+    createAccount.click()
+
+    waitForLoad(session, 5000)
+
+    # Verify that the user menu has been initialised properly.
+    let profileButton = session.findElement(
+      "#main-navbar figure.avatar"
+    ).get()
+    profileButton.click()
+
+    let profileName = session.findElement(
+      "#main-navbar .menu-right div.tile-content"
+    ).get()
+
+    check profileName.getText() == "test"
--- a/tests/browsertests/threads.nim
+++ b/tests/browsertests/threads.nim
@ -1,267 +0,0 @@
-import unittest, common
-import webdriver
-
-let
-  userTitleStr = "This is a user thread!"
-  userContentStr = "A user has filled this out"
-
-  adminTitleStr = "This is a thread title!"
-  adminContentStr = "This is content"
-
-proc banUser(session: Session, baseUrl: string) =
-  with session:
-    login "admin", "admin"
-    setUserRank baseUrl, "user", "banned"
-    logout()
-
-proc unBanUser(session: Session, baseUrl: string) =
-  with session:
-    login "admin", "admin"
-    setUserRank baseUrl, "user", "user"
-    logout()
-
-proc userTests(session: Session, baseUrl: string) =
-  suite "user thread tests":
-    session.login("user", "user")
-
-    setup:
-      session.navigate(baseUrl)
-
-    test "can create thread":
-      with session:
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", userTitleStr
-        sendKeys "#reply-textarea", userContentStr
-
-        click "#create-thread-btn"
-
-        checkText "#thread-title .title-text", userTitleStr
-        checkText ".original-post div.post-content", userContentStr
-
-    test "can delete thread":
-      with session:
-        # create thread to be deleted
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", "To be deleted"
-        sendKeys "#reply-textarea", "This thread is to be deleted"
-
-        click "#create-thread-btn"
-
-        click ".post-buttons .delete-button"
-
-        # click delete confirmation
-        click "#delete-modal .delete-btn"
-
-        # Make sure the forum post is gone
-        checkIsNone "To be deleted", LinkTextSelector
-
-    test "cannot (un)pin thread":
-      with session:
-        navigate(baseUrl)
-
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", "Unpinnable"
-        sendKeys "#reply-textarea", "Cannot (un)pin as an user"
-
-        click "#create-thread-btn"
-
-        checkIsNone "#pin-btn"
-
-    test "cannot lock threads":
-      with session:
-        navigate(baseUrl)
-
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", "Locking"
-        sendkeys "#reply-textarea", "Cannot lock as an user"
-
-        click "#create-thread-btn"
-
-        checkIsNone "#lock-btn"
-
-    session.logout()
-
-proc anonymousTests(session: Session, baseUrl: string) =
-  suite "anonymous user tests":
-    with session:
-      navigate baseUrl
-
-    test "can view banned thread":
-      with session:
-        ensureExists userTitleStr, LinkTextSelector
-
-    with session:
-      navigate baseUrl
-
-proc bannedTests(session: Session, baseUrl: string) =
-  suite "banned user thread tests":
-    with session:
-      navigate baseUrl
-      login "banned", "banned"
-
-    test "can't start thread":
-      with session:
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", "test"
-        sendKeys "#reply-textarea", "test"
-
-        click "#create-thread-btn"
-
-        ensureExists "#new-thread p.text-error"
-
-    session.logout()
-
-proc adminTests(session: Session, baseUrl: string) =
-  suite "admin thread tests":
-    session.login("admin", "admin")
-
-    setup:
-      session.navigate(baseUrl)
-
-    test "can view banned thread":
-      with session:
-        ensureExists userTitleStr, LinkTextSelector
-
-    test "can create thread":
-      with session:
-        click "#new-thread-btn"
-
-        sendKeys "#thread-title", adminTitleStr
-        sendKeys "#reply-textarea", adminContentStr
-
-        click "#create-thread-btn"
-
-        checkText "#thread-title .title-text", adminTitleStr
-        checkText ".original-post div.post-content", adminContentStr
-
-    test "try create duplicate thread":
-      with session:
-        click "#new-thread-btn"
-        ensureExists "#new-thread"
-
-        sendKeys "#thread-title", adminTitleStr
-        sendKeys "#reply-textarea", adminContentStr
-
-        click "#create-thread-btn"
-
-        ensureExists "#new-thread p.text-error"
-
-    test "can edit post":
-      let modificationText = " and I edited it!"
-      with session:
-        click adminTitleStr, LinkTextSelector
-
-        click ".post-buttons .edit-button"
-
-        sendKeys ".original-post #reply-textarea", modificationText
-        click ".edit-buttons .save-button"
-
-        checkText ".original-post div.post-content", adminContentStr & modificationText
-
-    test "can like thread":
-      # Try to like the user thread above
-
-      with session:
-        click userTitleStr, LinkTextSelector
-
-        click ".post-buttons .like-button"
-
-        checkText ".post-buttons .like-button .like-count", "1"
-
-    test "can delete thread":
-      with session:
-        click adminTitleStr, LinkTextSelector
-
-        click ".post-buttons .delete-button"
-
-        # click delete confirmation
-        click "#delete-modal .delete-btn"
-
-        # Make sure the forum post is gone
-        checkIsNone adminTitleStr, LinkTextSelector
-
-    test "can pin a thread":
-      with session:
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "Pinned post"
-        sendKeys "#reply-textarea", "A pinned post"
-        click "#create-thread-btn"
-
-        navigate(baseUrl)
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "Normal post"
-        sendKeys "#reply-textarea", "A normal post"
-        click "#create-thread-btn"
-
-        navigate(baseUrl)
-        click "Pinned post", LinkTextSelector
-        click "#pin-btn"
-        checkText "#pin-btn", "Unpin Thread"
-
-        navigate(baseUrl)
-
-        # Make sure pin exists
-        ensureExists "#threads-list .thread-1 .thread-title i"
-
-        checkText "#threads-list .thread-1 .thread-title a", "Pinned post"
-        checkText "#threads-list .thread-2 .thread-title a", "Normal post"
-
-    test "can unpin a thread":
-      with session:
-        click "Pinned post", LinkTextSelector
-        click "#pin-btn"
-        checkText "#pin-btn", "Pin Thread"
-
-        navigate(baseUrl)
-
-        checkIsNone "#threads-list .thread-2 .thread-title i"
-
-        checkText "#threads-list .thread-1 .thread-title a", "Normal post"
-        checkText "#threads-list .thread-2 .thread-title a", "Pinned post"
-
-    test "can lock a thread":
-      with session:
-        click "Locking", LinkTextSelector
-        click "#lock-btn"
-
-        ensureExists "#thread-title i.fas.fa-lock.fa-xs"
-
-    test "locked thread appears on frontpage":
-      with session:
-        click "#new-thread-btn"
-        sendKeys "#thread-title", "A new locked thread"
-        sendKeys "#reply-textarea", "This thread should appear locked on the frontpage"
-        click "#create-thread-btn"
-        click "#lock-btn"
-        
-        navigate(baseUrl)
-        ensureExists "#threads-list .thread-1 .thread-title i.fas.fa-lock.fa-xs"
-
-    test "can unlock a thread":
-      with session:
-        click "Locking", LinkTextSelector       
-        click "#lock-btn"
-
-        checkIsNone "#thread-title i.fas.fa-lock.fa-xs"
-
-    session.logout()
-
-proc test*(session: Session, baseUrl: string) =
-  session.navigate(baseUrl)
-
-  userTests(session, baseUrl)
-
-  banUser(session, baseUrl)
-
-  bannedTests(session, baseUrl)
-  anonymousTests(session, baseUrl)
-  adminTests(session, baseUrl)
-
-  unBanUser(session, baseUrl)
-
-  session.navigate(baseUrl)