Embed quote tweet in RSS

Fixes #132 Closes #820
2026-05-03 02:52:12 -04:00 · 2025-11-23 22:39:05 +01:00
81 changed files with 1866 additions and 4801 deletions
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -11,19 +11,20 @@ jobs:
  tests:
    uses: ./.github/workflows/run-tests.yml
    secrets: inherit
-
  build-docker-amd64:
    needs: [tests]
-    runs-on: ubuntu-24.04
+    runs-on: buildjet-2vcpu-ubuntu-2204
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: latest
      - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
@@ -35,19 +36,20 @@ jobs:
          platforms: linux/amd64
          push: true
          tags: zedeus/nitter:latest,zedeus/nitter:${{ github.sha }}
-
  build-docker-arm64:
    needs: [tests]
-    runs-on: ubuntu-24.04-arm
+    runs-on: buildjet-2vcpu-ubuntu-2204-arm
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: latest
      - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -20,17 +20,19 @@ defaults:
 jobs:
  build-test:
    name: Build and test
-    runs-on: ubuntu-24.04
+    runs-on: buildjet-2vcpu-ubuntu-2204
    strategy:
      matrix:
        nim: ["2.0.x", "2.2.x", "devel"]
    steps:
      - name: Checkout Code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0

      - name: Cache Nimble Dependencies
        id: cache-nimble
-        uses: actions/cache@v5
+        uses: buildjet/cache@v4
        with:
          path: ~/.nimble
          key: ${{ matrix.nim }}-nimble-v2-${{ hashFiles('*.nimble') }}
@@ -45,100 +47,62 @@ jobs:
          repo-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Build Project
-        run: nimble build -Y
-
-      - name: Upload 2.2.x build artifact
-        if: matrix.nim == '2.2.x'
-        uses: actions/upload-artifact@v6
-        with:
-          name: nitter-linux-nim-2.2.x-${{ github.sha }}
-          path: |
-            ./nitter
-          if-no-files-found: error
+        run: nimble build -d:release -Y

  integration-test:
    needs: [build-test]
    name: Integration test
-    runs-on: ubuntu-24.04
-
-    services:
-      redis:
-        image: redis:7
-        ports:
-          - 6379:6379
-
+    runs-on: buildjet-2vcpu-ubuntu-2204
    steps:
-      - name: Install runtime deps
-        run: |
-          sudo apt-get install -y --no-install-recommends libsass-dev libpcre3
-
      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Cache pipx (poetry)
-        uses: actions/cache@v5
+        uses: actions/checkout@v4
        with:
-          path: |
-            ~/.local/pipx
-            ~/.local/bin
-          key: pipx-poetry-${{ runner.os }}
-
-      - name: Install poetry
-        env:
-          PIPX_HOME: ~/.local/pipx
-          PIPX_BIN_DIR: ~/.local/bin
-        run: command -v poetry >/dev/null 2>&1 || pipx install poetry
-
-      - name: Setup Python (3.14) with Poetry cache
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.14"
-          cache: poetry
-          cache-dependency-path: tests/poetry.lock
-
-      - name: Install Python deps
-        working-directory: tests
-        run: poetry sync
+          fetch-depth: 0

      - name: Cache Nimble Dependencies
-        uses: actions/cache@v5
+        id: cache-nimble
+        uses: buildjet/cache@v4
        with:
          path: ~/.nimble
-          key: 2.2.x-nimble-v2-${{ hashFiles('*.nimble') }}
+          key: devel-nimble-v2-${{ hashFiles('*.nimble') }}
          restore-keys: |
-            2.2.x-nimble-v2-
+            devel-nimble-v2-
+
+      - name: Setup Python (3.10) with pip cache
+        uses: buildjet/setup-python@v4
+        with:
+          python-version: "3.10"
+          cache: pip

      - name: Setup Nim
        uses: jiro4989/setup-nim-action@v2
        with:
-          nim-version: 2.2.x
+          nim-version: devel
          use-nightlies: true
          repo-token: ${{ secrets.GITHUB_TOKEN }}

-      - name: Download 2.2.x build artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nitter-linux-nim-2.2.x-${{ github.sha }}
-          path: .
+      - name: Build Project
+        run: nimble build -d:release -Y

-      - name: Make nitter binary executable
-        run: chmod +x ./nitter
+      - name: Install SeleniumBase and Chromedriver
+        run: |
+          pip install seleniumbase
+          seleniumbase install chromedriver
+
+      - name: Start Redis Service
+        uses: supercharge/redis-github-action@1.5.0

      - name: Prepare Nitter Environment
        run: |
+          sudo apt-get update && sudo apt-get install -y libsass-dev
          cp nitter.example.conf nitter.conf
          sed -i 's/enableDebug = false/enableDebug = true/g' nitter.conf
-
-          # Run both Nimble tasks concurrently
-          nim r tools/rendermd.nim &
-          nim r tools/gencss.nim &
-          wait
-
+          nimble md
+          nimble scss
          echo '${{ secrets.SESSIONS }}' | head -n1
          echo '${{ secrets.SESSIONS }}' > ./sessions.jsonl

      - name: Run Tests
        run: |
          ./nitter &
-          cd tests
-          poetry run pytest -n3 --reruns=3 --rs .
+          pytest -n1 tests
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@ nitter.conf
 guest_accounts.json*
 sessions.json*
 dump.rdb
-*.bak
-/tools/*.json*
--- a/nitter.example.conf
+++ b/nitter.example.conf
@@ -1,39 +1,31 @@
 [Server]
-hostname = "nitter.net"      # for generating links, change this to your own domain/ip
+hostname = "nitter.net"  # for generating links, change this to your own domain/ip
 title = "nitter"
 address = "0.0.0.0"
 port = 8080
-https = false                # disable to enable cookies when not using https
+https = false  # disable to enable cookies when not using https
 httpMaxConnections = 100
 staticDir = "./public"

 [Cache]
-listMinutes = 240            # how long to cache list info (not the tweets, so keep it high)
-rssMinutes = 10              # how long to cache rss queries
-redisHost = "localhost"      # Change to "nitter-redis" if using docker-compose
+listMinutes = 240  # how long to cache list info (not the tweets, so keep it high)
+rssMinutes = 10  # how long to cache rss queries
+redisHost = "localhost"  # Change to "nitter-redis" if using docker-compose
 redisPort = 6379
 redisPassword = ""
-redisConnections = 20        # minimum open connections in pool
+redisConnections = 20  # minimum open connections in pool
 redisMaxConnections = 30
 # new connections are opened when none are available, but if the pool size
 # goes above this, they're closed when released. don't worry about this unless
 # you receive tons of requests per second

 [Config]
-hmacKey = "secretkey"        # random key for cryptographic signing of video urls
-base64Media = false          # use base64 encoding for proxied media urls
-enableRSS = true             # master switch, set to false to disable all RSS feeds
-enableRSSUserTweets = true   # /@user/rss
-enableRSSUserReplies = true  # /@user/with_replies/rss
-enableRSSUserMedia = true    # /@user/media/rss
-enableRSSSearch = true       # /search/rss and /@user/search/rss
-enableRSSList = true         # list RSS feeds
-enableDebug = false          # enable request logs and debug endpoints (/.sessions)
-proxy = ""                   # http/https url, SOCKS proxies are not supported
+hmacKey = "secretkey"  # random key for cryptographic signing of video urls
+base64Media = false  # use base64 encoding for proxied media urls
+enableRSS = true  # set this to false to disable RSS feeds
+enableDebug = false  # enable request logs and debug endpoints (/.sessions)
+proxy = ""  # http/https url, SOCKS proxies are not supported
 proxyAuth = ""
-apiProxy = ""                # nitter-proxy host, e.g. localhost:7000
-disableTid = false           # enable this if cookie-based auth is failing
-maxConcurrentReqs = 2        # max requests at a time per session to avoid race conditions

 # Change default preferences here, see src/prefs_impl.nim for a complete list
 [Preferences]
--- a/nitter.nimble
+++ b/nitter.nimble
@@ -28,7 +28,7 @@ requires "oauth#b8c163b"
 # Tasks

 task scss, "Generate css":
-  exec "nim r --hint[Processing]:off tools/gencss"
+  exec "nimble c --hint[Processing]:off -d:danger -r tools/gencss"

 task md, "Render md":
-  exec "nim r --hint[Processing]:off tools/rendermd"
+  exec "nimble c --hint[Processing]:off -d:danger -r tools/rendermd"
--- a/public/css/fontello.css
+++ b/public/css/fontello.css
@@ -1,143 +1,53 @@
@font-face {
-  font-family: "fontello";
-  src: url("/fonts/fontello.eot?42791196");
-  src:
-    url("/fonts/fontello.eot?42791196#iefix") format("embedded-opentype"),
-    url("/fonts/fontello.woff2?42791196") format("woff2"),
-    url("/fonts/fontello.woff?42791196") format("woff"),
-    url("/fonts/fontello.ttf?42791196") format("truetype"),
-    url("/fonts/fontello.svg?42791196#fontello") format("svg");
+  font-family: 'fontello';
+  src: url('/fonts/fontello.eot?61663884');
+  src: url('/fonts/fontello.eot?61663884#iefix') format('embedded-opentype'),
+       url('/fonts/fontello.woff2?61663884') format('woff2'),
+       url('/fonts/fontello.woff?61663884') format('woff'),
+       url('/fonts/fontello.ttf?61663884') format('truetype'),
+       url('/fonts/fontello.svg?61663884#fontello') format('svg');
  font-weight: normal;
  font-style: normal;
 }
-
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
+[class^="icon-"]:before, [class*=" icon-"]:before {
  font-family: "fontello";
  font-style: normal;
  font-weight: normal;
  speak: never;
-
+ 
  display: inline-block;
  text-decoration: inherit;
  width: 1em;
-  margin-right: 0.2em;
  text-align: center;

  /* For safety - reset parent styles, that can break glyph codes*/
  font-variant: normal;
  text-transform: none;
-
+ 
  /* fix buttons height, for twitter bootstrap */
  line-height: 1em;
-
+ 
  /* Font smoothing. That was taken from TWBS */
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }

-.icon-views:before {
-  content: "\e800";
-}
-
-/* '' */
-.icon-heart:before {
-  content: "\e801";
-}
-
-/* '' */
-.icon-quote:before {
-  content: "\e802";
-}
-
-/* '' */
-.icon-comment:before {
-  content: "\e803";
-}
-
-/* '' */
-.icon-group:before {
-  content: "\e804";
-}
-
-/* '' */
-.icon-play:before {
-  content: "\e805";
-}
-
-/* '' */
-.icon-link:before {
-  content: "\e806";
-}
-
-/* '' */
-.icon-calendar:before {
-  content: "\e807";
-}
-
-/* '' */
-.icon-location:before {
-  content: "\e808";
-}
-
-/* '' */
-.icon-picture:before {
-  content: "\e809";
-}
-
-/* '' */
-.icon-lock:before {
-  content: "\e80a";
-}
-
-/* '' */
-.icon-down:before {
-  content: "\e80b";
-}
-
-/* '' */
-.icon-retweet:before {
-  content: "\e80c";
-}
-
-/* '' */
-.icon-search:before {
-  content: "\e80d";
-}
-
-/* '' */
-.icon-pin:before {
-  content: "\e80e";
-}
-
-/* '' */
-.icon-cog:before {
-  content: "\e80f";
-}
-
-/* '' */
-.icon-rss:before {
-  content: "\e810";
-}
-
-/* '' */
-.icon-ok:before {
-  content: "\e811";
-}
-
-/* '' */
-.icon-circle:before {
-  content: "\f111";
-}
-
-/* '' */
-.icon-info:before {
-  content: "\f128";
-}
-
-/* '' */
-.icon-bird:before {
-  content: "\f309";
-}
-
-/* '' */
+.icon-views:before { content: '\e800'; } /* '' */
+.icon-heart:before { content: '\e801'; } /* '' */
+.icon-quote:before { content: '\e802'; } /* '' */
+.icon-comment:before { content: '\e803'; } /* '' */
+.icon-ok:before { content: '\e804'; } /* '' */
+.icon-play:before { content: '\e805'; } /* '' */
+.icon-link:before { content: '\e806'; } /* '' */
+.icon-calendar:before { content: '\e807'; } /* '' */
+.icon-location:before { content: '\e808'; } /* '' */
+.icon-picture:before { content: '\e809'; } /* '' */
+.icon-lock:before { content: '\e80a'; } /* '' */
+.icon-down:before { content: '\e80b'; } /* '' */
+.icon-retweet:before { content: '\e80c'; } /* '' */
+.icon-search:before { content: '\e80d'; } /* '' */
+.icon-pin:before { content: '\e80e'; } /* '' */
+.icon-cog:before { content: '\e80f'; } /* '' */
+.icon-rss:before { content: '\e810'; } /* '' */
+.icon-info:before { content: '\f128'; } /* '' */
+.icon-bird:before { content: '\f309'; } /* '' */
--- a/public/fonts/fontello.eot
+++ b/public/fonts/fontello.eot
--- a/public/fonts/fontello.svg
+++ b/public/fonts/fontello.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2026 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2025 by original authors @ fontello.com</metadata>
 <defs>
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -14,7 +14,7 @@

 <glyph glyph-name="comment" unicode="&#xe803;" d="M1000 350q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12-10-1-17 5t-10 16v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28q136 0 251-48t182-130 67-179z" horiz-adv-x="1000" />

-<glyph glyph-name="group" unicode="&#xe804;" d="M0 106l0 134q0 26 18 32l171 80q-66 39-68 131 0 56 35 103 37 41 90 43 31 0 63-19-49-125 23-237-12-11-25-19l-114-55q-48-23-52-84l0-143-114 0q-25 0-27 34z m193-59l0 168q0 27 22 37l152 70 57 28q-37 23-60 66t-22 94q0 76 46 130t110 54 109-54 45-130q0-105-78-158l61-30 146-70q24-10 24-37l0-168q-2-37-37-41l-541 0q-14 2-24 14t-10 27z m473 330q68 106 22 231 31 19 66 21 49 0 90-43 35-41 35-103 0-82-65-131l168-80q18-10 18-32l0-134q0-32-27-34l-118 0 0 143q0 57-50 84l-110 53q-15 8-29 25z" horiz-adv-x="1000" />
+<glyph glyph-name="ok" unicode="&#xe804;" d="M0 260l162 162 166-164 508 510 164-164-510-510-162-162-162 164z" horiz-adv-x="1000" />

 <glyph glyph-name="play" unicode="&#xe805;" d="M772 333l-741-412q-13-7-22-2t-9 20v822q0 14 9 20t22-2l741-412q13-7 13-17t-13-17z" horiz-adv-x="785.7" />

@@ -40,10 +40,6 @@

 <glyph glyph-name="rss" unicode="&#xe810;" d="M184 93c0-51-43-91-93-91s-91 40-91 91c0 50 41 91 91 91s93-41 93-91z m261-85l-125 0c0 174-140 323-315 323l0 118c231 0 440-163 440-441z m259 0l-136 0c0 300-262 561-563 561l0 129c370 0 699-281 699-690z" horiz-adv-x="704" />

-<glyph glyph-name="ok" unicode="&#xe811;" d="M933 534q0-22-16-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q16-15 16-38z" horiz-adv-x="1000" />
-
-<glyph glyph-name="circle" unicode="&#xf111;" d="M857 350q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
-
 <glyph glyph-name="info" unicode="&#xf128;" d="M393 149v-134q0-9-7-15t-15-7h-134q-9 0-16 7t-7 15v134q0 9 7 16t16 6h134q9 0 15-6t7-16z m176 335q0-30-8-56t-20-43-31-33-32-25-34-19q-23-13-38-37t-15-37q0-10-7-18t-16-9h-134q-8 0-14 11t-6 20v26q0 46 37 87t79 60q33 16 47 32t14 42q0 24-26 41t-60 18q-36 0-60-16-20-14-60-64-7-9-17-9-7 0-14 4l-91 70q-8 6-9 14t3 16q89 148 259 148 45 0 90-17t81-46 59-72 23-88z" horiz-adv-x="571.4" />

 <glyph glyph-name="bird" unicode="&#xf309;" d="M920 636q-36-54-94-98l0-24q0-130-60-250t-186-203-290-83q-160 0-290 84 14-2 46-2 132 0 234 80-62 2-110 38t-66 94q10-4 34-4 26 0 50 6-66 14-108 66t-42 120l0 2q36-20 84-24-84 58-84 158 0 48 26 94 154-188 390-196-6 18-6 42 0 78 55 133t135 55q82 0 136-58 60 12 120 44-20-66-82-104 56 8 108 30z" horiz-adv-x="920" />
--- a/public/fonts/fontello.ttf
+++ b/public/fonts/fontello.ttf
--- a/public/fonts/fontello.woff
+++ b/public/fonts/fontello.woff
--- a/public/fonts/fontello.woff2
+++ b/public/fonts/fontello.woff2
--- a/public/js/infiniteScroll.js
+++ b/public/js/infiniteScroll.js
@@ -1,82 +1,77 @@
 // @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
 // SPDX-License-Identifier: AGPL-3.0-only
 function insertBeforeLast(node, elem) {
-  node.insertBefore(elem, node.childNodes[node.childNodes.length - 2]);
+    node.insertBefore(elem, node.childNodes[node.childNodes.length - 2]);
 }

 function getLoadMore(doc) {
-  return doc.querySelector(".show-more:not(.timeline-item)");
+    return doc.querySelector(".show-more:not(.timeline-item)");
 }

 function isDuplicate(item, itemClass) {
-  const tweet = item.querySelector(".tweet-link");
-  if (tweet == null) return false;
-  const href = tweet.getAttribute("href");
-  return (
-    document.querySelector(itemClass + " .tweet-link[href='" + href + "']") !=
-    null
-  );
+    const tweet = item.querySelector(".tweet-link");
+    if (tweet == null) return false;
+    const href = tweet.getAttribute("href");
+    return document.querySelector(itemClass + " .tweet-link[href='" + href + "']") != null;
 }

 window.onload = function () {
-  const url = window.location.pathname;
-  const isTweet = url.indexOf("/status/") !== -1;
-  const containerClass = isTweet ? ".replies" : ".timeline";
-  const itemClass = containerClass + " > div:not(.top-ref)";
+    const url = window.location.pathname;
+    const isTweet = url.indexOf("/status/") !== -1;
+    const containerClass = isTweet ? ".replies" : ".timeline";
+    const itemClass = containerClass + " > div:not(.top-ref)";

-  var html = document.querySelector("html");
-  var container = document.querySelector(containerClass);
-  var loading = false;
+    var html = document.querySelector("html");
+    var container = document.querySelector(containerClass);
+    var loading = false;

-  function handleScroll(failed) {
-    if (loading) return;
+    function handleScroll(failed) {
+        if (loading) return;

-    if (html.scrollTop + html.clientHeight >= html.scrollHeight - 3000) {
-      loading = true;
-      var loadMore = getLoadMore(document);
-      if (loadMore == null) return;
+        if (html.scrollTop + html.clientHeight >= html.scrollHeight - 3000) {
+            loading = true;
+            var loadMore = getLoadMore(document);
+            if (loadMore == null) return;

-      loadMore.children[0].text = "Loading...";
+            loadMore.children[0].text = "Loading...";

-      var url = new URL(loadMore.children[0].href);
-      url.searchParams.append("scroll", "true");
+            var url = new URL(loadMore.children[0].href);
+            url.searchParams.append("scroll", "true");

-      fetch(url.toString())
-        .then(function (response) {
-          if (response.status > 299) throw "error";
-          return response.text();
-        })
-        .then(function (html) {
-          var parser = new DOMParser();
-          var doc = parser.parseFromString(html, "text/html");
-          loadMore.remove();
+            fetch(url.toString()).then(function (response) {
+                if (response.status === 404) throw "error";

-          for (var item of doc.querySelectorAll(itemClass)) {
-            if (item.className == "timeline-item show-more") continue;
-            if (isDuplicate(item, itemClass)) continue;
-            if (isTweet) container.appendChild(item);
-            else insertBeforeLast(container, item);
-          }
+                return response.text();
+            }).then(function (html) {
+                var parser = new DOMParser();
+                var doc = parser.parseFromString(html, "text/html");
+                loadMore.remove();

-          loading = false;
-          const newLoadMore = getLoadMore(doc);
-          if (newLoadMore == null) return;
-          if (isTweet) container.appendChild(newLoadMore);
-          else insertBeforeLast(container, newLoadMore);
-        })
-        .catch(function (err) {
-          console.warn("Something went wrong.", err);
-          if (failed > 3) {
-            loadMore.children[0].text = "Error";
-            return;
-          }
+                for (var item of doc.querySelectorAll(itemClass)) {
+                    if (item.className == "timeline-item show-more") continue;
+                    if (isDuplicate(item, itemClass)) continue;
+                    if (isTweet) container.appendChild(item);
+                    else insertBeforeLast(container, item);
+                }

-          loading = false;
-          handleScroll((failed || 0) + 1);
-        });
+                loading = false;
+                const newLoadMore = getLoadMore(doc);
+                if (newLoadMore == null) return;
+                if (isTweet) container.appendChild(newLoadMore);
+                else insertBeforeLast(container, newLoadMore);
+            }).catch(function (err) {
+                console.warn("Something went wrong.", err);
+                if (failed > 3) {
+                    loadMore.children[0].text = "Error";
+                    return;
+                }
+
+                loading = false;
+                handleScroll((failed || 0) + 1);
+            });
+        }
    }
-  }

-  window.addEventListener("scroll", () => handleScroll());
+    window.addEventListener("scroll", () => handleScroll());
 };
 // @license-end
--- a/src/api.nim
+++ b/src/api.nim
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, httpclient, strutils, sequtils, sugar
+import asyncdispatch, httpclient, uri, strutils, sequtils, sugar, tables
 import packedjson
 import types, query, formatters, consts, apiutils, parser
 import experimental/parser as newParser
@@ -11,92 +11,88 @@ proc genParams(variables: string; fieldToggles = ""): seq[(string, string)] =
  if fieldToggles.len > 0:
    result.add ("fieldToggles", fieldToggles)

-proc apiUrl(endpoint, variables: string; fieldToggles = ""): ApiUrl =
-  return ApiUrl(endpoint: endpoint, params: genParams(variables, fieldToggles))
-
-proc apiReq(endpoint, variables: string; fieldToggles = ""): ApiReq =
-  let url = apiUrl(endpoint, variables, fieldToggles)
-  return ApiReq(cookie: url, oauth: url)
-
-proc mediaUrl(id: string; cursor: string): ApiReq =
-  result = ApiReq(
-    cookie: apiUrl(graphUserMedia, userMediaVars % [id, cursor]),
-    oauth: apiUrl(graphUserMediaV2, restIdVars % [id, cursor])
+proc mediaUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = userMediaVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphUserMedia ? genParams(cookieVariables),
+    oauthUrl: graphUserMediaV2 ? genParams(oauthVariables)
  )

-proc userTweetsUrl(id: string; cursor: string): ApiReq =
-  result = ApiReq(
-    # cookie: apiUrl(graphUserTweets, userTweetsVars % [id, cursor], userTweetsFieldToggles),
-    oauth: apiUrl(graphUserTweetsV2, restIdVars % [id, cursor])
+proc userTweetsUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = userTweetsVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
+  result = SessionAwareUrl(
+    # cookieUrl: graphUserTweets ? genParams(cookieVariables, fieldToggles),
+    oauthUrl: graphUserTweetsV2 ? genParams(oauthVariables)
  )
  # might change this in the future pending testing
-  result.cookie = result.oauth
+  result.cookieUrl = result.oauthUrl

-proc userTweetsAndRepliesUrl(id: string; cursor: string): ApiReq =
-  let cookieVars = userTweetsAndRepliesVars % [id, cursor]
-  result = ApiReq(
-    cookie: apiUrl(graphUserTweetsAndReplies, cookieVars, userTweetsFieldToggles),
-    oauth: apiUrl(graphUserTweetsAndRepliesV2, restIdVars % [id, cursor])
+proc userTweetsAndRepliesUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = userTweetsAndRepliesVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphUserTweetsAndReplies ? genParams(cookieVariables, fieldToggles),
+    oauthUrl: graphUserTweetsAndRepliesV2 ? genParams(oauthVariables)
  )

-proc tweetDetailUrl(id: string; cursor: string): ApiReq =
-  let cookieVars = tweetDetailVars % [id, cursor]
-  result = ApiReq(
-    # cookie: apiUrl(graphTweetDetail, cookieVars, tweetDetailFieldToggles),
-    cookie: apiUrl(graphTweet, tweetVars % [id, cursor]),
-    oauth: apiUrl(graphTweet, tweetVars % [id, cursor])
-  )
-
-proc userUrl(username: string): ApiReq =
-  let cookieVars = """{"screen_name":"$1","withGrokTranslatedBio":false}""" % username
-  result = ApiReq(
-    cookie: apiUrl(graphUser, cookieVars, tweetDetailFieldToggles),
-    oauth: apiUrl(graphUserV2, """{"screen_name": "$1"}""" % username)
+proc tweetDetailUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = tweetDetailVariables % [id, cursor]
+    oauthVariables = tweetVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphTweetDetail ? genParams(cookieVariables, tweetDetailFieldToggles),
+    oauthUrl: graphTweet ? genParams(oauthVariables)
  )

 proc getGraphUser*(username: string): Future[User] {.async.} =
  if username.len == 0: return
-  let js = await fetchRaw(userUrl(username))
+  let
+    url = graphUser ? genParams("""{"screen_name": "$1"}""" % username)
+    js = await fetchRaw(url, Api.userScreenName)
  result = parseGraphUser(js)

 proc getGraphUserById*(id: string): Future[User] {.async.} =
  if id.len == 0 or id.any(c => not c.isDigit): return
  let
-    url = apiReq(graphUserById, """{"rest_id": "$1"}""" % id)
-    js = await fetchRaw(url)
+    url = graphUserById ? genParams("""{"rest_id": "$1"}""" % id)
+    js = await fetchRaw(url, Api.userRestId)
  result = parseGraphUser(js)

 proc getGraphUserTweets*(id: string; kind: TimelineKind; after=""): Future[Profile] {.async.} =
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    url = case kind
-      of TimelineKind.tweets: userTweetsUrl(id, cursor)
-      of TimelineKind.replies: userTweetsAndRepliesUrl(id, cursor)
-      of TimelineKind.media: mediaUrl(id, cursor)
-    js = await fetch(url)
+    js = case kind
+      of TimelineKind.tweets:
+        await fetch(userTweetsUrl(id, cursor), Api.userTweets)
+      of TimelineKind.replies:
+        await fetch(userTweetsAndRepliesUrl(id, cursor), Api.userTweetsAndReplies)
+      of TimelineKind.media:
+        await fetch(mediaUrl(id, cursor), Api.userMedia)
  result = parseGraphTimeline(js, after)

 proc getGraphListTweets*(id: string; after=""): Future[Timeline] {.async.} =
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    url = apiReq(graphListTweets, restIdVars % [id, cursor])
-    js = await fetch(url)
-  result = parseGraphTimeline(js, after).tweets
+    url = graphListTweets ? genParams(restIdVariables % [id, cursor])
+  result = parseGraphTimeline(await fetch(url, Api.listTweets), after).tweets

 proc getGraphListBySlug*(name, list: string): Future[List] {.async.} =
  let
    variables = %*{"screenName": name, "listSlug": list}
-    url = apiReq(graphListBySlug, $variables)
-    js = await fetch(url)
-  result = parseGraphList(js)
+    url = graphListBySlug ? genParams($variables)
+  result = parseGraphList(await fetch(url, Api.listBySlug))

 proc getGraphList*(id: string): Future[List] {.async.} =
-  let 
-    url = apiReq(graphListById, """{"listId": "$1"}""" % id)
-    js = await fetch(url)
-  result = parseGraphList(js)
+  let
+    url = graphListById ? genParams("""{"listId": "$1"}""" % id)
+  result = parseGraphList(await fetch(url, Api.list))

 proc getGraphListMembers*(list: List; after=""): Future[Result[User]] {.async.} =
  if list.id.len == 0: return
@@ -110,23 +106,22 @@ proc getGraphListMembers*(list: List; after=""): Future[Result[User]] {.async.}
    }
  if after.len > 0:
    variables["cursor"] = % after
-  let 
-    url = apiReq(graphListMembers, $variables)
-    js = await fetchRaw(url)
-  result = parseGraphListMembers(js, after)
+  let url = graphListMembers ? genParams($variables)
+  result = parseGraphListMembers(await fetchRaw(url, Api.listMembers), after)

 proc getGraphTweetResult*(id: string): Future[Tweet] {.async.} =
  if id.len == 0: return
  let
-    url = apiReq(graphTweetResult, """{"rest_id": "$1"}""" % id)
-    js = await fetch(url)
+    variables = """{"rest_id": "$1"}""" % id
+    params = {"variables": variables, "features": gqlFeatures}
+    js = await fetch(graphTweetResult ? params, Api.tweetResult)
  result = parseGraphTweetResult(js)

 proc getGraphTweet(id: string; after=""): Future[Conversation] {.async.} =
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    js = await fetch(tweetDetailUrl(id, cursor))
+    js = await fetch(tweetDetailUrl(id, cursor), Api.tweetDetail)
  result = parseGraphConversation(js, id)

 proc getReplies*(id, after: string): Future[Result[Chain]] {.async.} =
@@ -138,13 +133,6 @@ proc getTweet*(id: string; after=""): Future[Conversation] {.async.} =
  if after.len > 0:
    result.replies = await getReplies(id, after)

-proc getGraphEditHistory*(id: string): Future[EditHistory] {.async.} =
-  if id.len == 0: return
-  let
-    url = apiReq(graphTweetEditHistory, tweetEditHistoryVars % id)
-    js = await fetch(url)
-  result = parseGraphEditHistory(js, id)
-
 proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
  let q = genQueryParam(query)
  if q.len == 0 or q == emptyQuery:
@@ -162,18 +150,10 @@ proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
    }
  if after.len > 0:
    variables["cursor"] = % after
-  let 
-    url = apiReq(graphSearchTimeline, $variables)
-    js = await fetch(url)
-  result = parseGraphSearch[Tweets](js, after)
+  let url = graphSearchTimeline ? genParams($variables)
+  result = parseGraphSearch[Tweets](await fetch(url, Api.search), after)
  result.query = query

-  # when no more items are available the API just returns the last page in
-  # full. this detects that and clears the page instead.
-  if after.len > 0 and result.bottom.len > 0 and 
-     after[0..<64] == result.bottom[0..<64]:
-    result.content.setLen(0)
-
 proc getGraphUserSearch*(query: Query; after=""): Future[Result[User]] {.async.} =
  if query.text.len == 0:
    return Result[User](query: query, beginning: true)
@@ -192,15 +172,13 @@ proc getGraphUserSearch*(query: Query; after=""): Future[Result[User]] {.async.}
    variables["cursor"] = % after
    result.beginning = false

-  let 
-    url = apiReq(graphSearchTimeline, $variables)
-    js = await fetch(url)
-  result = parseGraphSearch[User](js, after)
+  let url = graphSearchTimeline ? genParams($variables)
+  result = parseGraphSearch[User](await fetch(url, Api.search), after)
  result.query = query

 proc getPhotoRail*(id: string): Future[PhotoRail] {.async.} =
  if id.len == 0: return
-  let js = await fetch(mediaUrl(id, ""))
+  let js = await fetch(mediaUrl(id, ""), Api.userMedia)
  result = parseGraphPhotoRail(js)

 proc resolve*(url: string; prefs: Prefs): Future[string] {.async.} =
--- a/src/apiutils.nim
+++ b/src/apiutils.nim
@@ -1,38 +1,16 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 import httpclient, asyncdispatch, options, strutils, uri, times, math, tables
 import jsony, packedjson, zippy, oauth1
-import types, auth, consts, parserutils, http_pool, tid
+import types, auth, consts, parserutils, http_pool
 import experimental/types/common

 const
  rlRemaining = "x-rate-limit-remaining"
  rlReset = "x-rate-limit-reset"
  rlLimit = "x-rate-limit-limit"
-  errorsToSkip = {null, doesntExist, tweetNotFound, timeout, unauthorized, badRequest}
+  errorsToSkip = {doesntExist, tweetNotFound, timeout, unauthorized, badRequest}

-var 
-  pool: HttpPool
-  disableTid: bool
-  apiProxy: string
-
-proc setDisableTid*(disable: bool) =
-  disableTid = disable
-
-proc setApiProxy*(url: string) =
-  apiProxy = ""
-  if url.len > 0:
-    apiProxy = url.strip(chars={'/'}) & "/"
-    if "http" notin apiProxy:
-      apiProxy = "http://" & apiProxy
-
-proc toUrl(req: ApiReq; sessionKind: SessionKind): Uri =
-  case sessionKind
-  of oauth:  
-    let o = req.oauth
-    parseUri("https://api.x.com/graphql")   / o.endpoint ? o.params
-  of cookie: 
-    let c = req.cookie
-    parseUri("https://x.com/i/api/graphql") / c.endpoint ? c.params
+var pool: HttpPool

 proc getOauthHeader(url, oauthToken, oauthTokenSecret: string): string =
  let
@@ -54,41 +32,31 @@ proc getOauthHeader(url, oauthToken, oauthTokenSecret: string): string =
 proc getCookieHeader(authToken, ct0: string): string =
  "auth_token=" & authToken & "; ct0=" & ct0

-proc genHeaders*(session: Session, url: Uri): Future[HttpHeaders] {.async.} =
+proc genHeaders*(session: Session, url: string): HttpHeaders =
  result = newHttpHeaders({
-    "accept": "*/*",
-    "accept-encoding": "gzip",
-    "accept-language": "en-US,en;q=0.9",
    "connection": "keep-alive",
    "content-type": "application/json",
-    "origin": "https://x.com",
-    "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
    "x-twitter-active-user": "yes",
    "x-twitter-client-language": "en",
-    "priority": "u=1, i"
+    "authority": "api.x.com",
+    "accept-encoding": "gzip",
+    "accept-language": "en-US,en;q=0.9",
+    "accept": "*/*",
+    "DNT": "1",
+    "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"
  })

  case session.kind
  of SessionKind.oauth:
-    result["authorization"] = getOauthHeader($url, session.oauthToken, session.oauthSecret)
+    result["authorization"] = getOauthHeader(url, session.oauthToken, session.oauthSecret)
  of SessionKind.cookie:
+    result["authorization"] = "Bearer AAAAAAAAAAAAAAAAAAAAAFQODgEAAAAAVHTp76lzh3rFzcHbmHVvQxYYpTw%3DckAlMINMjmCwxUcaXbAN4XqJVdgMJaHqNOFgPMK0zN1qLqLQCF"
    result["x-twitter-auth-type"] = "OAuth2Session"
    result["x-csrf-token"] = session.ct0
    result["cookie"] = getCookieHeader(session.authToken, session.ct0)
-    result["sec-ch-ua"] = """"Google Chrome";v="142", "Chromium";v="142", "Not A(Brand";v="24""""
-    result["sec-ch-ua-mobile"] = "?0"
-    result["sec-ch-ua-platform"] = "Windows"
-    result["sec-fetch-dest"] = "empty"
-    result["sec-fetch-mode"] = "cors"
-    result["sec-fetch-site"] = "same-site"
-    if disableTid:
-      result["authorization"] = bearerToken2
-    else:
-      result["authorization"] = bearerToken
-      result["x-client-transaction-id"] = await genTid(url.path)

-proc getAndValidateSession*(req: ApiReq): Future[Session] {.async.} =
-  result = await getSession(req)
+proc getAndValidateSession*(api: Api): Future[Session] {.async.} =
+  result = await getSession(api)
  case result.kind
  of SessionKind.oauth:
    if result.oauthToken.len == 0:
@@ -105,13 +73,9 @@ template fetchImpl(result, fetchBody) {.dirty.} =

  try:
    var resp: AsyncResponse
-    pool.use(await genHeaders(session, url)):
+    pool.use(genHeaders(session, $url)):
      template getContent =
-        # TODO: this is a temporary simple implementation
-        if apiProxy.len > 0:
-          resp = await c.get(($url).replace("https://", apiProxy))
-        else:
-          resp = await c.get($url)
+        resp = await c.get($url)
        result = await resp.body

      getContent()
@@ -125,7 +89,7 @@ template fetchImpl(result, fetchBody) {.dirty.} =
        remaining = parseInt(resp.headers[rlRemaining])
        reset = parseInt(resp.headers[rlReset])
        limit = parseInt(resp.headers[rlLimit])
-      session.setRateLimit(req, remaining, reset, limit)
+      session.setRateLimit(api, remaining, reset, limit)

    if result.len > 0:
      if resp.headers.getOrDefault("content-encoding") == "gzip":
@@ -134,22 +98,24 @@ template fetchImpl(result, fetchBody) {.dirty.} =
      if result.startsWith("{\"errors"):
        let errors = result.fromJson(Errors)
        if errors notin errorsToSkip:
-          echo "Fetch error, API: ", url.path, ", errors: ", errors
+          echo "Fetch error, API: ", api, ", errors: ", errors
          if errors in {expiredToken, badToken, locked}:
            invalidate(session)
            raise rateLimitError()
          elif errors in {rateLimited}:
            # rate limit hit, resets after 24 hours
-            setLimited(session, req)
+            setLimited(session, api)
            raise rateLimitError()
      elif result.startsWith("429 Too Many Requests"):
-        echo "[sessions] 429 error, API: ", url.path, ", session: ", session.pretty
+        echo "[sessions] 429 error, API: ", api, ", session: ", session.pretty
+        session.apis[api].remaining = 0
+        # rate limit hit, resets after the 15 minute window
        raise rateLimitError()

    fetchBody

    if resp.status == $Http400:
-      echo "ERROR 400, ", url.path, ": ", result
+      echo "ERROR 400, ", api, ": ", result
      raise newException(InternalError, $url)
  except InternalError as e:
    raise e
@@ -168,16 +134,19 @@ template retry(bod) =
  try:
    bod
  except RateLimitError:
-    echo "[sessions] Rate limited, retrying ", req.cookie.endpoint, " request..."
+    echo "[sessions] Rate limited, retrying ", api, " request..."
    bod

-proc fetch*(req: ApiReq): Future[JsonNode] {.async.} =
+proc fetch*(url: Uri | SessionAwareUrl; api: Api): Future[JsonNode] {.async.} =
  retry:
    var 
      body: string
-      session = await getAndValidateSession(req)
+      session = await getAndValidateSession(api)

-    let url = req.toUrl(session.kind)
+    when url is SessionAwareUrl:
+      let url = case session.kind
+        of SessionKind.oauth: url.oauthUrl
+        of SessionKind.cookie: url.cookieUrl

    fetchImpl body:
      if body.startsWith('{') or body.startsWith('['):
@@ -188,15 +157,19 @@ proc fetch*(req: ApiReq): Future[JsonNode] {.async.} =

      let error = result.getError
      if error != null and error notin errorsToSkip:
-        echo "Fetch error, API: ", url.path, ", error: ", error
+        echo "Fetch error, API: ", api, ", error: ", error
        if error in {expiredToken, badToken, locked}:
          invalidate(session)
          raise rateLimitError()

-proc fetchRaw*(req: ApiReq): Future[string] {.async.} =
+proc fetchRaw*(url: Uri | SessionAwareUrl; api: Api): Future[string] {.async.} =
  retry:
-    var session = await getAndValidateSession(req)
-    let url = req.toUrl(session.kind)
+    var session = await getAndValidateSession(api)
+
+    when url is SessionAwareUrl:
+      let url = case session.kind
+        of SessionKind.oauth: url.oauthUrl
+        of SessionKind.cookie: url.cookieUrl

    fetchImpl result:
      if not (result.startsWith('{') or result.startsWith('[')):
--- a/src/auth.nim
+++ b/src/auth.nim
@@ -1,28 +1,20 @@
 #SPDX-License-Identifier: AGPL-3.0-only
-import std/[asyncdispatch, times, json, random, strutils, tables, packedsets, os]
-import types, consts
+import std/[asyncdispatch, times, json, random, sequtils, strutils, tables, packedsets, os]
+import types
 import experimental/parser/session

-const hourInSeconds = 60 * 60
+# max requests at a time per session to avoid race conditions
+const
+  maxConcurrentReqs = 2
+  hourInSeconds = 60 * 60

 var
  sessionPool: seq[Session]
  enableLogging = false
-  # max requests at a time per session to avoid race conditions
-  maxConcurrentReqs = 2
-
-proc setMaxConcurrentReqs*(reqs: int) =
-  if reqs > 0:
-    maxConcurrentReqs = reqs

 template log(str: varargs[string, `$`]) =
  echo "[sessions] ", str.join("")

-proc endpoint(req: ApiReq; session: Session): string =
-  case session.kind
-  of oauth: req.oauth.endpoint
-  of cookie: req.cookie.endpoint
-
 proc pretty*(session: Session): string =
  if session.isNil:
    return "<null>"
@@ -130,12 +122,11 @@ proc rateLimitError*(): ref RateLimitError =
 proc noSessionsError*(): ref NoSessionsError =
  newException(NoSessionsError, "no sessions available")

-proc isLimited(session: Session; req: ApiReq): bool =
+proc isLimited(session: Session; api: Api): bool =
  if session.isNil:
    return true

-  let api = req.endpoint(session)
-  if session.limited and api != graphUserTweetsV2:
+  if session.limited and api != Api.userTweets:
    if (epochTime().int - session.limitedAt) > hourInSeconds:
      session.limited = false
      log "resetting limit: ", session.pretty
@@ -149,8 +140,8 @@ proc isLimited(session: Session; req: ApiReq): bool =
  else:
    return false

-proc isReady(session: Session; req: ApiReq): bool =
-  not (session.isNil or session.pending > maxConcurrentReqs or session.isLimited(req))
+proc isReady(session: Session; api: Api): bool =
+  not (session.isNil or session.pending > maxConcurrentReqs or session.isLimited(api))

 proc invalidate*(session: var Session) =
  if session.isNil: return
@@ -165,26 +156,24 @@ proc release*(session: Session) =
  if session.isNil: return
  dec session.pending

-proc getSession*(req: ApiReq): Future[Session] {.async.} =
+proc getSession*(api: Api): Future[Session] {.async.} =
  for i in 0 ..< sessionPool.len:
-    if result.isReady(req): break
+    if result.isReady(api): break
    result = sessionPool.sample()

-  if not result.isNil and result.isReady(req):
+  if not result.isNil and result.isReady(api):
    inc result.pending
  else:
-    log "no sessions available for API: ", req.cookie.endpoint
+    log "no sessions available for API: ", api
    raise noSessionsError()

-proc setLimited*(session: Session; req: ApiReq) =
-  let api = req.endpoint(session)
+proc setLimited*(session: Session; api: Api) =
  session.limited = true
  session.limitedAt = epochTime().int
  log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", ", session.pretty

-proc setRateLimit*(session: Session; req: ApiReq; remaining, reset, limit: int) =
+proc setRateLimit*(session: Session; api: Api; remaining, reset, limit: int) =
  # avoid undefined behavior in race conditions
-  let api = req.endpoint(session)
  if api in session.apis:
    let rateLimit = session.apis[api]
    if rateLimit.reset >= reset and rateLimit.remaining < remaining:
--- a/src/config.nim
+++ b/src/config.nim
@@ -13,8 +13,6 @@ proc get*[T](config: parseCfg.Config; section, key: string; default: T): T =
 proc getConfig*(path: string): (Config, parseCfg.Config) =
  var cfg = loadConfig(path)

-  let masterRss = cfg.get("Config", "enableRSS", true)
-
  let conf = Config(
    # Server
    address: cfg.get("Server", "address", "0.0.0.0"),
@@ -39,17 +37,10 @@ proc getConfig*(path: string): (Config, parseCfg.Config) =
    hmacKey: cfg.get("Config", "hmacKey", "secretkey"),
    base64Media: cfg.get("Config", "base64Media", false),
    minTokens: cfg.get("Config", "tokenCount", 10),
-    enableRSSUserTweets: masterRss and cfg.get("Config", "enableRSSUserTweets", true),
-    enableRSSUserReplies: masterRss and cfg.get("Config", "enableRSSUserReplies", true),
-    enableRSSUserMedia: masterRss and cfg.get("Config", "enableRSSUserMedia", true),
-    enableRSSSearch: masterRss and cfg.get("Config", "enableRSSSearch", true),
-    enableRSSList: masterRss and cfg.get("Config", "enableRSSList", true),
+    enableRss: cfg.get("Config", "enableRSS", true),
    enableDebug: cfg.get("Config", "enableDebug", false),
    proxy: cfg.get("Config", "proxy", ""),
-    proxyAuth: cfg.get("Config", "proxyAuth", ""),
-    apiProxy: cfg.get("Config", "apiProxy", ""),
-    disableTid: cfg.get("Config", "disableTid", false),
-    maxConcurrentReqs: cfg.get("Config", "maxConcurrentReqs", 2)
+    proxyAuth: cfg.get("Config", "proxyAuth", "")
  )

  return (conf, cfg)
--- a/src/consts.nim
+++ b/src/consts.nim
@@ -1,96 +1,62 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import strutils
+import uri, strutils

 const
  consumerKey* = "3nVuSoBZnx6U4vzUxf5w"
  consumerSecret* = "Bcs59EFbbsdF6Sl9Ng71smgStWEGwXXKSjYvPVt7qys"
-  bearerToken* = "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
-  bearerToken2* = "Bearer AAAAAAAAAAAAAAAAAAAAAFXzAwAAAAAAMHCxpeSDG1gLNLghVe8d74hl6k4%3DRUMF4xAQLsbeBhTSRrCiQpJtxoGWeyHrDb5te2jpGskWDFW82F"

-  graphUser* = "-oaLodhGbbnzJBACb1kk2Q/UserByScreenName"
-  graphUserV2* = "WEoGnYB0EG1yGwamDCF6zg/UserResultByScreenNameQuery"
-  graphUserById* = "VN33vKXrPT7p35DgNR27aw/UserResultByIdQuery"
-  graphUserTweetsV2* = "6QdSuZ5feXxOadEdXa4XZg/UserWithProfileTweetsQueryV2"
-  graphUserTweetsAndRepliesV2* = "BDX77Xzqypdt11-mDfgdpQ/UserWithProfileTweetsAndRepliesQueryV2"
-  graphUserTweets* = "oRJs8SLCRNRbQzuZG93_oA/UserTweets"
-  graphUserTweetsAndReplies* = "kkaJ0Mf34PZVarrxzLihjg/UserTweetsAndReplies"
-  graphUserMedia* = "36oKqyQ7E_9CmtONGjJRsA/UserMedia"
-  graphUserMediaV2* = "bp0e_WdXqgNBIwlLukzyYA/MediaTimelineV2"
-  graphTweet* = "Y4Erk_-0hObvLpz0Iw3bzA/ConversationTimeline"
-  graphTweetDetail* = "YVyS4SfwYW7Uw5qwy0mQCA/TweetDetail"
-  graphTweetResult* = "nzme9KiYhfIOrrLrPP_XeQ/TweetResultByIdQuery"
-  graphTweetEditHistory* = "upS9teTSG45aljmP9oTuXA/TweetEditHistory"
-  graphSearchTimeline* = "bshMIjqDk8LTXTq4w91WKw/SearchTimeline"
-  graphListById* = "cIUpT1UjuGgl_oWiY7Snhg/ListByRestId"
-  graphListBySlug* = "K6wihoTiTrzNzSF8y1aeKQ/ListBySlug"
-  graphListMembers* = "fuVHh5-gFn8zDBBxb8wOMA/ListMembers"
-  graphListTweets* = "VQf8_XQynI3WzH6xopOMMQ/ListTimeline"
+  gql = parseUri("https://api.x.com") / "graphql"
+
+  graphUser* = gql / "WEoGnYB0EG1yGwamDCF6zg/UserResultByScreenNameQuery"
+  graphUserById* = gql / "VN33vKXrPT7p35DgNR27aw/UserResultByIdQuery"
+  graphUserTweetsV2* = gql / "6QdSuZ5feXxOadEdXa4XZg/UserWithProfileTweetsQueryV2"
+  graphUserTweetsAndRepliesV2* = gql / "BDX77Xzqypdt11-mDfgdpQ/UserWithProfileTweetsAndRepliesQueryV2"
+  graphUserTweets* = gql / "oRJs8SLCRNRbQzuZG93_oA/UserTweets"
+  graphUserTweetsAndReplies* = gql / "kkaJ0Mf34PZVarrxzLihjg/UserTweetsAndReplies"
+  graphUserMedia* = gql / "36oKqyQ7E_9CmtONGjJRsA/UserMedia"
+  graphUserMediaV2* = gql / "bp0e_WdXqgNBIwlLukzyYA/MediaTimelineV2"
+  graphTweet* = gql / "Y4Erk_-0hObvLpz0Iw3bzA/ConversationTimeline"
+  graphTweetDetail* = gql / "YVyS4SfwYW7Uw5qwy0mQCA/TweetDetail"
+  graphTweetResult* = gql / "nzme9KiYhfIOrrLrPP_XeQ/TweetResultByIdQuery"
+  graphSearchTimeline* = gql / "bshMIjqDk8LTXTq4w91WKw/SearchTimeline"
+  graphListById* = gql / "cIUpT1UjuGgl_oWiY7Snhg/ListByRestId"
+  graphListBySlug* = gql / "K6wihoTiTrzNzSF8y1aeKQ/ListBySlug"
+  graphListMembers* = gql / "fuVHh5-gFn8zDBBxb8wOMA/ListMembers"
+  graphListTweets* = gql / "VQf8_XQynI3WzH6xopOMMQ/ListTimeline"

  gqlFeatures* = """{
  "android_ad_formats_media_component_render_overlay_enabled": false,
  "android_graphql_skip_api_media_color_palette": false,
  "android_professional_link_spotlight_display_enabled": false,
-  "articles_api_enabled": false,
-  "articles_preview_enabled": true,
  "blue_business_profile_image_shape_enabled": false,
-  "c9s_tweet_anatomy_moderator_badge_enabled": true,
  "commerce_android_shop_module_enabled": false,
-  "communities_web_enable_tweet_community_results_fetch": true,
-  "creator_subscriptions_quote_tweet_preview_enabled": false,
  "creator_subscriptions_subscription_count_enabled": false,
  "creator_subscriptions_tweet_preview_api_enabled": true,
  "freedom_of_speech_not_reach_fetch_enabled": true,
  "graphql_is_translatable_rweb_tweet_is_translatable_enabled": true,
-  "grok_android_analyze_trend_fetch_enabled": false,
-  "grok_translations_community_note_auto_translation_is_enabled": false,
-  "grok_translations_community_note_translation_is_enabled": false,
-  "grok_translations_post_auto_translation_is_enabled": false,
-  "grok_translations_timeline_user_bio_auto_translation_is_enabled": false,
  "hidden_profile_likes_enabled": false,
  "highlights_tweets_tab_ui_enabled": false,
-  "immersive_video_status_linkable_timestamps": false,
  "interactive_text_enabled": false,
  "longform_notetweets_consumption_enabled": true,
  "longform_notetweets_inline_media_enabled": true,
-  "longform_notetweets_richtext_consumption_enabled": true,
  "longform_notetweets_rich_text_read_enabled": true,
+  "longform_notetweets_richtext_consumption_enabled": true,
  "mobile_app_spotlight_module_enabled": false,
-  "payments_enabled": false,
-  "post_ctas_fetch_enabled": true,
-  "premium_content_api_read_enabled": false,
-  "profile_label_improvements_pcf_label_in_post_enabled": true,
-  "profile_label_improvements_pcf_label_in_profile_enabled": false,
  "responsive_web_edit_tweet_api_enabled": true,
  "responsive_web_enhance_cards_enabled": false,
  "responsive_web_graphql_exclude_directive_enabled": true,
  "responsive_web_graphql_skip_user_profile_image_extensions_enabled": false,
  "responsive_web_graphql_timeline_navigation_enabled": true,
-  "responsive_web_grok_analysis_button_from_backend": true,
-  "responsive_web_grok_analyze_button_fetch_trends_enabled": false,
-  "responsive_web_grok_analyze_post_followups_enabled": true,
-  "responsive_web_grok_annotations_enabled": true,
-  "responsive_web_grok_community_note_auto_translation_is_enabled": false,
-  "responsive_web_grok_image_annotation_enabled": true,
-  "responsive_web_grok_imagine_annotation_enabled": true,
-  "responsive_web_grok_share_attachment_enabled": true,
-  "responsive_web_grok_show_grok_translated_post": false,
-  "responsive_web_jetfuel_frame": true,
  "responsive_web_media_download_video_enabled": false,
-  "responsive_web_profile_redirect_enabled": false,
  "responsive_web_text_conversations_enabled": false,
-  "responsive_web_twitter_article_notes_tab_enabled": false,
  "responsive_web_twitter_article_tweet_consumption_enabled": true,
+  "unified_cards_destination_url_params_enabled": false,
  "responsive_web_twitter_blue_verified_badge_is_enabled": true,
  "rweb_lists_timeline_redesign_enabled": true,
-  "rweb_tipjar_consumption_enabled": true,
-  "rweb_video_screen_enabled": false,
-  "rweb_video_timestamps_enabled": false,
  "spaces_2022_h2_clipping": true,
  "spaces_2022_h2_spaces_communities": true,
  "standardized_nudges_misinfo": true,
-  "subscriptions_feature_can_gift_premium": false,
  "subscriptions_verification_info_enabled": true,
-  "subscriptions_verification_info_is_identity_verified_enabled": false,
  "subscriptions_verification_info_reason_enabled": true,
  "subscriptions_verification_info_verified_since_enabled": true,
  "super_follow_badge_privacy_enabled": false,
@@ -101,24 +67,50 @@ const
  "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": true,
  "tweetypie_unmention_optimization_enabled": false,
  "unified_cards_ad_metadata_container_dynamic_card_content_query_enabled": false,
-  "unified_cards_destination_url_params_enabled": false,
  "verified_phone_label_enabled": false,
  "vibe_api_enabled": false,
  "view_counts_everywhere_api_enabled": true,
-  "hidden_profile_subscriptions_enabled": false
+  "premium_content_api_read_enabled": false,
+  "communities_web_enable_tweet_community_results_fetch": true,
+  "responsive_web_jetfuel_frame": true,
+  "responsive_web_grok_analyze_button_fetch_trends_enabled": false,
+  "responsive_web_grok_image_annotation_enabled": true,
+  "responsive_web_grok_imagine_annotation_enabled": true,
+  "rweb_tipjar_consumption_enabled": true,
+  "profile_label_improvements_pcf_label_in_post_enabled": true,
+  "creator_subscriptions_quote_tweet_preview_enabled": false,
+  "c9s_tweet_anatomy_moderator_badge_enabled": true,
+  "responsive_web_grok_analyze_post_followups_enabled": true,
+  "rweb_video_timestamps_enabled": false,
+  "responsive_web_grok_share_attachment_enabled": true,
+  "articles_preview_enabled": true,
+  "immersive_video_status_linkable_timestamps": false,
+  "articles_api_enabled": false,
+  "responsive_web_grok_analysis_button_from_backend": true,
+  "rweb_video_screen_enabled": false,
+  "payments_enabled": false,
+  "responsive_web_profile_redirect_enabled": false,
+  "responsive_web_grok_show_grok_translated_post": false,
+  "responsive_web_grok_community_note_auto_translation_is_enabled": false,
+  "profile_label_improvements_pcf_label_in_profile_enabled": false,
+  "grok_android_analyze_trend_fetch_enabled": false,
+  "grok_translations_community_note_auto_translation_is_enabled": false,
+  "grok_translations_post_auto_translation_is_enabled": false,
+  "grok_translations_community_note_translation_is_enabled": false,
+  "grok_translations_timeline_user_bio_auto_translation_is_enabled": false
 }""".replace(" ", "").replace("\n", "")

-  tweetVars* = """{
+  tweetVariables* = """{
  "postId": "$1",
  $2
  "includeHasBirdwatchNotes": false,
  "includePromotedContent": false,
-  "withBirdwatchNotes": true,
+  "withBirdwatchNotes": false,
  "withVoice": false,
  "withV2Timeline": true
 }""".replace(" ", "").replace("\n", "")

-  tweetDetailVars* = """{
+  tweetDetailVariables* = """{
  "focalTweetId": "$1",
  $2
  "referrer": "profile",
@@ -131,17 +123,12 @@ const
  "withVoice": true
 }""".replace(" ", "").replace("\n", "")

-  tweetEditHistoryVars* = """{
-  "tweetId": "$1",
-  "withQuickPromoteEligibilityTweetFields": true
-}""".replace(" ", "").replace("\n", "")
-
-  restIdVars* = """{
+  restIdVariables* = """{
  "rest_id": "$1", $2
  "count": 20
 }"""

-  userMediaVars* = """{
+  userMediaVariables* = """{
  "userId": "$1", $2
  "count": 20,
  "includePromotedContent": false,
@@ -150,7 +137,7 @@ const
  "withVoice": true
 }""".replace(" ", "").replace("\n", "")

-  userTweetsVars* = """{
+  userTweetsVariables* = """{
  "userId": "$1", $2
  "count": 20,
  "includePromotedContent": false,
@@ -158,7 +145,7 @@ const
  "withVoice": true
 }""".replace(" ", "").replace("\n", "")

-  userTweetsAndRepliesVars* = """{
+  userTweetsAndRepliesVariables* = """{
  "userId": "$1", $2
  "count": 20,
  "includePromotedContent": false,
@@ -166,6 +153,5 @@ const
  "withVoice": true
 }""".replace(" ", "").replace("\n", "")

-  userFieldToggles = """{"withPayments":false,"withAuxiliaryUserLabels":true}"""
-  userTweetsFieldToggles* = """{"withArticlePlainText":false}"""
+  fieldToggles* = """{"withArticlePlainText":false}"""
  tweetDetailFieldToggles* = """{"withArticleRichContentState":true,"withArticlePlainText":false,"withGrokAnalyze":false,"withDisallowedReplyControls":false}"""
--- a/src/experimental/parser/graphql.nim
+++ b/src/experimental/parser/graphql.nim
@@ -1,6 +1,6 @@
 import options, strutils
 import jsony
-import user, utils, ../types/[graphuser, graphlistmembers]
+import user, ../types/[graphuser, graphlistmembers]
 from ../../types import User, VerifiedType, Result, Query, QueryKind

 proc parseUserResult*(userResult: UserResult): User =
@@ -15,36 +15,22 @@ proc parseUserResult*(userResult: UserResult): User =
    result.fullname = userResult.core.name
    result.userPic = userResult.avatar.imageUrl.replace("_normal", "")

-    if userResult.privacy.isSome:
-      result.protected = userResult.privacy.get.protected
-
-    if userResult.location.isSome:
-      result.location = userResult.location.get.location
-
-    if userResult.core.createdAt.len > 0:
-      result.joinDate = parseTwitterDate(userResult.core.createdAt)
-
    if userResult.verification.isSome:
      let v = userResult.verification.get
      if v.verifiedType != VerifiedType.none:
        result.verifiedType = v.verifiedType

-    if userResult.profileBio.isSome and result.bio.len == 0:
+    if userResult.profileBio.isSome:
      result.bio = userResult.profileBio.get.description

 proc parseGraphUser*(json: string): User =
  if json.len == 0 or json[0] != '{':
    return

-  let 
-    raw = json.fromJson(GraphUser)
-    userResult = 
-      if raw.data.userResult.isSome: raw.data.userResult.get.result
-      elif raw.data.user.isSome: raw.data.user.get.result
-      else: UserResult()
+  let raw = json.fromJson(GraphUser)
+  let userResult = raw.data.userResult.result

-  if userResult.unavailableReason.get("") == "Suspended" or
-     userResult.reason.get("") == "Suspended":
+  if userResult.unavailableReason.get("") == "Suspended":
    return User(suspended: true)

  result = parseUserResult(userResult)
--- a/src/experimental/parser/slices.nim
+++ b/src/experimental/parser/slices.nim
@@ -54,7 +54,7 @@ proc replacedWith*(runes: seq[Rune]; repls: openArray[ReplaceSlice];
      let
        name = $runes[rep.slice.a.succ .. rep.slice.b]
        symbol = $runes[rep.slice.a]
-      result.add a(symbol & name, href = "/search?f=tweets&q=%23" & name)
+      result.add a(symbol & name, href = "/search?q=%23" & name)
    of rkMention:
      result.add a($runes[rep.slice], href = rep.url, title = rep.display)
    of rkUrl:
--- a/src/experimental/parser/tid.nim
+++ b/src/experimental/parser/tid.nim
@@ -1,8 +0,0 @@
-import jsony
-import ../types/tid
-export TidPair
-
-proc parseTidPairs*(raw: string): seq[TidPair] =
-  result = raw.fromJson(seq[TidPair])
-  if result.len == 0:
-    raise newException(ValueError, "Parsing pairs failed: " & raw)
--- a/src/experimental/parser/user.nim
+++ b/src/experimental/parser/user.nim
@@ -9,7 +9,7 @@ let
  unReplace = "$1<a href=\"/$2\">@$2</a>"

  htRegex = nre.re"""(*U)(^|[^\w-_.?])([#＃$])([\w_]*+)(?!</a>|">|#)"""
-  htReplace = "$1<a href=\"/search?f=tweets&q=%23$3\">$2$3</a>"
+  htReplace = "$1<a href=\"/search?q=%23$3\">$2$3</a>"

 proc expandUserEntities(user: var User; raw: RawUser) =
  let
@@ -58,13 +58,11 @@ proc toUser*(raw: RawUser): User =
    media: raw.mediaCount,
    verifiedType: raw.verifiedType,
    protected: raw.protected,
+    joinDate: parseTwitterDate(raw.createdAt),
    banner: getBanner(raw),
    userPic: getImageUrl(raw.profileImageUrlHttps).replace("_normal", "")
  )

-  if raw.createdAt.len > 0:
-    result.joinDate = parseTwitterDate(raw.createdAt)
-
  if raw.pinnedTweetIdsStr.len > 0:
    result.pinnedTweet = parseBiggestInt(raw.pinnedTweetIdsStr[0])

--- a/src/experimental/types/graphuser.nim
+++ b/src/experimental/types/graphuser.nim
@@ -3,7 +3,7 @@ from ../../types import User, VerifiedType

 type
  GraphUser* = object
-    data*: tuple[userResult: Option[UserData], user: Option[UserData]]
+    data*: tuple[userResult: UserData]

  UserData* = object
    result*: UserResult
@@ -22,24 +22,15 @@ type
  Verification* = object
    verifiedType*: VerifiedType

-  Location* = object
-    location*: string
-
-  Privacy* = object
-    protected*: bool
-
  UserResult* = object
    legacy*: User
    restId*: string
    isBlueVerified*: bool
+    unavailableReason*: Option[string]
    core*: UserCore
    avatar*: UserAvatar
-    unavailableReason*: Option[string]
-    reason*: Option[string]
-    privacy*: Option[Privacy]
    profileBio*: Option[UserBio]
    verification*: Option[Verification]
-    location*: Option[Location]

 proc enumHook*(s: string; v: var VerifiedType) =
  v = try:
--- a/src/experimental/types/tid.nim
+++ b/src/experimental/types/tid.nim
@@ -1,4 +0,0 @@
-type
-  TidPair* = object
-    animationKey*: string
-    verification*: string
--- a/src/formatters.nim
+++ b/src/formatters.nim
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import strutils, strformat, times, uri, tables, xmltree, htmlparser, htmlgen, math
+import strutils, strformat, times, uri, tables, xmltree, htmlparser, htmlgen
 import std/[enumerate, re]
 import types, utils, query

 const
  cards = "cards.twitter.com/cards"
  tco = "https://t.co"
-  twitter = parseUri("https://x.com")
+  twitter = parseUri("https://twitter.com")

 let
  twRegex = re"(?<=(?<!\S)https:\/\/|(?<=\s))(www\.|mobile\.)?twitter\.com"
@@ -59,28 +59,25 @@ proc replaceUrls*(body: string; prefs: Prefs; absolute=""): string =
  result = body

  if prefs.replaceYouTube.len > 0 and "youtu" in result:
-    let youtubeHost = strip(prefs.replaceYouTube, chars={'/'})
-    result = result.replace(ytRegex, youtubeHost)
+    result = result.replace(ytRegex, prefs.replaceYouTube)

  if prefs.replaceTwitter.len > 0:
-    let twitterHost = strip(prefs.replaceTwitter, chars={'/'})
    if tco in result:
-      result = result.replace(tco, https & twitterHost & "/t.co")
+      result = result.replace(tco, https & prefs.replaceTwitter & "/t.co")
    if "x.com" in result:
-      result = result.replace(xRegex, twitterHost)
+      result = result.replace(xRegex, prefs.replaceTwitter)
      result = result.replacef(xLinkRegex, a(
-        twitterHost & "$2", href = https & twitterHost & "$1"))
+        prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))
    if "twitter.com" in result:
-      result = result.replace(cards, twitterHost & "/cards")
-      result = result.replace(twRegex, twitterHost)
+      result = result.replace(cards, prefs.replaceTwitter & "/cards")
+      result = result.replace(twRegex, prefs.replaceTwitter)
      result = result.replacef(twLinkRegex, a(
-        twitterHost & "$2", href = https & twitterHost & "$1"))
+        prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))

  if prefs.replaceReddit.len > 0 and ("reddit.com" in result or "redd.it" in result):
-    let redditHost = strip(prefs.replaceReddit, chars={'/'})
-    result = result.replace(rdShortRegex, redditHost & "/comments/")
-    result = result.replace(rdRegex, redditHost)
-    if redditHost in result and "/gallery/" in result:
+    result = result.replace(rdShortRegex, prefs.replaceReddit & "/comments/")
+    result = result.replace(rdRegex, prefs.replaceReddit)
+    if prefs.replaceReddit in result and "/gallery/" in result:
      result = result.replace("/gallery/", "/comments/")

  if absolute.len > 0 and "href" in result:
@@ -154,28 +151,13 @@ proc getShortTime*(tweet: Tweet): string =
  else:
    result = "now"

-proc getDuration*(video: Video): string =
-  let 
-    ms = video.durationMs
-    sec = int(round(ms / 1000))
-    min = floorDiv(sec, 60)
-    hour = floorDiv(min, 60)
-  if hour > 0:
-    return &"{hour}:{min mod 60}:{sec mod 60:02}"
-  else:
-    return &"{min mod 60}:{sec mod 60:02}"
-
-proc getLink*(id: int64; username="i"; focus=true): string =
-  var username = username
-  if username.len == 0:
-    username = "i"
-  result = &"/{username}/status/{id}"
-  if focus: result &= "#m"
-
 proc getLink*(tweet: Tweet; focus=true): string =
  if tweet.id == 0: return
  var username = tweet.user.username
-  return getLink(tweet.id, username, focus)
+  if username.len == 0:
+    username = "i"
+  result = &"/{username}/status/{tweet.id}"
+  if focus: result &= "#m"

 proc getTwitterLink*(path: string; params: Table[string, string]): string =
  var
@@ -203,7 +185,7 @@ proc getTwitterLink*(path: string; params: Table[string, string]): string =
 proc getLocation*(u: User | Tweet): (string, string) =
  if "://" in u.location: return (u.location, "")
  let loc = u.location.split(":")
-  let url = if loc.len > 1: "/search?f=tweets&q=place:" & loc[1] else: ""
+  let url = if loc.len > 1: "/search?q=place:" & loc[1] else: ""
  (loc[0], url)

 proc getSuspended*(username: string): string =
--- a/src/nitter.nim
+++ b/src/nitter.nim
@@ -6,7 +6,7 @@ from os import getEnv

 import jester

-import types, config, prefs, formatters, redis_cache, http_pool, auth, apiutils
+import types, config, prefs, formatters, redis_cache, http_pool, auth
 import views/[general, about]
 import routes/[
  preferences, timeline, status, media, search, rss, list, debug,
@@ -37,9 +37,6 @@ setHmacKey(cfg.hmacKey)
 setProxyEncoding(cfg.base64Media)
 setMaxHttpConns(cfg.httpMaxConns)
 setHttpProxy(cfg.proxy, cfg.proxyAuth)
-setApiProxy(cfg.apiProxy)
-setDisableTid(cfg.disableTid)
-setMaxConcurrentReqs(cfg.maxConcurrentReqs)
 initAboutPage(cfg.staticDir)

 waitFor initRedisPool(cfg)
@@ -65,16 +62,11 @@ settings:
  reusePort = true

 routes:
-  before:
-    # skip all file URLs
-    cond "." notin request.path
-    applyUrlPrefs()
-
  get "/":
-    resp renderMain(renderSearch(), request, cfg, requestPrefs())
+    resp renderMain(renderSearch(), request, cfg, themePrefs())

  get "/about":
-    resp renderMain(renderAbout(), request, cfg, requestPrefs())
+    resp renderMain(renderAbout(), request, cfg, themePrefs())

  get "/explore":
    redirect("/about")
@@ -85,7 +77,7 @@ routes:
  get "/i/redirect":
    let url = decodeUrl(@"url")
    if url.len == 0: resp Http404
-    redirect(replaceUrls(url, requestPrefs()))
+    redirect(replaceUrls(url, cookiePrefs()))

  error Http404:
    resp Http404, showError("Page not found", cfg)
--- a/src/parser.nim
+++ b/src/parser.nim
@@ -6,12 +6,6 @@ import experimental/parser/unifiedcard

 proc parseGraphTweet(js: JsonNode): Tweet

-proc parseCommunityNote(js: JsonNode): string =
-  let subtitle = js{"subtitle"}
-  result = subtitle{"text"}.getStr
-  with entities, subtitle{"entities"}:
-    result = expandBirdwatchEntities(result, entities)
-
 proc parseUser(js: JsonNode; id=""): User =
  if js.isNull: return
  result = User(
@@ -27,7 +21,7 @@ proc parseUser(js: JsonNode; id=""): User =
    tweets: js{"statuses_count"}.getInt,
    likes: js{"favourites_count"}.getInt,
    media: js{"media_count"}.getInt,
-    protected: js{"protected"}.getBool(js{"privacy", "protected"}.getBool),
+    protected: js{"protected"}.getBool,
    joinDate: js{"created_at"}.getTime
  )

@@ -140,37 +134,24 @@ proc parseVideo(js: JsonNode): Video =

  result.variants = parseVideoVariants(js{"video_info", "variants"})

-proc addMedia(media: var MediaEntities; photo: Photo) =
-  media.add Media(kind: photoMedia, photo: photo)
-
-proc addMedia(media: var MediaEntities; video: Video) =
-  media.add Media(kind: videoMedia, video: video)
-
-proc addMedia(media: var MediaEntities; gif: Gif) =
-  media.add Media(kind: gifMedia, gif: gif)
-
 proc parseLegacyMediaEntities(js: JsonNode; result: var Tweet) =
  with jsMedia, js{"extended_entities", "media"}:
    for m in jsMedia:
      case m.getTypeName:
      of "photo":
-        result.media.addMedia(Photo(
-          url: m{"media_url_https"}.getImageStr,
-          altText: m{"ext_alt_text"}.getStr
-        ))
+        result.photos.add m{"media_url_https"}.getImageStr
      of "video":
-        result.media.addMedia(parseVideo(m))
+        result.video = some(parseVideo(m))
        with user, m{"additional_media_info", "source_user"}:
          if user{"id"}.getInt > 0:
            result.attribution = some(parseUser(user))
          else:
            result.attribution = some(parseGraphUser(user))
      of "animated_gif":
-        result.media.addMedia(Gif(
+        result.gif = some Gif(
          url: m{"video_info", "variants"}[0]{"url"}.getImageStr,
-          thumb: m{"media_url_https"}.getImageStr,
-          altText: m{"ext_alt_text"}.getStr
-        ))
+          thumb: m{"media_url_https"}.getImageStr
+        )
      else: discard

      with url, m{"url"}:
@@ -180,39 +161,30 @@ proc parseLegacyMediaEntities(js: JsonNode; result: var Tweet) =

 proc parseMediaEntities(js: JsonNode; result: var Tweet) =
  with mediaEntities, js{"media_entities"}:
-    var parsedMedia: MediaEntities
    for mediaEntity in mediaEntities:
      with mediaInfo, mediaEntity{"media_results", "result", "media_info"}:
        case mediaInfo.getTypeName
        of "ApiImage":
-          parsedMedia.addMedia(Photo(
-            url: mediaInfo{"original_img_url"}.getImageStr,
-            altText: mediaInfo{"alt_text"}.getStr
-          ))
+          result.photos.add mediaInfo{"original_img_url"}.getImageStr
        of "ApiVideo":
          let status = mediaEntity{"media_results", "result", "media_availability_v2", "status"}
-          parsedMedia.addMedia(Video(
+          result.video = some Video(
            available: status.getStr == "Available",
            thumb: mediaInfo{"preview_image", "original_img_url"}.getImageStr,
-            title: mediaInfo{"alt_text"}.getStr,
            durationMs: mediaInfo{"duration_millis"}.getInt,
            variants: parseVideoVariants(mediaInfo{"variants"})
-          ))
+          )
        of "ApiGif":
-          parsedMedia.addMedia(Gif(
+          result.gif = some Gif(
            url: mediaInfo{"variants"}[0]{"url"}.getImageStr,
-            thumb: mediaInfo{"preview_image", "original_img_url"}.getImageStr,
-            altText: mediaInfo{"alt_text"}.getStr
-          ))
+            thumb: mediaInfo{"preview_image", "original_img_url"}.getImageStr
+          )
        else: discard

-    if mediaEntities.len > 0 and parsedMedia.len == mediaEntities.len:
-      result.media = parsedMedia
-
  # Remove media URLs from text
  with mediaList, js{"legacy", "entities", "media"}:
    for url in mediaList:
-      let expandedUrl = url.getExpandedUrl
+      let expandedUrl = url{"expanded_url"}.getStr
      if result.text.endsWith(expandedUrl):
        result.text.removeSuffix(expandedUrl)
        result.text = result.text.strip()
@@ -295,7 +267,7 @@ proc parseCard(js: JsonNode; urls: JsonNode): Card =

  for u in ? urls:
    if u{"url"}.getStr == result.url:
-      result.url = u.getExpandedUrl(result.url)
+      result.url = u{"expanded_url"}.getStr
      break

  if kind in {videoDirectMessage, imageDirectMessage}:
@@ -305,8 +277,7 @@ proc parseCard(js: JsonNode; urls: JsonNode): Card =
     result.url.len == 0 or result.url.startsWith("card://"):
    result.url = getPicUrl(result.image)

-proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull();
-                replyId: int64 = 0): Tweet =
+proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
  if js.isNull: return

  let time =
@@ -330,9 +301,6 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull();
    )
  )

-  if result.replyId == 0:
-    result.replyId = replyId
-
  # fix for pinned threads
  if result.hasThread and result.threadId == 0:
    result.threadId = js{"self_thread", "id_str"}.getId
@@ -364,13 +332,11 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull();
    let name = jsCard{"name"}.getStr
    if "poll" in name:
      if "image" in name:
-        result.media.addMedia(Photo(
-          url: jsCard{"binding_values", "image_large"}.getImageVal
-        ))
+        result.photos.add jsCard{"binding_values", "image_large"}.getImageVal

      result.poll = some parsePoll(jsCard)
    elif name == "amplify":
-      result.media.addMedia(parsePromoVideo(jsCard{"binding_values"}))
+      result.video = some(parsePromoVideo(jsCard{"binding_values"}))
    else:
      result.card = some parseCard(jsCard, js{"entities", "urls"})

@@ -428,17 +394,12 @@ proc parseGraphTweet(js: JsonNode): Tweet =
          "binding_values": %bindingObj
        }

-  var replyId = 0
-  with restId, js{"reply_to_results", "rest_id"}:
-    replyId = restId.getId
-
-  result = parseTweet(js{"legacy"}, jsCard, replyId)
+  result = parseTweet(js{"legacy"}, jsCard)
  result.id = js{"rest_id"}.getId
  result.user = parseGraphUser(js{"core"})

-  if result.reply.len == 0:
-    with replyTo, js{"reply_to_user_results", "result", "core", "screen_name"}:
-      result.reply = @[replyTo.getStr]
+  if result.replyId == 0:
+    result.replyId = js{"reply_to_results", "rest_id"}.getId

  with count, js{"views", "count"}:
    result.stats.views = count.getStr("0").parseInt
@@ -448,28 +409,21 @@ proc parseGraphTweet(js: JsonNode): Tweet =

  parseMediaEntities(js, result)

-  with quoted, js{"quoted_status_result", "result"}:
+  if result.quote.isSome:
+    result.quote = some(parseGraphTweet(js{"quoted_status_result", "result"}))
+
+  with quoted, js{"quotedPostResults", "result"}:
    result.quote = some(parseGraphTweet(quoted))

-  with quoted, js{"quotedPostResults"}:
-    if "result" in quoted:
-      result.quote = some(parseGraphTweet(quoted{"result"}))
-    else:
-      result.quote = some Tweet(id: js{"legacy", "quoted_status_id_str"}.getId)
-
-  with ids, js{"edit_control", "edit_control_initial", "edit_tweet_ids"}:
-    for id in ids:
-      result.history.add parseBiggestInt(id.getStr)
-
-  with birdwatch, js{"birdwatch_pivot"}:
-    result.note = parseCommunityNote(birdwatch)
-
 proc parseGraphThread(js: JsonNode): tuple[thread: Chain; self: bool] =
  for t in ? js{"content", "items"}:
    let entryId = t.getEntryId
-    if "tweet-" in entryId and "promoted" notin entryId:
-      let tweet = t.getTweetResult("item")
-      if tweet.notNull:
+    if "cursor-showmore" in entryId:
+      let cursor = t{"item", "content", "value"}
+      result.thread.cursor = cursor.getStr
+      result.thread.hasMore = true
+    elif "tweet" in entryId and "promoted" notin entryId:
+      with tweet, t.getTweetResult("item"):
        result.thread.content.add parseGraphTweet(tweet)

        let tweetDisplayType = select(
@@ -478,12 +432,6 @@ proc parseGraphThread(js: JsonNode): tuple[thread: Chain; self: bool] =
        )
        if tweetDisplayType.getStr == "SelfThread":
          result.self = true
-      else:
-        result.thread.content.add Tweet(id: entryId.getId)
-    elif "cursor-showmore" in entryId:
-      let cursor = t{"item", "content", "value"}
-      result.thread.cursor = cursor.getStr
-      result.thread.hasMore = true

 proc parseGraphTweetResult*(js: JsonNode): Tweet =
  with tweet, js{"data", "tweet_result", "result"}:
@@ -504,7 +452,7 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
    if i.getTypeName == "TimelineAddEntries":
      for e in i{"entries"}:
        let entryId = e.getEntryId
-        if entryId.startsWith("tweet-"):
+        if entryId.startsWith("tweet"):
          let tweetResult = getTweetResult(e)
          if tweetResult.notNull:
            let tweet = parseGraphTweet(tweetResult)
@@ -512,12 +460,10 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
            if not tweet.available:
              tweet.id = entryId.getId

-            if entryId.endsWith(tweetId):
+            if $tweet.id == tweetId:
              result.tweet = tweet
            else:
              result.before.content.add tweet
-          elif not entryId.endsWith(tweetId):
-            result.before.content.add Tweet(id: entryId.getId)
        elif entryId.startsWith("conversationthread"):
          let (thread, self) = parseGraphThread(e)
          if self:
@@ -545,29 +491,6 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
          )
          result.replies.bottom = cursorValue.getStr

-proc parseGraphEditHistory*(js: JsonNode; tweetId: string): EditHistory =
-  let instructions = ? js{
-    "data", "tweet_result_by_rest_id", "result", 
-    "edit_history_timeline", "timeline", "instructions"
-  }
-  if instructions.len == 0:
-    return
-
-  for i in instructions:
-    if i.getTypeName == "TimelineAddEntries":
-      for e in i{"entries"}:
-        let entryId = e.getEntryId
-        if entryId == "latestTweet":
-          with item, e{"content", "items"}[0]:
-            let tweetResult = item.getTweetResult("item")
-            if tweetResult.notNull:
-              result.latest = parseGraphTweet(tweetResult)
-        elif entryId == "staleTweets":
-          for item in e{"content", "items"}:
-            let tweetResult = item.getTweetResult("item")
-            if tweetResult.notNull:
-              result.history.add parseGraphTweet(tweetResult)
-
 proc extractTweetsFromEntry*(e: JsonNode): seq[Tweet] =
  with tweetResult, getTweetResult(e):
    var tweet = parseGraphTweet(tweetResult)
--- a/src/parserutils.nim
+++ b/src/parserutils.nim
@@ -17,7 +17,7 @@ let
  unReplace = "$1<a href=\"/$2\">@$2</a>"

  htRegex = re"(^|[^\w-_./?])([#$]|＃)([\w_]+)"
-  htReplace = "$1<a href=\"/search?f=tweets&q=%23$3\">$2$3</a>"
+  htReplace = "$1<a href=\"/search?q=%23$3\">$2$3</a>"

 type
  ReplaceSliceKind = enum
@@ -72,6 +72,7 @@ template getTypeName*(js: JsonNode): string =
 template getEntryId*(e: JsonNode): string =
  e{"entryId"}.getStr(e{"entry_id"}.getStr)

+
 template parseTime(time: string; f: static string; flen: int): DateTime =
  if time.len != flen: return
  parse(time, f, utc())
@@ -111,9 +112,6 @@ proc getImageStr*(js: JsonNode): string =
 template getImageVal*(js: JsonNode): string =
  js{"image_value", "url"}.getImageStr

-template getExpandedUrl*(js: JsonNode; fallback=""): string =
-  js{"expanded_url"}.getStr(js{"url"}.getStr(fallback))
-
 proc getCardUrl*(js: JsonNode; kind: CardKind): string =
  result = js{"website_url"}.getStrVal
  if kind == promoVideoConvo:
@@ -179,7 +177,7 @@ proc extractSlice(js: JsonNode): Slice[int] =
 proc extractUrls(result: var seq[ReplaceSlice]; js: JsonNode;
                 textLen: int; hideTwitter = false) =
  let
-    url = js.getExpandedUrl
+    url = js["expanded_url"].getStr
    slice = js.extractSlice

  if hideTwitter and slice.b.succ >= textLen and url.isTwitterUrl:
@@ -206,7 +204,7 @@ proc replacedWith(runes: seq[Rune]; repls: openArray[ReplaceSlice];
      let
        name = $runes[rep.slice.a.succ .. rep.slice.b]
        symbol = $runes[rep.slice.a]
-      result.add a(symbol & name, href = "/search?f=tweets&q=%23" & name)
+      result.add a(symbol & name, href = "/search?q=%23" & name)
    of rkMention:
      result.add a($runes[rep.slice], href = rep.url, title = rep.display)
    of rkUrl:
@@ -240,7 +238,7 @@ proc expandUserEntities*(user: var User; js: JsonNode) =
    ent = ? js{"entities"}

  with urls, ent{"url", "urls"}:
-    user.website = urls[0].getExpandedUrl
+    user.website = urls[0]{"expanded_url"}.getStr

  var replacements = newSeq[ReplaceSlice]()

@@ -270,7 +268,7 @@ proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlic
      replacements.extractUrls(u, textSlice.b, hideTwitter = hasRedundantLink)

      if hasCard and u{"url"}.getStr == get(tweet.card).url:
-        get(tweet.card).url = u.getExpandedUrl
+        get(tweet.card).url = u{"expanded_url"}.getStr

  with media, entities{"media"}:
    for m in media:
@@ -330,29 +328,11 @@ proc expandNoteTweetEntities*(tweet: Tweet; js: JsonNode) =

  tweet.text = tweet.text.multiReplace((unicodeOpen, xmlOpen), (unicodeClose, xmlClose))

-proc expandBirdwatchEntities*(text: string; entities: JsonNode): string =
-  let runes = text.toRunes
-  var replacements: seq[ReplaceSlice]
-
-  for entity in entities:
-    let
-      fromIdx = entity{"from_index"}.getInt
-      toIdx = entity{"to_index"}.getInt
-      url = entity{"ref", "url"}.getStr
-    if url.len > 0:
-      replacements.add ReplaceSlice(
-        kind: rkUrl,
-        slice: fromIdx ..< toIdx,
-        url: url,
-        display: $runes[fromIdx ..< min(toIdx, runes.len)]
-      )
-
-  replacements.sort(cmp)
-  result = runes.replacedWith(replacements, 0 ..< runes.len)
-
 proc extractGalleryPhoto*(t: Tweet): GalleryPhoto =
  let url =
-    if t.media.len > 0: t.media[0].getThumb
+    if t.photos.len > 0: t.photos[0]
+    elif t.video.isSome: get(t.video).thumb
+    elif t.gif.isSome: get(t.gif).thumb
    elif t.card.isSome: get(t.card).image
    else: ""

--- a/src/prefs.nim
+++ b/src/prefs.nim
@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import tables, strutils
+import tables
 import types, prefs_impl
 from config import get
 from parsecfg import nil

-export genUpdatePrefs, genResetPrefs, genApplyPrefs
+export genUpdatePrefs, genResetPrefs

 var defaultPrefs*: Prefs

 proc updateDefaultPrefs*(cfg: parsecfg.Config) =
  genDefaultPrefs()

-proc getPrefs*(cookies, params: Table[string, string]): Prefs =
+proc getPrefs*(cookies: Table[string, string]): Prefs =
  result = defaultPrefs
-  genParsePrefs(cookies)
-  genParsePrefs(params)
+  genCookiePrefs(cookies)

-proc encodePrefs*(prefs: Prefs): string =
-  var encPairs: seq[string]
-  genEncodePrefs(prefs)
-  encPairs.join(",")
+template getPref*(cookies: Table[string, string], pref): untyped =
+  bind genCookiePref
+  var res = defaultPrefs.`pref`
+  genCookiePref(cookies, pref, res)
+  res
--- a/src/prefs_impl.nim
+++ b/src/prefs_impl.nim
@@ -60,9 +60,6 @@ genPrefs:
    stickyProfile(checkbox, true):
      "Make profile sidebar stick to top"

-    stickyNav(checkbox, true):
-      "Keep navbar fixed to top"
-
    bidiSupport(checkbox, false):
      "Support bidirectional text (makes clicking on tweets harder)"

@@ -78,9 +75,6 @@ genPrefs:
    hideReplies(checkbox, false):
      "Hide tweet replies"

-    hideCommunityNotes(checkbox, false):
-      "Hide community notes"
-
    squareAvatars(checkbox, false):
      "Square profile pictures"

@@ -133,7 +127,7 @@ macro genDefaultPrefs*(): untyped =
    result.add quote do:
      defaultPrefs.`ident` = cfg.get("Preferences", `name`, `default`)

-macro genParsePrefs*(prefs): untyped =
+macro genCookiePrefs*(cookies): untyped =
  result = nnkStmtList.newTree()
  for pref in allPrefs():
    let
@@ -143,17 +137,37 @@ macro genParsePrefs*(prefs): untyped =
      options = pref.options

    result.add quote do:
-      if `name` in `prefs`:
+      if `name` in `cookies`:
        when `kind` == input or `name` == "theme":
-          result.`ident` = `prefs`[`name`]
+          result.`ident` = `cookies`[`name`]
        elif `kind` == checkbox:
-          result.`ident` = `prefs`[`name`] == "on" or 
-                           `prefs`[`name`] == "true" or
-                           `prefs`[`name`] == "1"
+          result.`ident` = `cookies`[`name`] == "on"
        else:
-          let value = `prefs`[`name`]
+          let value = `cookies`[`name`]
          if value in `options`: result.`ident` = value

+macro genCookiePref*(cookies, prefName, res): untyped =
+  result = nnkStmtList.newTree()
+  for pref in allPrefs():
+    let ident = ident(pref.name)
+    if ident != prefName:
+      continue
+
+    let
+      name = pref.name
+      kind = newLit(pref.kind)
+      options = pref.options
+
+    result.add quote do:
+      if `name` in `cookies`:
+        when `kind` == input or `name` == "theme":
+          `res` = `cookies`[`name`]
+        elif `kind` == checkbox:
+          `res` = `cookies`[`name`] == "on"
+        else:
+          let value = `cookies`[`name`]
+          if value in `options`: `res` = value
+
 macro genUpdatePrefs*(): untyped =
  result = nnkStmtList.newTree()
  let req = ident("request")
@@ -188,36 +202,6 @@ macro genResetPrefs*(): untyped =
    result.add quote do:
      savePref(`name`, "", `req`, expire=true)

-macro genEncodePrefs*(prefs): untyped =
-  result = nnkStmtList.newTree()
-  for pref in allPrefs():
-    let
-      name = newLit(pref.name)
-      ident = ident(pref.name)
-      kind = newLit(pref.kind)
-      defaultIdent = nnkDotExpr.newTree(ident("defaultPrefs"), ident(pref.name))
-
-    result.add quote do:
-      when `kind` == checkbox:
-        if `prefs`.`ident` != `defaultIdent`:
-          if `prefs`.`ident`:
-            encPairs.add `name` & "=on"
-          else:
-            encPairs.add `name` & "="
-      else:
-        if `prefs`.`ident` != `defaultIdent`:
-          encPairs.add `name` & "=" & `prefs`.`ident`
-
-macro genApplyPrefs*(params, req): untyped =
-  result = nnkStmtList.newTree()
-  for pref in allPrefs():
-    let name = newLit(pref.name)
-    result.add quote do:
-      if `name` in `params`:
-        savePref(`name`, `params`[`name`], `req`)
-      else:
-        savePref(`name`, "", `req`, expire=true)
-
 macro genPrefsType*(): untyped =
  let name = nnkPostfix.newTree(ident("*"), ident("Prefs"))
  result = quote do:
--- a/src/query.nim
+++ b/src/query.nim
@@ -6,9 +6,10 @@ import types
 const
  validFilters* = @[
    "media", "images", "twimg", "videos",
-    "native_video", "consumer_video", "spaces",
+    "native_video", "consumer_video", "pro_video",
    "links", "news", "quote", "mentions",
-    "replies", "retweets", "nativeretweets"
+    "replies", "retweets", "nativeretweets",
+    "verified", "safe"
  ]

  emptyQuery* = "include:nativeretweets"
@@ -17,11 +18,6 @@ template `@`(param: string): untyped =
  if param in pms: pms[param]
  else: ""

-proc validateNumber(value: string): string =
-  if value.anyIt(not it.isDigit):
-    return ""
-  return value
-
 proc initQuery*(pms: Table[string, string]; name=""): Query =
  result = Query(
    kind: parseEnum[QueryKind](@"f", tweets),
@@ -30,7 +26,7 @@ proc initQuery*(pms: Table[string, string]; name=""): Query =
    excludes: validFilters.filterIt("e-" & it in pms),
    since: @"since",
    until: @"until",
-    minLikes: validateNumber(@"min_faves")
+    near: @"near"
  )

  if name.len > 0:
@@ -58,18 +54,16 @@ proc genQueryParam*(query: Query): string =
  if query.kind == users:
    return query.text

-  param = "("
  for i, user in query.fromUser:
-    param &= &"from:{user}"
+    param &= &"from:{user} "
    if i < query.fromUser.high:
-      param &= " OR "
-  param &= ")"
+      param &= "OR "

  if query.fromUser.len > 0 and query.kind in {posts, media}:
-    param &= " (filter:self_threads OR -filter:replies)"
+    param &= "filter:self_threads OR -filter:replies "

  if "nativeretweets" notin query.excludes:
-    param &= " include:nativeretweets"
+    param &= "include:nativeretweets "

  for f in query.filters:
    filters.add "filter:" & f
@@ -79,17 +73,13 @@ proc genQueryParam*(query: Query): string =
  for i in query.includes:
    filters.add "include:" & i

-  if filters.len > 0:
-    result = strip(param & " (" & filters.join(&" {query.sep} ") & ")")
-  else:
-    result = strip(param)
-
+  result = strip(param & filters.join(&" {query.sep} "))
  if query.since.len > 0:
    result &= " since:" & query.since
  if query.until.len > 0:
    result &= " until:" & query.until
-  if query.minLikes.len > 0:
-    result &= " min_faves:" & query.minLikes
+  if query.near.len > 0:
+    result &= &" near:\"{query.near}\" within:15mi"
  if query.text.len > 0:
    if result.len > 0:
      result &= " " & query.text
@@ -113,8 +103,8 @@ proc genQueryUrl*(query: Query): string =
    params.add "since=" & query.since
  if query.until.len > 0:
    params.add "until=" & query.until
-  if query.minLikes.len > 0:
-    params.add "min_faves=" & query.minLikes
+  if query.near.len > 0:
+    params.add "near=" & query.near

  if params.len > 0:
    result &= params.join("&")
--- a/src/routes/embed.nim
+++ b/src/routes/embed.nim
@@ -11,7 +11,7 @@ proc createEmbedRouter*(cfg: Config) =
  router embed:
    get "/i/videos/tweet/@id":
      let tweet = await getGraphTweetResult(@"id")
-      if tweet == nil or not tweet.hasVideos:
+      if tweet == nil or tweet.video.isNone:
        resp Http404

      resp renderVideoEmbed(tweet, cfg, request)
@@ -19,7 +19,7 @@ proc createEmbedRouter*(cfg: Config) =
    get "/@user/status/@id/embed":
      let
        tweet = await getGraphTweetResult(@"id")
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
        path = getPath()

      if tweet == nil:
--- a/src/routes/list.nim
+++ b/src/routes/list.nim
@@ -13,7 +13,7 @@ template respList*(list, timeline, title, vnode: typed) =

  let
    html = renderList(vnode, timeline.query, list)
-    rss = if cfg.enableRSSList: &"""/i/lists/{@"id"}/rss""" else: ""
+    rss = &"""/i/lists/{@"id"}/rss"""

  resp renderMain(html, request, cfg, prefs, titleText=title, rss=rss, banner=list.banner)

@@ -36,7 +36,7 @@ proc createListRouter*(cfg: Config) =
    get "/i/lists/@id/?":
      cond '.' notin @"id"
      let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
        list = await getCachedList(id=(@"id"))
        timeline = await getGraphListTweets(list.id, getCursor())
        vnode = renderTimelineTweets(timeline, prefs, request.path)
@@ -45,7 +45,7 @@ proc createListRouter*(cfg: Config) =
    get "/i/lists/@id/members":
      cond '.' notin @"id"
      let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
        list = await getCachedList(id=(@"id"))
        members = await getGraphListMembers(list, getCursor())
      respList(list, members, list.title, renderTimelineUsers(members, prefs, request.path))
--- a/src/routes/media.nim
+++ b/src/routes/media.nim
@@ -52,10 +52,10 @@ proc proxyMedia*(req: jester.Request; url: string): Future[HttpCode] {.async.} =
        ""

    let headers = newHttpHeaders({
-      "content-type": res.headers["content-type", 0],
-      "content-length": contentLength,
-      "cache-control": maxAge,
-      "etag": hashed
+      "Content-Type": res.headers["content-type", 0],
+      "Content-Length": contentLength,
+      "Cache-Control": maxAge,
+      "ETag": hashed
    })

    respond(request, headers)
@@ -93,8 +93,6 @@ proc createMediaRouter*(cfg: Config) =

    get re"^\/pic\/orig\/(enc)?\/?(.+)":
      var url = decoded(request, 1)
-      cond "/amplify_video/" notin url
-
      if "twimg.com" notin url:
        url.insert(twimg)
      if not url.startsWith(https):
@@ -109,8 +107,6 @@ proc createMediaRouter*(cfg: Config) =

    get re"^\/pic\/(enc)?\/?(.+)":
      var url = decoded(request, 1)
-      cond "/amplify_video/" notin url
-
      if "twimg.com" notin url:
        url.insert(twimg)
      if not url.startsWith(https):
@@ -143,6 +139,6 @@ proc createMediaRouter*(cfg: Config) =

      if ".m3u8" in url:
        let vid = await safeFetch(url)
-        content = proxifyVideo(vid, requestPrefs().proxyVideos)
+        content = proxifyVideo(vid, cookiePref(proxyVideos))

      resp content, m3u8Mime
--- a/src/routes/preferences.nim
+++ b/src/routes/preferences.nim
@@ -19,10 +19,8 @@ proc createPrefRouter*(cfg: Config) =
  router preferences:
    get "/settings":
      let
-        prefs = requestPrefs()
-        prefsCode = encodePrefs(prefs)
-        prefsUrl = getUrlPrefix(cfg) & "/?prefs=" & prefsCode
-        html = renderPreferences(prefs, refPath(), findThemes(cfg.staticDir), prefsUrl)
+        prefs = cookiePrefs()
+        html = renderPreferences(prefs, refPath(), findThemes(cfg.staticDir))
      resp renderMain(html, request, cfg, prefs, "Preferences")

    get "/settings/@i?":
--- a/src/routes/resolver.nim
+++ b/src/routes/resolver.nim
@@ -18,8 +18,8 @@ proc createResolverRouter*(cfg: Config) =
  router resolver:
    get "/cards/@card/@id":
      let url = "https://cards.twitter.com/cards/$1/$2" % [@"card", @"id"]
-      respResolved(await resolve(url, requestPrefs()), "card")
+      respResolved(await resolve(url, cookiePrefs()), "card")

    get "/t.co/@url":
      let url = "https://t.co/" & @"url"
-      respResolved(await resolve(url, requestPrefs()), "t.co")
+      respResolved(await resolve(url, cookiePrefs()), "t.co")
--- a/src/routes/router_utils.nim
+++ b/src/routes/router_utils.nim
@@ -9,13 +9,21 @@ export utils, prefs, types, uri
 template savePref*(pref, value: string; req: Request; expire=false) =
  if not expire or pref in cookies(req):
    setCookie(pref, value, daysForward(when expire: -10 else: 360),
-              httpOnly=true, secure=cfg.useHttps, sameSite=None, path="/")
+              httpOnly=true, secure=cfg.useHttps, sameSite=None)

-template requestPrefs*(): untyped {.dirty.} =
-  getPrefs(cookies(request), params(request))
+template cookiePrefs*(): untyped {.dirty.} =
+  getPrefs(cookies(request))
+
+template cookiePref*(pref): untyped {.dirty.} =
+  getPref(cookies(request), pref)
+
+template themePrefs*(): Prefs =
+  var res = defaultPrefs
+  res.theme = cookiePref(theme)
+  res

 template showError*(error: string; cfg: Config): string =
-  renderMain(renderError(error), request, cfg, requestPrefs(), "Error")
+  renderMain(renderError(error), request, cfg, themePrefs(), "Error")

 template getPath*(): untyped {.dirty.} =
  $(parseUri(request.path) ? filterParams(request.params))
@@ -35,28 +43,5 @@ template getCursor*(req: Request): string =
 proc getNames*(name: string): seq[string] =
  name.strip(chars={'/'}).split(",").filterIt(it.len > 0)

-template applyUrlPrefs*() {.dirty.} =
-  if @"prefs".len > 0:
-    var prefParams = initTable[string, string]()
-    for pair in @"prefs".split(','):
-      let kv = pair.split('=', maxsplit=1)
-      if kv.len == 2:
-        prefParams[kv[0]] = kv[1]
-      elif kv.len == 1 and kv[0].len > 0:
-        prefParams[kv[0]] = ""
-    genApplyPrefs(prefParams, request)
-
-    # Rebuild URL without prefs param
-    var params: seq[(string, string)]
-    for k, v in request.params:
-      if k != "prefs":
-        params.add (k, v)
-
-    if params.len > 0:
-      let cleanUrl = request.getNativeReq.url ? params
-      redirect($cleanUrl)
-    else:
-      redirect(request.path)
-
 template respJson*(node: JsonNode) =
  resp $node, "application/json"
--- a/src/routes/rss.nim
+++ b/src/routes/rss.nim
@@ -15,7 +15,7 @@ proc redisKey*(page, name, cursor: string): string =
  if cursor.len > 0:
    result &= ":" & cursor

-proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future[Rss] {.async.} =
+proc timelineRss*(req: Request; cfg: Config; query: Query): Future[Rss] {.async.} =
  var profile: Profile
  let
    name = req.params.getOrDefault("name")
@@ -39,7 +39,7 @@ proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future
    return Rss(feed: profile.user.username, cursor: "suspended")

  if profile.user.fullname.len > 0:
-    let rss = renderTimelineRss(profile, cfg, prefs, multi=(names.len > 1))
+    let rss = renderTimelineRss(profile, cfg, multi=(names.len > 1))
    return Rss(feed: rss, cursor: profile.tweets.bottom)

 template respRss*(rss, page) =
@@ -60,14 +60,11 @@ template respRss*(rss, page) =
 proc createRssRouter*(cfg: Config) =
  router rss:
    get "/search/rss":
-      if not cfg.enableRSSSearch:
-        resp Http403, showError("RSS feed is disabled", cfg)
+      cond cfg.enableRss
      if @"q".len > 200:
        resp Http400, showError("Search input too long.", cfg)

-      let
-        prefs = requestPrefs()
-        query = initQuery(params(request))
+      let query = initQuery(params(request))
      if query.kind != tweets:
        resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)

@@ -81,17 +78,15 @@ proc createRssRouter*(cfg: Config) =

      let tweets = await getGraphTweetSearch(query, cursor)
      rss.cursor = tweets.bottom
-      rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg, prefs)
+      rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg)

      await cacheRss(key, rss)
      respRss(rss, "Search")

    get "/@name/rss":
+      cond cfg.enableRss
      cond '.' notin @"name"
-      if not cfg.enableRSSUserTweets:
-        resp Http403, showError("RSS feed is disabled", cfg)
      let
-        prefs = requestPrefs()
        name = @"name"
        key = redisKey("twitter", name, getCursor())

@@ -99,23 +94,16 @@ proc createRssRouter*(cfg: Config) =
      if rss.cursor.len > 0:
        respRss(rss, "User")

-      rss = await timelineRss(request, cfg, Query(fromUser: @[name]), prefs)
+      rss = await timelineRss(request, cfg, Query(fromUser: @[name]))

      await cacheRss(key, rss)
      respRss(rss, "User")

    get "/@name/@tab/rss":
+      cond cfg.enableRss
      cond '.' notin @"name"
      cond @"tab" in ["with_replies", "media", "search"]
-      let rssEnabled = case @"tab"
-        of "with_replies": cfg.enableRSSUserReplies
-        of "media": cfg.enableRSSUserMedia
-        of "search": cfg.enableRSSSearch
-        else: false
-      if not rssEnabled:
-        resp Http403, showError("RSS feed is disabled", cfg)
      let
-        prefs = requestPrefs()
        name = @"name"
        tab = @"tab"
        query =
@@ -134,15 +122,14 @@ proc createRssRouter*(cfg: Config) =
      if rss.cursor.len > 0:
        respRss(rss, "User")

-      rss = await timelineRss(request, cfg, query, prefs)
+      rss = await timelineRss(request, cfg, query)

      await cacheRss(key, rss)
      respRss(rss, "User")

    get "/@name/lists/@slug/rss":
+      cond cfg.enableRss
      cond @"name" != "i"
-      if not cfg.enableRSSList:
-        resp Http403, showError("RSS feed is disabled", cfg)
      let
        slug = decodeUrl(@"slug")
        list = await getCachedList(@"name", slug)
@@ -158,10 +145,8 @@ proc createRssRouter*(cfg: Config) =
        redirect(url)

    get "/i/lists/@id/rss":
-      if not cfg.enableRSSList:
-        resp Http403, showError("RSS feed is disabled", cfg)
+      cond cfg.enableRss
      let
-        prefs = requestPrefs()
        id = @"id"
        cursor = getCursor()
        key = redisKey("lists", id, cursor)
@@ -174,7 +159,7 @@ proc createRssRouter*(cfg: Config) =
        list = await getCachedList(id=id)
        timeline = await getGraphListTweets(list.id, cursor)
      rss.cursor = timeline.bottom
-      rss.feed = renderListRss(timeline.content, list, cfg, prefs)
+      rss.feed = renderListRss(timeline.content, list, cfg)

      await cacheRss(key, rss)
      respRss(rss, "List")
--- a/src/routes/search.nim
+++ b/src/routes/search.nim
@@ -19,7 +19,7 @@ proc createSearchRouter*(cfg: Config) =
        resp Http400, showError("Search input too long.", cfg)

      let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
        query = initQuery(params(request))
        title = "Search" & (if q.len > 0: " (" & q & ")" else: "")

@@ -36,16 +36,16 @@ proc createSearchRouter*(cfg: Config) =
      of tweets:
        let
          tweets = await getGraphTweetSearch(query, getCursor())
-          rss = if cfg.enableRSSSearch: "/search/rss?" & genQueryUrl(query) else: ""
+          rss = "/search/rss?" & genQueryUrl(query)
        resp renderMain(renderTweetSearch(tweets, prefs, getPath()),
                        request, cfg, prefs, title, rss=rss)
      else:
        resp Http404, showError("Invalid search", cfg)

    get "/hashtag/@hash":
-      redirect("/search?f=tweets&q=" & encodeUrl("#" & @"hash"))
+      redirect("/search?q=" & encodeUrl("#" & @"hash"))

    get "/opensearch":
-      let url = getUrlPrefix(cfg) & "/search?f=tweets&q="
+      let url = getUrlPrefix(cfg) & "/search?q="
      resp Http200, {"Content-Type": "application/opensearchdescription+xml"},
                     generateOpenSearchXML(cfg.title, cfg.hostname, url)
--- a/src/routes/status.nim
+++ b/src/routes/status.nim
@@ -21,13 +21,13 @@ proc createStatusRouter*(cfg: Config) =
      if id.len > 19 or id.any(c => not c.isDigit):
        resp Http404, showError("Invalid tweet ID", cfg)

-      let prefs = requestPrefs()
+      let prefs = cookiePrefs()

      # used for the infinite scroll feature
      if @"scroll".len > 0:
        let replies = await getReplies(id, getCursor())
        if replies.content.len == 0:
-          resp Http204
+          resp Http404, ""
        resp $renderReplies(replies, prefs, getPath())

      let conv = await getTweet(id, getCursor())
@@ -44,19 +44,15 @@ proc createStatusRouter*(cfg: Config) =
        desc = conv.tweet.text

      var
-        images = conv.tweet.getPhotos.mapIt(it.url)
+        images = conv.tweet.photos
        video = ""

-      let
-        firstMediaKind = if conv.tweet.media.len > 0: conv.tweet.media[0].kind
-                         else: photoMedia
-
-      if firstMediaKind == videoMedia:
-        images = @[conv.tweet.media[0].getThumb]
+      if conv.tweet.video.isSome():
+        images = @[get(conv.tweet.video).thumb]
        video = getVideoEmbed(cfg, conv.tweet.id)
-      elif firstMediaKind == gifMedia:
-        images = @[conv.tweet.media[0].getThumb]
-        video = getPicUrl(conv.tweet.media[0].gif.url)
+      elif conv.tweet.gif.isSome():
+        images = @[get(conv.tweet.gif).thumb]
+        video = getPicUrl(get(conv.tweet.gif).url)
      elif conv.tweet.card.isSome():
        let card = conv.tweet.card.get()
        if card.image.len > 0:
@@ -68,29 +64,9 @@ proc createStatusRouter*(cfg: Config) =
      resp renderMain(html, request, cfg, prefs, title, desc, ogTitle,
                      images=images, video=video)

-    get "/@name/status/@id/history/?":
-      cond '.' notin @"name"
-      let id = @"id"
-
-      if id.len > 19 or id.any(c => not c.isDigit):
-        resp Http404, showError("Invalid tweet ID", cfg)
-
-      let edits = await getGraphEditHistory(id)
-      if edits.latest == nil or edits.latest.id == 0:
-        resp Http404, showError("Tweet history not found", cfg)
-
-      let
-        prefs = requestPrefs()
-        title = "History for " & pageTitle(edits.latest)
-        ogTitle = "Edit History for " & pageTitle(edits.latest.user)
-        desc = edits.latest.text
-
-      let html = renderEditHistory(edits, prefs, getPath())
-      resp renderMain(html, request, cfg, prefs, title, desc, ogTitle)
-
    get "/@name/@s/@id/@m/?@i?":
      cond @"s" in ["status", "statuses"]
-      cond @"m" in ["video", "photo"]
+      cond @"m" in ["video", "photo", "history"]
      redirect("/$1/status/$2" % [@"name", @"id"])

    get "/@name/statuses/@id/?":
--- a/src/routes/timeline.nim
+++ b/src/routes/timeline.nim
@@ -105,19 +105,12 @@ proc createTimelineRouter*(cfg: Config) =
    get "/intent/user":
      respUserId()

-    get "/intent/follow/?":
-      let username = request.params.getOrDefault("screen_name")
-      if username.len == 0:
-        resp Http400, showError("Missing screen_name parameter", cfg)
-      redirect("/" & username)
-
    get "/@name/?@tab?/?":
      cond '.' notin @"name"
      cond @"name" notin ["pic", "gif", "video", "search", "settings", "login", "intent", "i"]
-      cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_', ','})
      cond @"tab" in ["with_replies", "media", "search", ""]
      let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
        after = getCursor()
        names = getNames(@"name")

@@ -129,8 +122,7 @@ proc createTimelineRouter*(cfg: Config) =
      if @"scroll".len > 0:
        if query.fromUser.len != 1:
          var timeline = await getGraphTweetSearch(query, after)
-          if timeline.content.len == 0: 
-            resp Http204
+          if timeline.content.len == 0: resp Http404
          timeline.beginning = true
          resp $renderTweetSearch(timeline, prefs, getPath())
        else:
@@ -139,17 +131,8 @@ proc createTimelineRouter*(cfg: Config) =
          profile.tweets.beginning = true
          resp $renderTimelineTweets(profile.tweets, prefs, getPath())

-      let rssEnabled =
-        if @"tab".len == 0: cfg.enableRSSUserTweets
-        elif @"tab" == "with_replies": cfg.enableRSSUserReplies
-        elif @"tab" == "media": cfg.enableRSSUserMedia
-        elif @"tab" == "search": cfg.enableRSSSearch
-        else: false
-
      let rss =
-        if not rssEnabled: 
-          ""
-        elif @"tab".len == 0:
+        if @"tab".len == 0:
          "/$1/rss" % @"name"
        elif @"tab" == "search":
          "/$1/search/rss?$2" % [@"name", genQueryUrl(query)]
--- a/src/routes/unsupported.nim
+++ b/src/routes/unsupported.nim
@@ -10,14 +10,14 @@ export feature
 proc createUnsupportedRouter*(cfg: Config) =
  router unsupported:
    template feature {.dirty.} =
-      resp renderMain(renderFeature(), request, cfg, requestPrefs())
+      resp renderMain(renderFeature(), request, cfg, themePrefs())

    get "/about/feature": feature()
    get "/login/?@i?": feature()
    get "/@name/lists/?": feature()

    get "/intent/?@i?": 
-      cond @"i" notin ["user", "follow"]
+      cond @"i" notin ["user"]
      feature()

    get "/i/@i?/?@j?":
--- a/src/sass/general.scss
+++ b/src/sass/general.scss
@@ -1,40 +1,39 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 .panel-container {
-  margin: auto;
-  font-size: 130%;
+    margin: auto;
+    font-size: 130%;
 }

 .error-panel {
-  @include center-panel(var(--error_red));
-  text-align: center;
+    @include center-panel(var(--error_red));
+    text-align: center;
 }

 .search-bar > form {
-  @include center-panel(var(--darkest_grey));
+    @include center-panel(var(--darkest_grey));

-  button {
-    background: var(--bg_elements);
-    color: var(--fg_color);
-    border: 0;
-    border-radius: 3px;
-    cursor: pointer;
-    font-weight: bold;
-    width: 30px;
-    height: 30px;
-    padding: 0px 5px 1px 8px;
-  }
+    button {
+        background: var(--bg_elements);
+        color: var(--fg_color);
+        border: 0;
+        border-radius: 3px;
+        cursor: pointer;
+        font-weight: bold;
+        width: 30px;
+        height: 30px;
+    }

-  input {
-    font-size: 16px;
-    width: 100%;
-    background: var(--bg_elements);
-    color: var(--fg_color);
-    border: 0;
-    border-radius: 4px;
-    padding: 4px;
-    margin-right: 8px;
-    height: unset;
-  }
+    input {
+        font-size: 16px;
+        width: 100%;
+        background: var(--bg_elements);
+        color: var(--fg_color);
+        border: 0;
+        border-radius: 4px;
+        padding: 4px;
+        margin-right: 8px;
+        height: unset;
+    }
 }
--- a/src/sass/include/_mixins.css
+++ b/src/sass/include/_mixins.css
@@ -66,7 +66,18 @@
        }

        #search-panel-toggle:checked ~ .search-panel {
-            max-height: 380px !important;
+            @if $rows == 6 {
+                max-height: 200px !important;
+            }
+            @if $rows == 5 {
+                max-height: 300px !important;
+            }
+            @if $rows == 4 {
+                max-height: 300px !important;
+            }
+            @if $rows == 3 {
+                max-height: 365px !important;
+            }
        }
    }
 }
--- a/src/sass/include/_variables.scss
+++ b/src/sass/include/_variables.scss
@@ -1,43 +1,46 @@
 // colors
-$bg_color: #0f0f0f;
-$fg_color: #f8f8f2;
-$fg_faded: #f8f8f2cf;
-$fg_dark: #ff6c60;
-$fg_nav: #ff6c60;
+$bg_color: #0F0F0F;
+$fg_color: #F8F8F2;
+$fg_faded: #F8F8F2CF;
+$fg_dark: #FF6C60;
+$fg_nav: #FF6C60;

 $bg_panel: #161616;
 $bg_elements: #121212;
-$bg_overlays: #1f1f1f;
-$bg_hover: #1a1a1a;
+$bg_overlays: #1F1F1F;
+$bg_hover: #1A1A1A;

 $grey: #888889;
 $dark_grey: #404040;
 $darker_grey: #282828;
 $darkest_grey: #222222;
-$border_grey: #3e3e35;
+$border_grey: #3E3E35;

-$accent: #ff6c60;
-$accent_light: #ffaca0;
-$accent_dark: #8a3731;
-$accent_border: #ff6c6091;
+$accent: #FF6C60;
+$accent_light: #FFACA0;
+$accent_dark: #8A3731;
+$accent_border: #FF6C6091;

-$play_button: #d8574d;
-$play_button_hover: #ff6c60;
+$play_button: #D8574D;
+$play_button_hover: #FF6C60;

-$more_replies_dots: #ad433b;
-$error_red: #420a05;
+$more_replies_dots: #AD433B;
+$error_red: #420A05;

-$verified_blue: #1da1f2;
-$verified_business: #fac82b;
-$verified_government: #c1b6a4;
+$verified_blue: #1DA1F2;
+$verified_business: #FAC82B;
+$verified_government: #C1B6A4;
 $icon_text: $fg_color;

 $tab: $fg_color;
 $tab_selected: $accent;

-$shadow: rgba(0, 0, 0, 0.6);
-$shadow_dark: rgba(0, 0, 0, 0.2);
+$shadow: rgba(0,0,0,.6);
+$shadow_dark: rgba(0,0,0,.2);

 //fonts
-$font_0: sans-serif;
-$font_1: fontello;
+$font_0: Helvetica Neue;
+$font_1: Helvetica;
+$font_2: Arial;
+$font_3: sans-serif;
+$font_4: fontello;
--- a/src/sass/index.scss
+++ b/src/sass/index.scss
@@ -1,216 +1,180 @@
-@import "_variables";
+@import '_variables';

-@import "tweet/_base";
-@import "profile/_base";
-@import "general";
-@import "navbar";
-@import "inputs";
-@import "timeline";
-@import "search";
+@import 'tweet/_base';
+@import 'profile/_base';
+@import 'general';
+@import 'navbar';
+@import 'inputs';
+@import 'timeline';
+@import 'search';

 body {
-  // colors
-  --bg_color: #{$bg_color};
-  --fg_color: #{$fg_color};
-  --fg_faded: #{$fg_faded};
-  --fg_dark: #{$fg_dark};
-  --fg_nav: #{$fg_nav};
+    // colors
+    --bg_color: #{$bg_color};
+    --fg_color: #{$fg_color};
+    --fg_faded: #{$fg_faded};
+    --fg_dark: #{$fg_dark};
+    --fg_nav: #{$fg_nav};

-  --bg_panel: #{$bg_panel};
-  --bg_elements: #{$bg_elements};
-  --bg_overlays: #{$bg_overlays};
-  --bg_hover: #{$bg_hover};
+    --bg_panel: #{$bg_panel};
+    --bg_elements: #{$bg_elements};
+    --bg_overlays: #{$bg_overlays};
+    --bg_hover: #{$bg_hover};

-  --grey: #{$grey};
-  --dark_grey: #{$dark_grey};
-  --darker_grey: #{$darker_grey};
-  --darkest_grey: #{$darkest_grey};
-  --border_grey: #{$border_grey};
+    --grey: #{$grey};
+    --dark_grey: #{$dark_grey};
+    --darker_grey: #{$darker_grey};
+    --darkest_grey: #{$darkest_grey};
+    --border_grey: #{$border_grey};

-  --accent: #{$accent};
-  --accent_light: #{$accent_light};
-  --accent_dark: #{$accent_dark};
-  --accent_border: #{$accent_border};
+    --accent: #{$accent};
+    --accent_light: #{$accent_light};
+    --accent_dark: #{$accent_dark};
+    --accent_border: #{$accent_border};

-  --play_button: #{$play_button};
-  --play_button_hover: #{$play_button_hover};
+    --play_button: #{$play_button};
+    --play_button_hover: #{$play_button_hover};

-  --more_replies_dots: #{$more_replies_dots};
-  --error_red: #{$error_red};
+    --more_replies_dots: #{$more_replies_dots};
+    --error_red: #{$error_red};

-  --verified_blue: #{$verified_blue};
-  --verified_business: #{$verified_business};
-  --verified_government: #{$verified_government};
-  --icon_text: #{$icon_text};
+    --verified_blue: #{$verified_blue};
+    --verified_business: #{$verified_business};
+    --verified_government: #{$verified_government};
+    --icon_text: #{$icon_text};

-  --tab: #{$fg_color};
-  --tab_selected: #{$accent};
+    --tab: #{$fg_color};
+    --tab_selected: #{$accent};

-  --profile_stat: #{$fg_color};
+    --profile_stat: #{$fg_color};

-  background-color: var(--bg_color);
-  color: var(--fg_color);
-  font-family: $font_0, $font_1;
-  font-size: 15px;
-  line-height: 1.3;
-  margin: 0;
+    background-color: var(--bg_color);
+    color: var(--fg_color);
+    font-family: $font_0, $font_1, $font_2, $font_3;
+    font-size: 14px;
+    line-height: 1.3;
+    margin: 0;
 }

 * {
-  outline: unset;
-  margin: 0;
-  text-decoration: none;
-}
-
-img {
-  dynamic-range-limit: standard;
+    outline: unset;
+    margin: 0;
+    text-decoration: none;
 }

 h1 {
-  display: inline;
+    display: inline;
 }

-h2,
-h3 {
-  font-weight: normal;
+h2, h3 {
+    font-weight: normal;
 }

 p {
-  margin: 14px 0;
+    margin: 14px 0;
 }

 a {
-  color: var(--accent);
+    color: var(--accent);

-  &:hover {
-    text-decoration: underline;
-  }
+    &:hover {
+        text-decoration: underline;
+    }
 }

 fieldset {
-  border: 0;
-  padding: 0;
-  margin-top: -0.6em;
+    border: 0;
+    padding: 0;
+    margin-top: -0.6em;
 }

 legend {
-  width: 100%;
-  padding: 0.6em 0 0.3em 0;
-  border: 0;
-  font-size: 16px;
-  font-weight: 600;
-  border-bottom: 1px solid var(--border_grey);
-  margin-bottom: 8px;
+    width: 100%;
+    padding: .6em 0 .3em 0;
+    border: 0;
+    font-size: 16px;
+    font-weight: 600;
+    border-bottom: 1px solid var(--border_grey);
+    margin-bottom: 8px;
 }

-.preferences {
-  .note {
+.preferences .note {
    border-top: 1px solid var(--border_grey);
    border-bottom: 1px solid var(--border_grey);
    padding: 6px 0 8px 0;
    margin-bottom: 8px;
    margin-top: 16px;
-  }
-
-  .bookmark-note {
-    margin: 0;
-    margin-bottom: 10px;
-  }
 }

 ul {
-  padding-left: 1.3em;
+    padding-left: 1.3em;
 }

 .container {
-  display: flex;
-  flex-wrap: wrap;
-  box-sizing: border-box;
-  margin: auto;
-  min-height: 100vh;
-}
-
-body.fixed-nav .container {
-  padding-top: 50px;
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+    padding-top: 50px;
+    margin: auto;
+    min-height: 100vh;
 }

 .icon-container {
-  display: inline;
+    display: inline;
 }

 .overlay-panel {
-  max-width: 600px;
-  width: 100%;
-  margin: 0 auto;
-  margin-top: 10px;
-  background-color: var(--bg_overlays);
-  padding: 10px 15px;
-  align-self: start;
+    max-width: 600px;
+    width: 100%;
+    margin: 0 auto;
+    margin-top: 10px;
+    background-color: var(--bg_overlays);
+    padding: 10px 15px;
+    align-self: start;

-  ul {
-    margin-bottom: 14px;
-  }
+    ul {
+        margin-bottom: 14px;
+    }

-  p {
-    word-break: break-word;
-  }
+    p {
+        word-break: break-word;
+    }
 }

 .verified-icon {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-left: 2px;
+    color: var(--icon_text);
+    border-radius: 50%;
+    flex-shrink: 0;
+    margin: 2px 0 3px 3px;
+    padding-top: 3px;
+    height: 11px;
+    width: 14px;
+    font-size: 8px;
+    display: inline-block;
+    text-align: center;
+    vertical-align: middle;

-  .verified-icon-circle {
-    position: absolute;
-    font-size: 15px;
-  }
-
-  .verified-icon-check {
-    position: absolute;
-    font-size: 9px;
-    margin: 5px 3px;
-  }
-
-  &.blue {
-    .verified-icon-circle {
-      color: var(--verified_blue);
+    &.blue {
+        background-color: var(--verified_blue);
    }

-    .verified-icon-check {
-      color: var(--icon_text);
-    }
-  }
-
-  &.business {
-    .verified-icon-circle {
-      color: var(--verified_business);
+    &.business {
+        color: var(--bg_panel);
+        background-color: var(--verified_business);
    }

-    .verified-icon-check {
-      color: var(--bg_panel);
+    &.government {
+        color: var(--bg_panel);
+        background-color: var(--verified_government);
    }
-  }
-
-  &.government {
-    .verified-icon-circle {
-      color: var(--verified_government);
-    }
-
-    .verified-icon-check {
-      color: var(--bg_panel);
-    }
-  }
 }

-@media (max-width: 600px) {
-  .preferences-container {
-    max-width: 95vw;
-  }
+@media(max-width: 600px) {
+    .preferences-container {
+        max-width: 95vw;
+    }

-  .nav-item,
-  .nav-item .icon-container {
-    font-size: 16px;
-  }
+    .nav-item, .nav-item .icon-container {
+        font-size: 16px;
+    }
 }
--- a/src/sass/inputs.scss
+++ b/src/sass/inputs.scss
@@ -1,215 +1,185 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 button {
-  @include input-colors;
-  background-color: var(--bg_elements);
-  color: var(--fg_color);
-  border: 1px solid var(--accent_border);
-  padding: 3px 6px;
-  font-size: 14px;
-  cursor: pointer;
-  float: right;
+    @include input-colors;
+    background-color: var(--bg_elements);
+    color: var(--fg_color);
+    border: 1px solid var(--accent_border);
+    padding: 3px 6px;
+    font-size: 14px;
+    cursor: pointer;
+    float: right;
 }

 input[type="text"],
 input[type="date"],
-input[type="number"],
 select {
-  @include input-colors;
-  background-color: var(--bg_elements);
-  padding: 1px 4px;
-  color: var(--fg_color);
-  border: 1px solid var(--accent_border);
-  border-radius: 0;
-  font-size: 14px;
+    @include input-colors;
+    background-color: var(--bg_elements);
+    padding: 1px 4px;
+    color: var(--fg_color);
+    border: 1px solid var(--accent_border);
+    border-radius: 0;
+    font-size: 14px;
 }

-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
-input[type="text"],
-input[type="number"] {
-  height: 16px;
+input[type="text"] {
+    height: 16px;
 }

 select {
-  height: 20px;
-  padding: 0 2px;
-  line-height: 1;
+    height: 20px;
+    padding: 0 2px;
+    line-height: 1;
 }

 input[type="date"]::-webkit-inner-spin-button {
-  display: none;
-}
-
-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  display: none;
-  -webkit-appearance: none;
-  margin: 0;
+    display: none;
 }

 input[type="date"]::-webkit-clear-button {
-  margin-left: 17px;
-  filter: grayscale(100%);
-  filter: hue-rotate(120deg);
+    margin-left: 17px;
+    filter: grayscale(100%);
+    filter: hue-rotate(120deg);
 }

 input::-webkit-calendar-picker-indicator {
-  opacity: 0;
+    opacity: 0;
 }

 input::-webkit-datetime-edit-day-field:focus,
 input::-webkit-datetime-edit-month-field:focus,
 input::-webkit-datetime-edit-year-field:focus {
-  background-color: var(--accent);
-  color: var(--fg_color);
-  outline: none;
+    background-color: var(--accent);
+    color: var(--fg_color);
+    outline: none;
 }

 .date-range {
-  .date-input {
-    display: inline-block;
-    position: relative;
-  }
+    .date-input {
+        display: inline-block;
+        position: relative;
+    }

-  .icon-container {
-    pointer-events: none;
-    position: absolute;
-    top: 2px;
-    right: 5px;
-  }
+    .icon-container {
+        pointer-events: none;
+        position: absolute;
+        top: 2px;
+        right: 5px;
+    }

-  .search-title {
-    margin: 0 2px;
-  }
+    .search-title {
+        margin: 0 2px;
+    }
 }

 .icon-button button {
-  color: var(--accent);
-  text-decoration: none;
-  background: none;
-  border: none;
-  float: none;
-  padding: unset;
-  padding-left: 4px;
+    color: var(--accent);
+    text-decoration: none;
+    background: none;
+    border: none;
+    float: none;
+    padding: unset;
+    padding-left: 4px;

-  &:hover {
-    color: var(--accent_light);
-  }
+    &:hover {
+        color: var(--accent_light);
+    }
 }

 .checkbox {
-  position: absolute;
-  top: 1px;
-  right: 0;
-  height: 17px;
-  width: 17px;
-  background-color: var(--bg_elements);
-  border: 1px solid var(--accent_border);
-
-  &:after {
-    content: "";
    position: absolute;
-    display: none;
-  }
+    top: 1px;
+    right: 0;
+    height: 17px;
+    width: 17px;
+    background-color: var(--bg_elements);
+    border: 1px solid var(--accent_border);
+
+    &:after {
+        content: "";
+        position: absolute;
+        display: none;
+    }
 }

 .checkbox-container {
-  display: block;
-  position: relative;
-  margin-bottom: 5px;
-  cursor: pointer;
-  user-select: none;
-  padding-right: 22px;
-
-  input {
-    position: absolute;
-    opacity: 0;
+    display: block;
+    position: relative;
+    margin-bottom: 5px;
    cursor: pointer;
-    height: 0;
-    width: 0;
+    user-select: none;
+    padding-right: 22px;

-    &:checked ~ .checkbox:after {
-      display: block;
+    input {
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+        height: 0;
+        width: 0;
+
+        &:checked ~ .checkbox:after {
+            display: block;
+        }
    }
-  }

-  &:hover input ~ .checkbox {
-    border-color: var(--accent);
-  }
+    &:hover input ~ .checkbox {
+        border-color: var(--accent);
+    }

-  &:active input ~ .checkbox {
-    border-color: var(--accent_light);
-  }
+    &:active input ~ .checkbox {
+        border-color: var(--accent_light);
+    }

-  .checkbox:after {
-    left: 2px;
-    bottom: 0;
-    font-size: 13px;
-    font-family: $font_1;
-    content: "\e811";
-  }
+    .checkbox:after {
+        left: 2px;
+        bottom: 0;
+        font-size: 13px;
+        font-family: $font_4;
+        content: '\e803';
+    }
 }

 .pref-group {
-  display: inline;
+    display: inline;
 }

 .preferences {
-  button {
-    margin: 6px 0 3px 0;
-  }
+    button {
+        margin: 6px 0 3px 0;
+    }

-  label {
-    padding-right: 150px;
-  }
+    label {
+        padding-right: 150px;
+    }

-  select {
-    position: absolute;
-    top: 0;
-    right: 0;
-    display: block;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    appearance: none;
-  }
+    select {
+        position: absolute;
+        top: 0;
+        right: 0;
+        display: block;
+        -moz-appearance: none;
+        -webkit-appearance: none;
+        appearance: none;
+    }

-  input[type="text"],
-  input[type="number"] {
-    position: absolute;
-    right: 0;
-    max-width: 140px;
-  }
+    input[type="text"] {
+        position: absolute;
+        right: 0;
+        max-width: 140px;
+    }

-  .pref-group {
-    display: block;
-  }
+    .pref-group {
+        display: block;
+    }

-  .pref-input {
-    position: relative;
-    margin-bottom: 6px;
-  }
+    .pref-input {
+        position: relative;
+        margin-bottom: 6px;
+    }

-  .pref-reset {
-    float: left;
-  }
-
-  .prefs-code {
-    background-color: var(--bg_elements);
-    border: 1px solid var(--accent_border);
-    color: var(--fg_color);
-    font-size: 13px;
-    padding: 6px 8px;
-    margin: 4px 0;
-    word-break: break-all;
-    white-space: pre-wrap;
-    user-select: all;
-  }
+    .pref-reset {
+        float: left;
+    }
 }
--- a/src/sass/navbar.scss
+++ b/src/sass/navbar.scss
@@ -1,90 +1,89 @@
-@import "_variables";
+@import '_variables';

 nav {
-  display: flex;
-  align-items: center;
-  background-color: var(--bg_overlays);
-  box-shadow: 0 0 4px $shadow;
-  padding: 0;
-  width: 100%;
-  height: 50px;
-  z-index: 1000;
-  font-size: 16px;
-
-  a,
-  .icon-button button {
-    color: var(--fg_nav);
-  }
-
-  body.fixed-nav & {
+    display: flex;
+    align-items: center;
    position: fixed;
-  }
+    background-color: var(--bg_overlays);
+    box-shadow: 0 0 4px $shadow;
+    padding: 0;
+    width: 100%;
+    height: 50px;
+    z-index: 1000;
+    font-size: 16px;
+
+    a, .icon-button button {
+        color: var(--fg_nav);
+    }
 }

 .inner-nav {
-  margin: auto;
-  box-sizing: border-box;
-  padding: 0 10px;
-  display: flex;
-  align-items: center;
-  flex-basis: 920px;
-  height: 50px;
+    margin: auto;
+    box-sizing: border-box;
+    padding: 0 10px;
+    display: flex;
+    align-items: center;
+    flex-basis: 920px;
+    height: 50px;
 }

 .site-name {
-  font-size: 15px;
-  font-weight: 600;
-  line-height: 1;
+    font-size: 15px;
+    font-weight: 600;
+    line-height: 1;

-  &:hover {
-    color: var(--accent_light);
-    text-decoration: unset;
-  }
+    &:hover {
+        color: var(--accent_light);
+        text-decoration: unset;
+    }
 }

 .site-logo {
-  display: block;
-  width: 35px;
-  height: 35px;
+    display: block;
+    width: 35px;
+    height: 35px;
 }

 .nav-item {
-  display: flex;
-  flex: 1;
-  line-height: 50px;
-  height: 50px;
-  overflow: hidden;
-  flex-wrap: wrap;
-  align-items: center;
+    display: flex;
+    flex: 1;
+    line-height: 50px;
+    height: 50px;
+    overflow: hidden;
+    flex-wrap: wrap;
+    align-items: center;

-  &.right {
-    text-align: right;
-    justify-content: flex-end;
-  }
+    &.right {
+        text-align: right;
+        justify-content: flex-end;
+    }

-  &.right a:hover {
-    color: var(--accent_light);
-    text-decoration: unset;
-  }
+    &.right a {
+        padding-left: 4px;
+
+        &:hover {
+            color: var(--accent_light);
+            text-decoration: unset;
+        }
+    }
 }

 .lp {
-  height: 14px;
-  display: inline-block;
-  position: relative;
-  top: 2px;
-  fill: var(--fg_nav);
+    height: 14px;
+    display: inline-block;
+    position: relative;
+    top: 2px;
+    fill: var(--fg_nav);

-  &:hover {
-    fill: var(--accent_light);
-  }
+    &:hover {
+        fill: var(--accent_light);
+    }
 }

-.icon-info {
-  margin: 0 -3px;
+.icon-info:before {
+    margin: 0 -3px;
 }

 .icon-cog {
-  font-size: 15px;
-  padding-left: 0 !important;
+    font-size: 15px;
 }
--- a/src/sass/profile/_base.scss
+++ b/src/sass/profile/_base.scss
@@ -39,11 +39,7 @@
    text-align: left;
    vertical-align: top;
    max-width: 32%;
-    top: 0;
-
-    body.fixed-nav & {
-        top: 50px;
-    }
+    top: 50px;
 }

 .profile-result {
--- a/src/sass/search.scss
+++ b/src/sass/search.scss
@@ -1,120 +1,122 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 .search-title {
-  font-weight: bold;
-  display: inline-block;
-  margin-top: 4px;
+    font-weight: bold;
+    display: inline-block;
+    margin-top: 4px;
 }

 .search-field {
-  display: flex;
-  flex-wrap: wrap;
-
-  button {
-    margin: 0 2px 0 0;
-    padding: 0px 1px 1px 4px;
-    height: 23px;
    display: flex;
-    align-items: center;
-  }
+    flex-wrap: wrap;

-  .pref-input {
-    margin: 0 4px 0 0;
-    flex-grow: 1;
-    height: 23px;
-  }
+    button {
+        margin: 0 2px 0 0;
+        height: 23px;
+        display: flex;
+        align-items: center;
+    }

-  input[type="text"],
-  input[type="number"] {
-    height: calc(100% - 4px);
-    width: calc(100% - 8px);
-  }
+    .pref-input {
+        margin: 0 4px 0 0;
+        flex-grow: 1;
+        height: 23px;
+    }

-  > label {
-    display: inline;
-    background-color: var(--bg_elements);
-    color: var(--fg_color);
-    border: 1px solid var(--accent_border);
-    padding: 1px 1px 2px 4px;
-    font-size: 14px;
-    cursor: pointer;
-    margin-bottom: 2px;
+    input[type="text"] {
+        height: calc(100% - 4px);
+        width: calc(100% - 8px);
+    }

-    @include input-colors;
-  }
+    > label {
+        display: inline;
+        background-color: var(--bg_elements);
+        color: var(--fg_color);
+        border: 1px solid var(--accent_border);
+        padding: 1px 6px 2px 6px;
+        font-size: 14px;
+        cursor: pointer;
+        margin-bottom: 2px;

-  @include create-toggle(search-panel, 380px);
+        @include input-colors;
+    }
+
+    @include create-toggle(search-panel, 200px);
 }

 .search-panel {
-  width: 100%;
-  max-height: 0;
-  overflow: hidden;
-  transition: max-height 0.4s;
+    width: 100%;
+    max-height: 0;
+    overflow: hidden;
+    transition: max-height 0.4s;

-  flex-grow: 1;
-  font-weight: initial;
-  text-align: left;
+    flex-grow: 1;
+    font-weight: initial;
+    text-align: left;

-  .checkbox-container {
-    display: inline;
-    padding-right: unset;
-    margin-bottom: 5px;
-    margin-left: 23px;
-  }
+    > div {
+        line-height: 1.7em;
+    }

-  .checkbox {
-    right: unset;
-    left: -22px;
-    line-height: 1.6em;
-  }
+    .checkbox-container {
+        display: inline;
+        padding-right: unset;
+        margin-bottom: unset;
+        margin-left: 23px;
+    }

-  .checkbox-container .checkbox:after {
-    top: -4px;
-  }
+    .checkbox {
+        right: unset;
+        left: -22px;
+    }
+
+    .checkbox-container .checkbox:after {
+        top: -4px;
+    }
 }

 .search-row {
-  display: flex;
-  flex-wrap: wrap;
-  line-height: unset;
+    display: flex;
+    flex-wrap: wrap;
+    line-height: unset;

-  > div {
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-
-  input {
-    height: 21px;
-  }
-
-  .pref-input {
-    display: block;
-    padding-bottom: 5px;
+    > div {
+        flex-grow: 1;
+        flex-shrink: 1;
+    }

    input {
-      height: 21px;
-      margin-top: 1px;
+        height: 21px;
+    }
+
+    .pref-input {
+        display: block;
+        padding-bottom: 5px;
+
+        input {
+            height: 21px;
+            margin-top: 1px;
+        }
    }
-  }
 }

 .search-toggles {
-  flex-grow: 1;
-  display: grid;
-  grid-template-columns: repeat(5, auto);
-  grid-column-gap: 10px;
+    flex-grow: 1;
+    display: grid;
+    grid-template-columns: repeat(6, auto);
+    grid-column-gap: 10px;
 }

 .profile-tabs {
-  @include search-resize(820px, 5);
-  @include search-resize(715px, 4);
-  @include search-resize(700px, 5);
-  @include search-resize(485px, 4);
-  @include search-resize(410px, 3);
+    @include search-resize(820px, 5);
+    @include search-resize(725px, 4);
+    @include search-resize(600px, 6);
+    @include search-resize(560px, 5);
+    @include search-resize(480px, 4);
+    @include search-resize(410px, 3);
 }

-@include search-resize(700px, 5);
-@include search-resize(485px, 4);
+@include search-resize(560px, 5);
+@include search-resize(480px, 4);
@include search-resize(410px, 3);
--- a/src/sass/timeline.scss
+++ b/src/sass/timeline.scss
@@ -1,159 +1,162 @@
-@import "_variables";
+@import '_variables';

 .timeline-container {
-  @include panel(100%, 600px);
+    @include panel(100%, 600px);
 }

-.timeline > div:not(:first-child) {
-  border-top: 1px solid var(--border_grey);
+.timeline {
+    background-color: var(--bg_panel);
+
+    > div:not(:first-child) {
+        border-top: 1px solid var(--border_grey);
+    }
 }

 .timeline-header {
-  width: 100%;
-  background-color: var(--bg_panel);
-  text-align: center;
-  padding: 8px;
-  display: block;
-  font-weight: bold;
-  margin-bottom: 5px;
-  box-sizing: border-box;
+    width: 100%;
+    background-color: var(--bg_panel);
+    text-align: center;
+    padding: 8px;
+    display: block;
+    font-weight: bold;
+    margin-bottom: 5px;
+    box-sizing: border-box;

-  button {
-    float: unset;
-  }
+    button {
+        float: unset;
+    }
 }

 .timeline-banner img {
-  width: 100%;
+    width: 100%;
 }

 .timeline-description {
-  font-weight: normal;
+    font-weight: normal;
 }

 .tab {
-  align-items: center;
-  display: flex;
-  flex-wrap: wrap;
-  list-style: none;
-  margin: 0 0 5px 0;
-  background-color: var(--bg_panel);
-  padding: 0;
+    align-items: center;
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    margin: 0 0 5px 0;
+    background-color: var(--bg_panel);
+    padding: 0;
 }

 .tab-item {
-  flex: 1 1 0;
-  text-align: center;
-  margin-top: 0;
+    flex: 1 1 0;
+    text-align: center;
+    margin-top: 0;

-  a {
-    border-bottom: 0.1rem solid transparent;
-    color: var(--tab);
-    display: block;
-    padding: 8px 0;
-    text-decoration: none;
-    font-weight: bold;
+    a {
+        border-bottom: .1rem solid transparent;
+        color: var(--tab);
+        display: block;
+        padding: 8px 0;
+        text-decoration: none;
+        font-weight: bold;

-    &:hover {
-      text-decoration: none;
+        &:hover {
+            text-decoration: none;
+        }
+
+        &.active {
+            border-bottom-color: var(--tab_selected);
+            color: var(--tab_selected);
+        }
    }

-    &.active {
-      border-bottom-color: var(--tab_selected);
-      color: var(--tab_selected);
+    &.active a {
+        border-bottom-color: var(--tab_selected);
+        color: var(--tab_selected);
    }
-  }

-  &.active a {
-    border-bottom-color: var(--tab_selected);
-    color: var(--tab_selected);
-  }
-
-  &.wide {
-    flex-grow: 1.2;
-    flex-basis: 50px;
-  }
+    &.wide {
+        flex-grow: 1.2;
+        flex-basis: 50px;
+    }
 }

 .timeline-footer {
-  background-color: var(--bg_panel);
-  padding: 6px 0;
+    background-color: var(--bg_panel);
+    padding: 6px 0;
 }

 .timeline-protected {
-  text-align: center;
+    text-align: center;

-  p {
-    margin: 8px 0;
-  }
+    p {
+        margin: 8px 0;
+    }

-  h2 {
-    color: var(--accent);
-    font-size: 20px;
-    font-weight: 600;
-  }
+    h2 {
+        color: var(--accent);
+        font-size: 20px;
+        font-weight: 600;
+    }
 }

 .timeline-none {
-  color: var(--accent);
-  font-size: 20px;
-  font-weight: 600;
-  text-align: center;
+    color: var(--accent);
+    font-size: 20px;
+    font-weight: 600;
+    text-align: center;
 }

 .timeline-end {
-  background-color: var(--bg_panel);
-  color: var(--accent);
-  font-size: 16px;
-  font-weight: 600;
-  text-align: center;
+    background-color: var(--bg_panel);
+    color: var(--accent);
+    font-size: 16px;
+    font-weight: 600;
+    text-align: center;
 }

 .show-more {
-  background-color: var(--bg_panel);
-  text-align: center;
-  padding: 0.75em 0;
-  display: block !important;
+    background-color: var(--bg_panel);
+    text-align: center;
+    padding: .75em 0;
+    display: block !important;

-  a {
-    background-color: var(--darkest_grey);
-    display: inline-block;
-    height: 2em;
-    padding: 0 2em;
-    line-height: 2em;
+    a {
+        background-color: var(--darkest_grey);
+        display: inline-block;
+        height: 2em;
+        padding: 0 2em;
+        line-height: 2em;

-    &:hover {
-      background-color: var(--darker_grey);
+        &:hover {
+            background-color: var(--darker_grey);
+        }
    }
-  }
 }

 .top-ref {
-  background-color: var(--bg_color);
-  border-top: none !important;
+    background-color: var(--bg_color);
+    border-top: none !important;

-  .icon-down {
-    font-size: 20px;
-    display: flex;
-    justify-content: center;
-    text-decoration: none;
+    .icon-down {
+        font-size: 20px;
+        display: flex;
+        justify-content: center;
+        text-decoration: none;

-    &:hover {
-      color: var(--accent_light);
+        &:hover {
+            color: var(--accent_light);
+        }
+
+        &::before {
+            transform: rotate(180deg) translateY(-1px);
+        }
    }
-
-    &::before {
-      transform: rotate(180deg) translateY(-1px);
-    }
-  }
 }

 .timeline-item {
-  overflow-wrap: break-word;
-  border-left-width: 0;
-  min-width: 0;
-  padding: 0.75em;
-  display: flex;
-  position: relative;
-  background-color: var(--bg_panel);
+    overflow-wrap: break-word;
+    border-left-width: 0;
+    min-width: 0;
+    padding: .75em;
+    display: flex;
+    position: relative;
 }
--- a/src/sass/tweet/_base.scss
+++ b/src/sass/tweet/_base.scss
@@ -1,291 +1,240 @@
-@import "_variables";
-@import "_mixins";
-@import "thread";
-@import "media";
-@import "video";
-@import "embed";
-@import "card";
-@import "poll";
-@import "quote";
+@import '_variables';
+@import '_mixins';
+@import 'thread';
+@import 'media';
+@import 'video';
+@import 'embed';
+@import 'card';
+@import 'poll';
+@import 'quote';

 .tweet-body {
-  flex: 1;
-  min-width: 0;
-  margin-left: 58px;
-  pointer-events: none;
-  z-index: 1;
+    flex: 1;
+    min-width: 0;
+    margin-left: 58px;
+    pointer-events: none;
+    z-index: 1;
 }

 .tweet-content {
-  line-height: 1.3em;
-  pointer-events: all;
-  display: inline;
+    font-family: $font_3;
+    line-height: 1.3em;
+    pointer-events: all;
+    display: inline;
 }

 .tweet-bidi {
-  display: block !important;
+    display: block !important;
 }

 .tweet-header {
-  padding: 0;
-  vertical-align: bottom;
-  flex-basis: 100%;
-  margin-bottom: 0.2em;
+    padding: 0;
+    vertical-align: bottom;
+    flex-basis: 100%;
+    margin-bottom: .2em;

-  a {
-    display: inline-block;
-    word-break: break-all;
-    max-width: 100%;
-    pointer-events: all;
-  }
+    a {
+        display: inline-block;
+        word-break: break-all;
+        max-width: 100%;
+        pointer-events: all;
+    }
 }

 .tweet-name-row {
-  padding: 0;
-  display: flex;
-  justify-content: space-between;
+    padding: 0;
+    display: flex;
+    justify-content: space-between;
 }

 .fullname-and-username {
-  display: flex;
-  min-width: 0;
+    display: flex;
+    min-width: 0;
 }

 .fullname {
-  @include ellipsis;
-  flex-shrink: 2;
-  max-width: 80%;
-  font-size: 14px;
-  font-weight: 700;
-  color: var(--fg_color);
+    @include ellipsis;
+    flex-shrink: 2;
+    max-width: 80%;
+    font-size: 14px;
+    font-weight: 700;
+    color: var(--fg_color);
 }

 .username {
-  @include ellipsis;
-  min-width: 1.6em;
-  margin-left: 0.4em;
-  word-wrap: normal;
+    @include ellipsis;
+    min-width: 1.6em;
+    margin-left: .4em;
+    word-wrap: normal;
 }

 .tweet-date {
-  display: flex;
-  flex-shrink: 0;
-  margin-left: 4px;
+    display: flex;
+    flex-shrink: 0;
+    margin-left: 4px;
 }

-.tweet-date a,
-.username,
-.show-more a {
-  color: var(--fg_dark);
+.tweet-date a, .username, .show-more a {
+    color: var(--fg_dark);
 }

 .tweet-published {
-  margin-top: 10px;
-  margin-bottom: 3px;
-  color: var(--grey);
-  pointer-events: all;
+    margin: 0;
+    margin-top: 5px;
+    color: var(--grey);
+    pointer-events: all;
 }

 .tweet-avatar {
-  display: contents !important;
+    display: contents !important;

-  img {
-    float: left;
-    margin-top: 3px;
-    margin-left: -58px;
-    width: 48px;
-    height: 48px;
-  }
+    img {
+        float: left;
+        margin-top: 3px;
+        margin-left: -58px;
+        width: 48px;
+        height: 48px;
+    }
 }

 .avatar {
-  &.round {
-    border-radius: 50%;
-    -webkit-user-select: none;
-  }
-
-  &.mini {
-    position: unset;
-    margin-right: 5px;
-    margin-top: -1px;
-    width: 20px;
-    height: 20px;
-  }
+    &.round {
+        border-radius: 50%;
+        -webkit-user-select: none;
+    }
+    
+    &.mini {
+        position: unset;
+        margin-right: 5px;
+        margin-top: -1px;
+        width: 20px;
+        height: 20px;
+    }
 }

 .tweet-embed {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  height: 100%;
-  background-color: var(--bg_panel);
-
-  .tweet-content {
-    font-size: 18px;
-  }
-
-  .tweet-body {
    display: flex;
    flex-direction: column;
-    max-height: calc(100vh - 0.75em * 2);
-  }
+    justify-content: center;
+    height: 100%;
+    background-color: var(--bg_panel);

-  .card-image img {
-    height: auto;
-  }
+    .tweet-content { 
+        font-size: 18px;
+    }
+    
+    .tweet-body {
+        display: flex;
+        flex-direction: column;
+        max-height: calc(100vh - 0.75em * 2);
+    }

-  .avatar {
-    position: absolute;
-  }
+    .card-image img {
+        height: auto;
+    }
+    
+    .avatar {
+        position: absolute;
+    }
 }

 .attribution {
-  display: flex;
-  pointer-events: all;
-  margin: 5px 0;
+    display: flex;
+    pointer-events: all;
+    margin: 5px 0;

-  strong {
-    color: var(--fg_color);
-  }
+    strong {
+        color: var(--fg_color);
+    }
 }

 .media-tag-block {
-  padding-top: 5px;
-  pointer-events: all;
-  color: var(--fg_faded);
-
-  .icon-container {
-    padding-right: 2px;
-  }
-
-  .media-tag,
-  .icon-container {
+    padding-top: 5px;
+    pointer-events: all;
    color: var(--fg_faded);
-  }
+
+    .icon-container {
+        padding-right: 2px;
+    }
+
+    .media-tag, .icon-container {
+        color: var(--fg_faded);
+    }
 }

 .timeline-container .media-tag-block {
-  font-size: 13px;
+    font-size: 13px;
 }

 .tweet-geo {
-  color: var(--fg_faded);
+    color: var(--fg_faded);
 }

 .replying-to {
-  color: var(--fg_faded);
-  margin: -2px 0 4px;
+    color: var(--fg_faded);
+    margin: -2px 0 4px;

-  a {
-    pointer-events: all;
-  }
+    a {
+        pointer-events: all;
+    }
 }

-.retweet-header,
-.pinned,
-.tweet-stats {
-  align-content: center;
-  color: var(--grey);
-  display: flex;
-  flex-shrink: 0;
-  flex-wrap: wrap;
-  font-size: 14px;
-  font-weight: 600;
-  line-height: 22px;
+.retweet-header, .pinned, .tweet-stats {
+    align-content: center;
+    color: var(--grey);
+    display: flex;
+    flex-shrink: 0;
+    flex-wrap: wrap;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 22px;

-  span {
-    @include ellipsis;
-  }
+    span {
+        @include ellipsis;
+    }
 }

 .retweet-header {
-  margin-top: -5px !important;
+    margin-top: -5px !important;
 }

 .tweet-stats {
-  margin-bottom: -3px;
-  -webkit-user-select: none;
+    margin-bottom: -3px;
+    -webkit-user-select: none;
 }

 .tweet-stat {
-  padding-top: 5px;
-  min-width: 1em;
-  margin-right: 0.8em;
+    padding-top: 5px;
+    min-width: 1em;
+    margin-right: 0.8em;
 }

 .show-thread {
-  display: block;
-  pointer-events: all;
-  padding-top: 2px;
+    display: block;
+    pointer-events: all;
+    padding-top: 2px;
 }

 .unavailable-box {
-  width: 100%;
-  height: 100%;
-  padding: 12px;
-  border: solid 1px var(--dark_grey);
-  box-sizing: border-box;
-  border-radius: 10px;
-  background-color: var(--bg_color);
-  z-index: 2;
+    width: 100%;
+    height: 100%;
+    padding: 12px;
+    border: solid 1px var(--dark_grey);
+    box-sizing: border-box;
+    border-radius: 10px;
+    background-color: var(--bg_color);
+    z-index: 2;
 }

 .tweet-link {
-  height: 100%;
-  width: 100%;
-  left: 0;
-  top: 0;
-  position: absolute;
-  -webkit-user-select: none;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    top: 0;
+    position: absolute;
+    -webkit-user-select: none;

-  &:hover {
-    background-color: var(--bg_hover);
-  }
-}
-
-.latest-post-version {
-  border-bottom: 1px solid var(--dark_grey);
-  border-top: 1px solid var(--dark_grey);
-  padding: 01ch 0px;
-  margin: 1ch 0px;
-  color: var(--grey);
-
-  a {
-    pointer-events: all;
-  }
-}
-
-.community-note {
-  background-color: var(--bg_elements);
-  margin-top: 10px;
-  border: solid 1px var(--dark_grey);
-  border-radius: 10px;
-  overflow: hidden;
-  pointer-events: all;
-
-  &:hover {
-    background-color: var(--bg_panel);
-    border-color: var(--grey);
-  }
-}
-
-.community-note-header {
-  background-color: var(--bg_hover);
-  font-weight: 700;
-  padding: 8px 10px;
-  padding-top: 6px;
-  display: flex;
-  align-items: center;
-  gap: 2px;
-
-  .icon-container {
-    flex-shrink: 0;
-    color: var(--accent);
-  }
-}
-
-.community-note-text {
-  white-space: pre-line;
-  padding: 10px 10px;
-  padding-top: 6px;
+    &:hover {
+        background-color: var(--bg_hover);
+    }
 }
--- a/src/sass/tweet/card.scss
+++ b/src/sass/tweet/card.scss
@@ -1,119 +1,119 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 .card {
-  margin: 5px 0;
-  pointer-events: all;
-  max-height: unset;
+    margin: 5px 0;
+    pointer-events: all;
+    max-height: unset;
 }

 .card-container {
-  border: solid 1px var(--dark_grey);
-  border-radius: 10px;
-  background-color: var(--bg_elements);
-  overflow: hidden;
-  color: inherit;
-  display: flex;
-  flex-direction: row;
-  text-decoration: none !important;
+    border-radius: 10px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: var(--dark_grey);
+    background-color: var(--bg_elements);
+    overflow: hidden;
+    color: inherit;
+    display: flex;
+    flex-direction: row;
+    text-decoration: none !important;

-  &:hover {
-    border-color: var(--grey);
-  }
+    &:hover {
+        border-color: var(--grey);
+    }

-  .attachments {
-    margin: 0;
-    border-radius: 0;
-  }
+    .attachments {
+        margin: 0;
+        border-radius: 0;
+    }
 }

 .card-content {
-  padding: 0.5em;
+    padding: 0.5em;
 }

 .card-title {
-  @include ellipsis;
-  white-space: unset;
-  font-weight: bold;
-  font-size: 1.1em;
+    @include ellipsis;
+    white-space: unset;
+    font-weight: bold;
+    font-size: 1.1em;
 }

 .card-description {
-  margin: 0.3em 0;
-  white-space: pre-wrap;
+    margin: 0.3em 0;
+    white-space: pre-wrap;
 }

 .card-destination {
-  @include ellipsis;
-  color: var(--grey);
-  display: block;
+    @include ellipsis;
+    color: var(--grey);
+    display: block;
 }

 .card-content-container {
-  color: unset;
-  overflow: auto;
-
-  &:hover {
-    text-decoration: none;
-  }
+    color: unset;
+    overflow: auto;
+    &:hover {
+        text-decoration: none;
+    }
 }

 .card-image-container {
-  width: 98px;
-  flex-shrink: 0;
-  position: relative;
-  overflow: hidden;
-
-  &:before {
-    content: "";
-    display: block;
-    padding-top: 100%;
-  }
+    width: 98px;
+    flex-shrink: 0;
+    position: relative;
+    overflow: hidden;
+    &:before {
+        content: "";
+        display: block;
+        padding-top: 100%;
+    }
 }

 .card-image {
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  background-color: var(--bg_overlays);
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: var(--bg_overlays);

-  img {
-    width: 100%;
-    height: 100%;
-    max-height: 400px;
-    display: block;
-    object-fit: cover;
-  }
+    img {
+        width: 100%;
+        height: 100%;
+        max-height: 400px;
+        display: block;
+        object-fit: cover;
+    }
 }

 .card-overlay {
-  @include play-button;
-  opacity: 0.8;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+    @include play-button;
+    opacity: 0.8;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }

 .large {
-  .card-container {
-    display: block;
-  }
-
-  .card-image-container {
-    width: unset;
-
-    &:before {
-      display: none;
+    .card-container {
+        display: block;
    }
-  }

-  .card-image {
-    position: unset;
-    border-style: solid;
-    border-color: var(--dark_grey);
-    border-width: 0;
-    border-bottom-width: 1px;
-  }
+    .card-image-container {
+        width: unset;
+
+        &:before {
+            display: none;
+        }
+    }
+
+    .card-image {
+        position: unset;
+        border-style: solid;
+        border-color: var(--dark_grey);
+        border-width: 0;
+        border-bottom-width: 1px;
+    }
 }
--- a/src/sass/tweet/embed.scss
+++ b/src/sass/tweet/embed.scss
@@ -1,17 +1,17 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 .embed-video {
-  .gallery-video {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    background-color: black;
-    top: 0%;
-    left: 0%;
-  }
+    .gallery-video {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        background-color: black;
+        top: 0%;
+        left: 0%;
+    }

-  .gallery-video > .attachment {
-    max-height: unset;
-  }
+    .video-container {
+        max-height: unset;
+    }
 }
--- a/src/sass/tweet/media.scss
+++ b/src/sass/tweet/media.scss
@@ -1,165 +1,119 @@
-@import "_variables";
+@import '_variables';

 .gallery-row {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  overflow: hidden;
-  flex-grow: 1;
-  max-height: 379.5px;
-  max-width: 533px;
-  pointer-events: all;
-
-  &.mixed-row {
-    .attachment {
-      min-width: 0;
-      min-height: 0;
-      flex: 1 1 0;
-      max-height: 379.5px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #101010;
-    }
-
-    .still-image,
-    .still-image img,
-    .attachment > video,
-    .attachment > img {
-      width: 100%;
-      height: 100%;
-      max-width: none;
-      max-height: none;
-    }
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    overflow: hidden;
+    flex-grow: 1;
+    max-height: 379.5px;
+    max-width: 533px;
+    pointer-events: all;

    .still-image {
-      display: flex;
-      align-self: stretch;
+        width: 100%;
+        display: flex;
    }
-
-    .still-image img {
-      flex-basis: auto;
-      flex-grow: 0;
-      object-fit: cover;
-    }
-
-    .attachment > video,
-    .attachment > img {
-      object-fit: cover;
-    }
-
-    .attachment > video {
-      object-fit: contain;
-    }
-  }
 }

 .attachments {
-  margin-top: 0.35em;
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-  max-height: 600px;
-  border-radius: 7px;
-  overflow: hidden;
-  flex-flow: column;
-  background-color: var(--bg_color);
-  align-items: center;
-  pointer-events: all;
+    margin-top: .35em;
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    max-height: 600px;
+    border-radius: 7px;
+    overflow: hidden;
+    flex-flow: column;
+    background-color: var(--bg_color);
+    align-items: center;
+    pointer-events: all;
+
+    .image-attachment {
+        width: 100%;
+    }
 }

 .attachment {
-  position: relative;
-  line-height: 0;
-  overflow: hidden;
-  margin: 0 0.25em 0 0;
-  flex-grow: 1;
-  box-sizing: border-box;
-  min-width: 2em;
+    position: relative;
+    line-height: 0;
+    overflow: hidden;
+    margin: 0 .25em 0 0;
+    flex-grow: 1;
+    box-sizing: border-box;
+    min-width: 2em;

-  &:last-child {
-    margin: 0;
+    &:last-child {
+        margin: 0;
+        max-height: 530px;
+    }
+}
+
+.gallery-gif video {
    max-height: 530px;
-  }
-}
-
-.media-gif {
-  display: table;
-  background-color: unset;
-  width: unset;
-  max-height: unset;
-}
-
-.media-gif video {
-  max-height: 530px;
-  background-color: #101010;
+    background-color: #101010;
 }

 .still-image {
-  max-height: 379.5px;
-  max-width: 533px;
-
-  img {
-    object-fit: cover;
-    max-width: 100%;
    max-height: 379.5px;
-    flex-basis: 300px;
-    flex-grow: 1;
-  }
+    max-width: 533px;
+    justify-content: center;
+
+    img {
+        object-fit: cover;
+        max-width: 100%;
+        max-height: 379.5px;
+        flex-basis: 300px;
+        flex-grow: 1;
+    }
 }

-.alt-text {
-  margin: 0px;
-  padding: 11px 7px;
-  box-sizing: border-box;
-  position: absolute;
-  bottom: 10px;
-  left: 10px;
-  width: 2.98em;
-  max-height: 25px;
-  white-space: pre;
-  overflow: hidden;
-  border-radius: 10px;
-  color: var(--fg_color);
-  font-size: 12px;
-  font-weight: bold;
-  background: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(12px);
+.image {
+    display: inline-block;
 }

-.alt-text:hover {
-  padding: 7px;
-  width: Min(230px, calc(100% - 10px * 2));
-  max-height: calc(100% - 10px);
-  line-height: 1.2em;
-  white-space: pre-wrap;
-  transition-duration: 0.4s;
-  transition-property: max-height;
-}
+// .single-image {
+//     display: inline-block;
+//     width: 100%;
+//     max-height: 600px;
+
+//     .attachments {
+//         width: unset;
+//         max-height: unset;
+//         display: inherit;
+//     }
+// }

 .overlay-circle {
-  border-radius: 50%;
-  background-color: var(--dark_grey);
-  width: 40px;
-  height: 40px;
-  align-items: center;
-  display: flex;
-  border-width: 5px;
-  border-color: var(--play_button);
-  border-style: solid;
+    border-radius: 50%;
+    background-color: var(--dark_grey);
+    width: 40px;
+    height: 40px;
+    align-items: center;
+    display: flex;
+    border-width: 5px;
+    border-color: var(--play_button);
+    border-style: solid;
 }

 .overlay-triangle {
-  width: 0;
-  height: 0;
-  border-style: solid;
-  border-width: 12px 0 12px 17px;
-  border-color: transparent transparent transparent var(--play_button);
-  margin-left: 14px;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 12px 0 12px 17px;
+    border-color: transparent transparent transparent var(--play_button);
+    margin-left: 14px;
+}
+
+.media-gif {
+    display: table;
+    background-color: unset;
+    width: unset;
 }

 .media-body {
-  flex: 1;
-  padding: 0;
-  white-space: pre-wrap;
+    flex: 1;
+    padding: 0;
+    white-space: pre-wrap;
 }
--- a/src/sass/tweet/poll.scss
+++ b/src/sass/tweet/poll.scss
@@ -1,42 +1,42 @@
-@import "_variables";
+@import '_variables';

 .poll-meter {
-  overflow: hidden;
-  position: relative;
-  margin: 6px 0;
-  height: 26px;
-  background: var(--bg_color);
-  border-radius: 5px;
-  display: flex;
-  align-items: center;
+    overflow: hidden;
+    position: relative;
+    margin: 6px 0;
+    height: 26px;
+    background: var(--bg_color);
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
 }

 .poll-choice-bar {
-  height: 100%;
-  position: absolute;
-  background: var(--dark_grey);
+    height: 100%;
+    position: absolute;
+    background: var(--dark_grey);
 }

 .poll-choice-value {
-  position: relative;
-  font-weight: bold;
-  margin-left: 5px;
-  margin-right: 6px;
-  min-width: 30px;
-  text-align: right;
-  pointer-events: all;
+    position: relative;
+    font-weight: bold;
+    margin-left: 5px;
+    margin-right: 6px;
+    min-width: 30px;
+    text-align: right;
+    pointer-events: all;
 }

 .poll-choice-option {
-  position: relative;
-  pointer-events: all;
+    position: relative;
+    pointer-events: all;
 }

 .poll-info {
-  color: var(--grey);
-  pointer-events: all;
+    color: var(--grey);
+    pointer-events: all;
 }

 .leader .poll-choice-bar {
-  background: var(--accent_dark);
+    background: var(--accent_dark);
 }
--- a/src/sass/tweet/quote.scss
+++ b/src/sass/tweet/quote.scss
@@ -1,120 +1,94 @@
-@import "_variables";
+@import '_variables';

 .quote {
-  margin-top: 10px;
-  border: solid 1px var(--dark_grey);
-  border-radius: 10px;
-  background-color: var(--bg_elements);
-  overflow: hidden;
-  pointer-events: all;
-  position: relative;
-  width: 100%;
-
-  &:hover {
-    border-color: var(--grey);
-  }
-
-  &.unavailable:hover {
-    border-color: var(--dark_grey);
-  }
-
-  .tweet-name-row {
-    padding: 8px 10px 6px 10px;
-  }
-
-  .quote-text {
+    margin-top: 10px;
+    border: solid 1px var(--dark_grey);
+    border-radius: 10px;
+    background-color: var(--bg_elements);
    overflow: hidden;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    padding: 10px;
-    padding-top: 0;
-  }
-
-  .show-thread {
-    padding: 0px 10px 6px 10px;
-    margin-top: -6px;
-  }
-
-  .quote-latest {
-    padding: 0px 10px 6px 10px;
-    color: var(--grey);
-  }
-
-  .replying-to {
-    padding: 0px 10px;
-    padding-bottom: 4px;
-    margin: unset;
-  }
-
-  .community-note {
-    background-color: var(--bg_panel);
-    border: unset;
-    border-top: solid 1px var(--dark_grey);
-    border-radius: unset;
-    margin-top: 0;
+    pointer-events: all;
+    position: relative;
+    width: 100%;

    &:hover {
-      border-top-color: var(--grey);
+        border-color: var(--grey);
    }

-    .community-note-header {
-      background-color: var(--bg_panel);
-      padding-bottom: 0;
+    &.unavailable:hover {
+        border-color: var(--dark_grey);
+    }
+
+    .tweet-name-row {
+        padding: 6px 8px;
+        margin-top: 1px;
+    }
+
+    .quote-text {
+        overflow: hidden;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        padding: 0px 8px 8px 8px;
+    }
+
+    .show-thread {
+        padding: 0px 8px 6px 8px;
+        margin-top: -6px;
+    }
+
+    .replying-to {
+        padding: 0px 8px;
+        margin: unset;
    }
-  }
 }

 .unavailable-quote {
-  padding: 12px;
-  display: block;
+    padding: 12px;
 }

 .quote-link {
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-  position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    position: absolute;
 }

 .quote-media-container {
-  max-height: 300px;
-  display: flex;
-
-  .card {
-    margin: unset;
-  }
-
-  .attachments {
-    border-radius: 0;
-  }
-
-  .media-gif {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-  }
-
-  .media-gif > .attachment {
-    display: flex;
-    justify-content: center;
-    background-color: var(--bg_color);
-
-    video {
-      height: unset;
-      width: unset;
-      max-height: 100%;
-      max-width: 100%;
-    }
-  }
-
-  .gallery-row .attachment,
-  .gallery-row .attachment > video,
-  .gallery-row .attachment > img {
    max-height: 300px;
-  }
+    display: flex;

-  .still-image img {
-    max-height: 250px;
-  }
+    .card {
+        margin: unset;
+    }
+
+    .attachments {
+        border-radius: 0;
+    }
+
+    .media-gif {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+    }
+
+    .gallery-gif .attachment {
+        display: flex;
+        justify-content: center;
+        background-color: var(--bg_color);
+
+        video {
+            height: unset;
+            width: unset;
+            max-height: 100%;
+            max-width: 100%;
+        }
+    }
+
+    .gallery-video, .gallery-gif {
+        max-height: 300px;
+    }
+
+    .still-image img {
+        max-height: 250px
+    }
 }
--- a/src/sass/tweet/thread.scss
+++ b/src/sass/tweet/thread.scss
@@ -1,154 +1,138 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

-.conversation,
-.edit-history {
-  @include panel(100%, 600px);
+.conversation {
+    @include panel(100%, 600px);

-  .show-more {
-    margin-bottom: 10px;
-  }
+    .show-more {
+        margin-bottom: 10px;
+    }
 }

-.main-thread,
-.latest-edit {
-  margin-bottom: 20px;
+.main-thread {
+    margin-bottom: 20px;
+    background-color: var(--bg_panel);
 }

-.reply {
-  margin-bottom: 10px;
-}
-
-.main-tweet,
-.replies,
-.edit-history > div {
-  body.fixed-nav & {
+.main-tweet, .replies {
    padding-top: 50px;
    margin-top: -50px;
-  }
-}
-
-.edit-history-header {
-  padding: 10px;
-  margin-bottom: 5px;
-  font-size: 16px;
-  font-weight: bold;
-  background-color: var(--bg_panel);
-}
-
-.tweet-edit {
-  margin-bottom: 5px;
 }

 .main-tweet .tweet-content {
-  font-size: 18px;
+    font-size: 18px;
 }

-@media (max-width: 600px) {
-  .main-tweet .tweet-content {
-    font-size: 16px;
-  }
+@media(max-width: 600px) {
+    .main-tweet .tweet-content {
+        font-size: 16px;
+    }
+}
+
+.reply {
+    background-color: var(--bg_panel);
+    margin-bottom: 10px;
 }

 .thread-line {
-  .timeline-item::before,
-  &.timeline-item::before {
-    background: var(--accent_dark);
-    content: "";
-    position: relative;
-    min-width: 3px;
-    width: 3px;
-    left: 26px;
-    border-radius: 2px;
-    margin-left: -3px;
-    margin-bottom: 37px;
-    top: 56px;
-    z-index: 1;
-    pointer-events: none;
-  }
+    .timeline-item::before,
+    &.timeline-item::before {
+        background: var(--accent_dark);
+        content: '';
+        position: relative;
+        min-width: 3px;
+        width: 3px;
+        left: 26px;
+        border-radius: 2px;
+        margin-left: -3px;
+        margin-bottom: 37px;
+        top: 56px;
+        z-index: 1;
+        pointer-events: none;
+    }

-  .with-header:not(:first-child)::after {
-    background: var(--accent_dark);
-    content: "";
-    position: relative;
-    float: left;
-    min-width: 3px;
-    width: 3px;
-    right: calc(100% - 26px);
-    border-radius: 2px;
-    margin-left: -3px;
-    margin-bottom: 37px;
-    bottom: 10px;
-    height: 30px;
-    z-index: 1;
-    pointer-events: none;
-  }
+    .with-header:not(:first-child)::after {
+        background: var(--accent_dark);
+        content: '';
+        position: relative;
+        float: left;
+        min-width: 3px;
+        width: 3px;
+        right: calc(100% - 26px);
+        border-radius: 2px;
+        margin-left: -3px;
+        margin-bottom: 37px;
+        bottom: 10px;
+        height: 30px;
+        z-index: 1;
+        pointer-events: none;
+    }

-  .unavailable::before {
-    top: 48px;
-    margin-bottom: 28px;
-  }
+    .unavailable::before {
+        top: 48px;
+        margin-bottom: 28px;
+    }

-  .more-replies::before {
-    content: "...";
-    background: unset;
-    color: var(--more_replies_dots);
-    font-weight: bold;
-    font-size: 20px;
-    line-height: 0.25em;
-    left: 1.2em;
-    width: 5px;
-    top: 2px;
-    margin-bottom: 0;
-    margin-left: -2.5px;
-  }
+    .more-replies::before {
+        content: '...';
+        background: unset;
+        color: var(--more_replies_dots);
+        font-weight: bold;
+        font-size: 20px;
+        line-height: 0.25em;
+        left: 1.2em;
+        width: 5px;
+        top: 2px;
+        margin-bottom: 0;
+        margin-left: -2.5px;
+    }

-  .earlier-replies {
-    padding-bottom: 0;
-    margin-bottom: -5px;
-  }
+    .earlier-replies {
+        padding-bottom: 0;
+        margin-bottom: -5px;
+    }
 }

 .timeline-item.thread-last::before {
-  background: unset;
-  min-width: unset;
-  width: 0;
-  margin: 0;
+    background: unset;
+    min-width: unset;
+    width: 0;
+    margin: 0;
 }

 .more-replies {
-  padding-top: 0.3em !important;
+    padding-top: 0.3em !important;
 }

 .more-replies-text {
-  @include ellipsis;
-  display: block;
-  margin-left: 58px;
-  padding: 7px 0;
+    @include ellipsis;
+    display: block;
+    margin-left: 58px;
+    padding: 7px 0;
 }

 .timeline-item.thread.more-replies-thread {
-  padding: 0 0.75em;
-
-  &::before {
-    top: 40px;
-    margin-bottom: 31px;
-  }
-
-  .more-replies {
-    display: flex;
-    padding-top: unset !important;
-    margin-top: 8px;
+    padding: 0 0.75em;

    &::before {
-      display: inline-block;
-      position: relative;
-      top: -1px;
-      line-height: 0.4em;
+        top: 40px;
+        margin-bottom: 31px;
    }

-    .more-replies-text {
-      display: inline;
+    .more-replies {
+        display: flex;
+        padding-top: unset !important;
+        margin-top: 8px;
+
+        &::before {
+            display: inline-block;
+            position: relative;
+            top: -1px;
+            line-height: 0.4em;
+        }
+
+        .more-replies-text {
+            display: inline;
+        }
    }
-  }
 }
--- a/src/sass/tweet/video.scss
+++ b/src/sass/tweet/video.scss
@@ -1,77 +1,68 @@
-@import "_variables";
-@import "_mixins";
+@import '_variables';
+@import '_mixins';

 video {
-  height: 100%;
-  width: 100%;
+    max-height: 100%;
+    width: 100%;
 }

 .gallery-video {
-  display: flex;
-  overflow: hidden;
-  
-  &.card-container {
-    flex-direction: column;
-    width: 100%;
-  }
+    display: flex;
+    overflow: hidden;
+}

-  > .attachment {
+.gallery-video.card-container {
+    flex-direction: column;
+}
+
+.video-container {
    min-height: 80px;
    min-width: 200px;
    max-height: 530px;
    margin: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;

    img {
-      max-height: 100%;
-      max-width: 100%;
+        max-height: 100%;
+        max-width: 100%;
    }
-  }
 }

 .video-overlay {
-  @include play-button;
-  background-color: $shadow;
+    @include play-button;
+    background-color: $shadow;

-  p {
-    position: relative;
-    z-index: 0;
-    text-align: center;
-    top: calc(50% - 20px);
-    font-size: 20px;
-    line-height: 1.3;
-    margin: 0 20px;
-  }
+    p {
+        position: relative;
+        z-index: 0;
+        text-align: center;
+        top: calc(50% - 20px);
+        font-size: 20px;
+        line-height: 1.3;
+        margin: 0 20px;
+    }

-  .overlay-circle {
-    position: relative;
-    z-index: 0;
-    top: calc(50% - 20px);
-    margin: 0 auto;
-    width: 40px;
-    height: 40px;
-  }
+    div {
+        position: relative;
+        z-index: 0;
+        top: calc(50% - 20px);
+        margin: 0 auto;
+        width: 40px;
+        height: 40px;
+    }

-  .overlay-duration {
-    position: absolute;
-    bottom: 8px;
-    left: 8px;
-    background-color: #0000007a;
-    line-height: 1em;
-    padding: 4px 6px 4px 6px;
-    border-radius: 5px;
-    font-weight: bold;
-  }
+    form {
+        width: 100%;
+        height: 100%;
+        align-items: center;
+        justify-content: center;
+        display: flex;
+    }

-  form {
-    width: 100%;
-    height: 100%;
-    align-items: center;
-    justify-content: center;
-    display: flex;
-  }
-
-  button {
-    padding: 5px 8px;
-    font-size: 16px;
-  }
+    button {
+        padding: 5px 8px;
+        font-size: 16px;
+    }
 }
--- a/src/tid.nim
+++ b/src/tid.nim
@@ -1,62 +0,0 @@
-import std/[asyncdispatch, base64, httpclient, random, strutils, sequtils, times]
-import nimcrypto
-import experimental/parser/tid
-
-randomize()
-
-const defaultKeyword = "obfiowerehiring";
-const pairsUrl =
-  "https://raw.githubusercontent.com/fa0311/x-client-transaction-id-pair-dict/refs/heads/main/pair.json";
-
-var
-  cachedPairs: seq[TidPair] = @[]
-  lastCached = 0
-  # refresh every hour
-  ttlSec = 60 * 60
-
-proc getPair(): Future[TidPair] {.async.} =
-  if cachedPairs.len == 0 or int(epochTime()) - lastCached > ttlSec:
-    lastCached = int(epochTime())
-
-    let client = newAsyncHttpClient()
-    defer: client.close()
-
-    let resp = await client.get(pairsUrl)
-    if resp.status == $Http200:
-      cachedPairs = parseTidPairs(await resp.body)
-
-  return sample(cachedPairs)
-
-proc encodeSha256(text: string): array[32, byte] =
-  let
-    data = cast[ptr byte](addr text[0])
-    dataLen = uint(len(text))
-    digest = sha256.digest(data, dataLen)
-  return digest.data
-
-proc encodeBase64[T](data: T): string =
-  return encode(data).replace("=", "")
-
-proc decodeBase64(data: string): seq[byte] =
-  return cast[seq[byte]](decode(data))
-
-proc genTid*(path: string): Future[string] {.async.} =
-  let 
-    pair = await getPair()
-
-    timeNow = int(epochTime() - 1682924400)
-    timeNowBytes = @[
-      byte(timeNow and 0xff),
-      byte((timeNow shr 8) and 0xff),
-      byte((timeNow shr 16) and 0xff),
-      byte((timeNow shr 24) and 0xff)
-    ]
-
-    data = "GET!" & path & "!" & $timeNow & defaultKeyword & pair.animationKey
-    hashBytes = encodeSha256(data)
-    keyBytes = decodeBase64(pair.verification)
-    bytesArr = keyBytes & timeNowBytes & hashBytes[0 ..< 16] & @[3'u8]
-    randomNum = byte(rand(256))
-    tid = @[randomNum] & bytesArr.mapIt(it xor randomNum)
-
-  return encodeBase64(tid)
--- a/src/types.nim
+++ b/src/types.nim
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import times, sequtils, options, tables
+import times, sequtils, options, tables, uri
 import prefs_impl

 genPrefsType()
@@ -13,13 +13,19 @@ type
  TimelineKind* {.pure.} = enum
    tweets, replies, media

-  ApiUrl* = object
-    endpoint*: string
-    params*: seq[(string, string)]
-
-  ApiReq* = object
-    oauth*: ApiUrl
-    cookie*: ApiUrl
+  Api* {.pure.} = enum
+    tweetDetail
+    tweetResult
+    search
+    list
+    listBySlug
+    listMembers
+    listTweets
+    userRestId
+    userScreenName
+    userTweets
+    userTweetsAndReplies
+    userMedia

  RateLimit* = object
    limit*: int
@@ -36,7 +42,7 @@ type
    pending*: int
    limited*: bool
    limitedAt*: int
-    apis*: Table[string, RateLimit]
+    apis*: Table[Api, RateLimit]
    case kind*: SessionKind
    of oauth:
      oauthToken*: string
@@ -45,6 +51,10 @@ type
      authToken*: string
      ct0*: string

+  SessionAwareUrl* = object
+    oauthUrl*: Uri
+    cookieUrl*: Uri
+
  Error* = enum
    null = 0
    noUserMatches = 17
@@ -130,33 +140,12 @@ type
    fromUser*: seq[string]
    since*: string
    until*: string
-    minLikes*: string
+    near*: string
    sep*: string

  Gif* = object
    url*: string
    thumb*: string
-    altText*: string
-
-  Photo* = object
-    url*: string
-    altText*: string
-
-  MediaKind* = enum
-    photoMedia
-    videoMedia
-    gifMedia
-
-  Media* = object
-    case kind*: MediaKind
-    of photoMedia:
-      photo*: Photo
-    of videoMedia:
-      video*: Video
-    of gifMedia:
-      gif*: Gif
-
-  MediaEntities* = seq[Media]

  GalleryPhoto* = object
    url*: string
@@ -236,9 +225,9 @@ type
    quote*: Option[Tweet]
    card*: Option[Card]
    poll*: Option[Poll]
-    media*: MediaEntities
-    history*: seq[int64]
-    note*: string
+    gif*: Option[Gif]
+    video*: Option[Video]
+    photos*: seq[string]

  Tweets* = seq[Tweet]

@@ -259,10 +248,6 @@ type
    after*: Chain
    replies*: Result[Chain]

-  EditHistory* = object
-    latest*: Tweet
-    history*: Tweets
-
  Timeline* = Result[Tweets]

  Profile* = object
@@ -296,17 +281,10 @@ type
    hmacKey*: string
    base64Media*: bool
    minTokens*: int
-    enableRSSUserTweets*: bool
-    enableRSSUserReplies*: bool
-    enableRSSUserMedia*: bool
-    enableRSSSearch*: bool
-    enableRSSList*: bool
+    enableRss*: bool
    enableDebug*: bool
    proxy*: string
    proxyAuth*: string
-    apiProxy*: string
-    disableTid*: bool
-    maxConcurrentReqs*: int

    rssCacheTime*: int
    listCacheTime*: int
@@ -325,24 +303,3 @@ proc contains*(thread: Chain; tweet: Tweet): bool =

 proc add*(timeline: var seq[Tweets]; tweet: Tweet) =
  timeline.add @[tweet]
-
-proc getPhotos*(tweet: Tweet): seq[Photo] =
-  tweet.media.filterIt(it.kind == photoMedia).mapIt(it.photo)
-
-proc getVideos*(tweet: Tweet): seq[Video] =
-  tweet.media.filterIt(it.kind == videoMedia).mapIt(it.video)
-
-proc hasPhotos*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == photoMedia)
-
-proc hasVideos*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == videoMedia)
-
-proc hasGifs*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == gifMedia)
-
-proc getThumb*(media: Media): string =
-  case media.kind
-  of photoMedia: media.photo.url
-  of videoMedia: media.video.thumb
-  of gifMedia: media.gif.thumb
--- a/src/utils.nim
+++ b/src/utils.nim
@@ -9,7 +9,7 @@ var
 const
  https* = "https://"
  twimg* = "pbs.twimg.com/"
-  nitterParams* = ["name", "tab", "id", "list", "referer", "scroll", "prefs"]
+  nitterParams = ["name", "tab", "id", "list", "referer", "scroll"]
  twitterDomains = @[
    "twitter.com",
    "pic.twitter.com",
--- a/src/views/embed.nim
+++ b/src/views/embed.nim
@@ -9,17 +9,14 @@ import general, tweet
 const doctype = "<!DOCTYPE html>\n"

 proc renderVideoEmbed*(tweet: Tweet; cfg: Config; req: Request): string =
-  let 
-    video = tweet.getVideos()[0]
-    thumb = video.thumb
-    vidUrl = getVideoEmbed(cfg, tweet.id)
-    prefs = Prefs(hlsPlayback: true, mp4Playback: true)
-
+  let thumb = get(tweet.video).thumb
+  let vidUrl = getVideoEmbed(cfg, tweet.id)
+  let prefs = Prefs(hlsPlayback: true, mp4Playback: true)
  let node = buildHtml(html(lang="en")):
    renderHead(prefs, cfg, req, video=vidUrl, images=(@[thumb]))

    body:
      tdiv(class="embed-video"):
-        renderVideo(video, prefs, "")
+        renderVideo(get(tweet.video), prefs, "")

  result = doctype & $node
--- a/src/views/general.nim
+++ b/src/views/general.nim
@@ -29,17 +29,19 @@ proc renderNavbar(cfg: Config; req: Request; rss, canonical: string): VNode =

      tdiv(class="nav-item right"):
        icon "search", title="Search", href="/search"
-        if rss.len > 0:
+        if cfg.enableRss and rss.len > 0:
          icon "rss", title="RSS Feed", href=rss
-        icon "bird", title="Open in X", href=canonical
+        icon "bird", title="Open in Twitter", href=canonical
        a(href="https://liberapay.com/zedeus"): verbatim lp
        icon "info", title="About", href="/about"
        icon "cog", title="Preferences", href=("/settings?referer=" & encodeUrl(path))

 proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
                 video=""; images: seq[string] = @[]; banner=""; ogTitle="";
-                 rss=""; alternate=""): VNode =
-  let theme = prefs.theme.toTheme
+                 rss=""; canonical=""): VNode =
+  var theme = prefs.theme.toTheme
+  if "theme" in req.params:
+    theme = req.params["theme"].toTheme
    
  let ogType =
    if video.len > 0: "video"
@@ -50,8 +52,8 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
  let opensearchUrl = getUrlPrefix(cfg) & "/opensearch"

  buildHtml(head):
-    link(rel="stylesheet", type="text/css", href="/css/style.css?v=29")
-    link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=4")
+    link(rel="stylesheet", type="text/css", href="/css/style.css?v=19")
+    link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=3")

    if theme.len > 0:
      link(rel="stylesheet", type="text/css", href=(&"/css/themes/{theme}.css"))
@@ -64,10 +66,10 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
    link(rel="search", type="application/opensearchdescription+xml", title=cfg.title,
                            href=opensearchUrl)

-    if alternate.len > 0:
-      link(rel="alternate", href=alternate, title="View on X")
+    if canonical.len > 0:
+      link(rel="canonical", href=canonical)

-    if rss.len > 0:
+    if cfg.enableRss and rss.len > 0:
      link(rel="alternate", type="application/rss+xml", href=rss, title="RSS feed")

    if prefs.hlsPlayback:
@@ -123,15 +125,14 @@ proc renderMain*(body: VNode; req: Request; cfg: Config; prefs=defaultPrefs;
                 titleText=""; desc=""; ogTitle=""; rss=""; video="";
                 images: seq[string] = @[]; banner=""): string =

-  let twitterLink = getTwitterLink(req.path, req.params)
+  let canonical = getTwitterLink(req.path, req.params)

  let node = buildHtml(html(lang="en")):
    renderHead(prefs, cfg, req, titleText, desc, video, images, banner, ogTitle,
-               rss, twitterLink)
+               rss, canonical)

-    let bodyClass = if prefs.stickyNav: "fixed-nav" else: ""
-    body(class=bodyClass):
-      renderNavbar(cfg, req, rss, twitterLink)
+    body:
+      renderNavbar(cfg, req, rss, canonical)

      tdiv(class="container"):
        body
--- a/src/views/preferences.nim
+++ b/src/views/preferences.nim
@@ -32,8 +32,7 @@ macro renderPrefs*(): untyped =

      result[2].add stmt

-proc renderPreferences*(prefs: Prefs; path: string; themes: seq[string];
-                        prefsUrl: string): VNode =
+proc renderPreferences*(prefs: Prefs; path: string; themes: seq[string]): VNode =
  buildHtml(tdiv(class="overlay-panel")):
    fieldset(class="preferences"):
      form(`method`="post", action="/saveprefs", autocomplete="off"):
@@ -41,14 +40,6 @@ proc renderPreferences*(prefs: Prefs; path: string; themes: seq[string];

        renderPrefs()

-        legend: text "Bookmark"
-        p(class="bookmark-note"):
-          text "Save this URL to restore your preferences (?prefs works on all pages)"
-        pre(class="prefs-code"):
-          text prefsUrl
-        p(class="bookmark-note"):
-          verbatim "You can override preferences with query parameters (e.g. <code>?hlsPlayback=on</code>). These overrides aren't saved to cookies, and links won't retain the parameters. Intended for configuring RSS feeds and other cookieless environments. Hover over a preference to see its name."
-
        h4(class="note"):
          text "Preferences are stored client-side using cookies without any personal information."

--- a/src/views/profile.nim
+++ b/src/views/profile.nim
@@ -26,7 +26,6 @@ proc renderUserCard*(user: User; prefs: Prefs): VNode =

      tdiv(class="profile-card-tabs-name"):
        linkUser(user, class="profile-card-fullname")
-        verifiedIcon(user)
        linkUser(user, class="profile-card-username")

    tdiv(class="profile-card-extra"):
--- a/src/views/renderutils.nim
+++ b/src/views/renderutils.nim
@@ -26,9 +26,7 @@ proc icon*(icon: string; text=""; title=""; class=""; href=""): VNode =
 template verifiedIcon*(user: User): untyped {.dirty.} =
  if user.verifiedType != VerifiedType.none:
    let lower = ($user.verifiedType).toLowerAscii()
-    buildHtml(tdiv(class=(&"verified-icon {lower}"))):
-      icon "circle", class="verified-icon-circle", title=(&"Verified {lower} account")
-      icon "ok", class="verified-icon-check", title=(&"Verified {lower} account")
+    icon "ok", class=(&"verified-icon {lower}"), title=(&"Verified {lower} account")
  else:
    text ""

@@ -42,6 +40,7 @@ proc linkUser*(user: User, class=""): VNode =
  buildHtml(a(href=href, class=class, title=nameText)):
    text nameText
    if isName:
+      verifiedIcon(user)
      if user.protected:
        text " "
        icon "lock", title="Protected account"
@@ -65,20 +64,20 @@ proc buttonReferer*(action, text, path: string; class=""; `method`="post"): VNod
      text text

 proc genCheckbox*(pref, label: string; state: bool): VNode =
-  buildHtml(label(class="pref-group checkbox-container", title=pref)):
+  buildHtml(label(class="pref-group checkbox-container")):
    text label
    input(name=pref, `type`="checkbox", checked=state)
    span(class="checkbox")

 proc genInput*(pref, label, state, placeholder: string; class=""; autofocus=true): VNode =
  let p = placeholder
-  buildHtml(tdiv(class=("pref-group pref-input " & class), title=pref)):
+  buildHtml(tdiv(class=("pref-group pref-input " & class))):
    if label.len > 0:
      label(`for`=pref): text label
    input(name=pref, `type`="text", placeholder=p, value=state, autofocus=(autofocus and state.len == 0))

 proc genSelect*(pref, label, state: string; options: seq[string]): VNode =
-  buildHtml(tdiv(class="pref-group pref-input", title=pref)):
+  buildHtml(tdiv(class="pref-group pref-input")):
    label(`for`=pref): text label
    select(name=pref):
      for opt in options:
@@ -90,16 +89,9 @@ proc genDate*(pref, state: string): VNode =
    input(name=pref, `type`="date", value=state)
    icon "calendar"

-proc genNumberInput*(pref, label, state, placeholder: string; class=""; autofocus=true; min="0"): VNode =
-  let p = placeholder
-  buildHtml(tdiv(class=("pref-group pref-input " & class))):
-    if label.len > 0:
-      label(`for`=pref): text label
-    input(name=pref, `type`="number", placeholder=p, value=state, autofocus=(autofocus and state.len == 0), min=min, step="1")
-
-proc genImg*(url: string; class=""; alt=""): VNode =
+proc genImg*(url: string; class=""): VNode =
  buildHtml():
-    img(src=getPicUrl(url), class=class, alt=alt, loading="lazy")
+    img(src=getPicUrl(url), class=class, alt="", loading="lazy")

 proc getTabClass*(query: Query; tab: QueryKind): string =
  if query.kind == tab: "tab-item active"
--- a/src/views/rss.nimf
+++ b/src/views/rss.nimf
@@ -1,38 +1,26 @@
 #? stdtmpl(subsChar = '$', metaChar = '#')
 ## SPDX-License-Identifier: AGPL-3.0-only
-#import strutils, sequtils, xmltree, strformat, options, unicode
+#import strutils, xmltree, strformat, options, unicode
 #import ../types, ../utils, ../formatters, ../prefs
-## Snowflake ID cutoff for RSS GUID format transition
-## Corresponds to approximately December 14, 2025 UTC
-#const guidCutoff = 2000000000000000000'i64
 #
 #proc getTitle(tweet: Tweet; retweet: string): string =
-#var prefix = ""
-#if tweet.pinned: prefix = "Pinned: "
-#elif retweet.len > 0: prefix = &"RT by @{retweet}: "
-#elif tweet.reply.len > 0: prefix = &"R to @{tweet.reply[0]}: "
+#if tweet.pinned: result = "Pinned: "
+#elif retweet.len > 0: result = &"RT by @{retweet}: "
+#elif tweet.reply.len > 0: result = &"R to @{tweet.reply[0]}: "
 #end if
 #var text = stripHtml(tweet.text)
 ##if unicode.runeLen(text) > 32:
 ##  text = unicode.runeSubStr(text, 0, 32) & "..."
 ##end if
-#text = xmltree.escape(text)
-#if text.len > 0:
-#  result = prefix & text
-#  return
+#result &= xmltree.escape(text)
+#if result.len > 0: return
 #end if
-#if tweet.media.len > 0:
-#  result = prefix
-#  let firstKind = tweet.media[0].kind
-#  if tweet.media.anyIt(it.kind != firstKind):
-#    result &= "Media"
-#  else:
-#    case firstKind
-#    of photoMedia: result &= "Image"
-#    of videoMedia: result &= "Video"
-#    of gifMedia:   result &= "Gif"
-#    end case
-#  end if
+#if tweet.photos.len > 0:
+#  result &= "Image"
+#elif tweet.video.isSome:
+#  result &= "Video"
+#elif tweet.gif.isSome:
+#  result &= "Gif"
 #end if
 #end proc
 #
@@ -40,26 +28,6 @@
 Twitter feed for: ${desc}. Generated by ${getUrlPrefix(cfg)}
 #end proc
 #
-#proc renderRssMedia(media: Media; tweet: Tweet; urlPrefix: string): string =
-#case media.kind
-#of photoMedia:
-#  let photo = media.photo
-<img src="${urlPrefix}${getPicUrl(photo.url)}" style="max-width:250px;" />
-#of videoMedia:
-#  let video = media.video
-<a href="${urlPrefix}${tweet.getLink}">
-<br>Video<br>
-  <img src="${urlPrefix}${getPicUrl(video.thumb)}" style="max-width:250px;" />
-</a>
-#of gifMedia:
-#  let gif = media.gif
-#  let thumb = &"{urlPrefix}{getPicUrl(gif.thumb)}"
-#  let url = &"{urlPrefix}{getPicUrl(gif.url)}"
-<video poster="${thumb}" autoplay muted loop style="max-width:250px;">
-  <source src="${url}" type="video/mp4"></video>
-#end case
-#end proc
-#
 #proc getTweetsWithPinned(profile: Profile): seq[Tweets] =
 #result = profile.tweets.content
 #if profile.pinned.isSome and result.len > 0:
@@ -78,24 +46,28 @@ Twitter feed for: ${desc}. Generated by ${getUrlPrefix(cfg)}
 #end if
 #end proc
 #
-#proc renderRssTweet(tweet: Tweet; cfg: Config; prefs: Prefs): string =
+#proc renderRssTweet(tweet: Tweet; cfg: Config): string =
 #let tweet = tweet.retweet.get(tweet)
 #let urlPrefix = getUrlPrefix(cfg)
-#let text = replaceUrls(tweet.text, prefs, absolute=urlPrefix)
+#let text = replaceUrls(tweet.text, defaultPrefs, absolute=urlPrefix)
 <p>${text.replace("\n", "<br>\n")}</p>
-#if tweet.media.len > 0:
-#  for media in tweet.media:
-${renderRssMedia(media, tweet, urlPrefix)}
+#if tweet.photos.len > 0:
+#  for photo in tweet.photos:
+<img src="${urlPrefix}${getPicUrl(photo)}" style="max-width:250px;" />
 #  end for
+#elif tweet.video.isSome:
+<img src="${urlPrefix}${getPicUrl(get(tweet.video).thumb)}" style="max-width:250px;" />
+#elif tweet.gif.isSome:
+#  let thumb = &"{urlPrefix}{getPicUrl(get(tweet.gif).thumb)}"
+#  let url = &"{urlPrefix}{getPicUrl(get(tweet.gif).url)}"
+<video poster="${thumb}" autoplay muted loop style="max-width:250px;">
+  <source src="${url}" type="video/mp4"></video>
 #elif tweet.card.isSome:
 #  let card = tweet.card.get()
 #  if card.image.len > 0:
 <img src="${urlPrefix}${getPicUrl(card.image)}" style="max-width:250px;" />
 #  end if
 #end if
-#if tweet.note.len > 0 and not prefs.hideCommunityNotes:
-<p><b>Community note:</b> ${replaceUrls(tweet.note, prefs, absolute=urlPrefix)}</p>
-#end if
 #if tweet.quote.isSome and get(tweet.quote).available:
 #  let quoteTweet = get(tweet.quote)
 #  let quoteLink = urlPrefix & getLink(quoteTweet)
@@ -103,7 +75,7 @@ ${renderRssMedia(media, tweet, urlPrefix)}
 <blockquote>
 <b>${quoteTweet.user.fullname} (@${quoteTweet.user.username})</b>
 <p>
-${renderRssTweet(quoteTweet, cfg, prefs)}
+${renderRssTweet(quoteTweet, cfg)}
 </p>
 <footer>
 — <cite><a href="${quoteLink}">${quoteLink}</a>
@@ -112,7 +84,7 @@ ${renderRssTweet(quoteTweet, cfg, prefs)}
 #end if
 #end proc
 #
-#proc renderRssTweets(tweets: seq[Tweets]; cfg: Config; prefs: Prefs; userId=""): string =
+#proc renderRssTweets(tweets: seq[Tweets]; cfg: Config; userId=""): string =
 #let urlPrefix = getUrlPrefix(cfg)
 #var links: seq[string]
 #for thread in tweets:
@@ -126,24 +98,19 @@ ${renderRssTweet(quoteTweet, cfg, prefs)}
 #    if link in links: continue
 #    end if
 #    links.add link
-#    let useGlobalGuid = tweet.id >= guidCutoff
      <item>
        <title>${getTitle(tweet, retweet)}</title>
        <dc:creator>@${tweet.user.username}</dc:creator>
-        <description><![CDATA[${renderRssTweet(tweet, cfg, prefs).strip(chars={'\n'})}]]></description>
+        <description><![CDATA[${renderRssTweet(tweet, cfg).strip(chars={'\n'})}]]></description>
        <pubDate>${getRfc822Time(tweet)}</pubDate>
-#if useGlobalGuid:
-        <guid isPermaLink="false">${tweet.id}</guid>
-#else:
        <guid>${urlPrefix & link}</guid>
-#end if
        <link>${urlPrefix & link}</link>
      </item>
 #  end for
 #end for
 #end proc
 #
-#proc renderTimelineRss*(profile: Profile; cfg: Config; prefs: Prefs; multi=false): string =
+#proc renderTimelineRss*(profile: Profile; cfg: Config; multi=false): string =
 #let urlPrefix = getUrlPrefix(cfg)
 #result = ""
 #let handle = (if multi: "" else: "@") & profile.user.username
@@ -169,13 +136,13 @@ ${renderRssTweet(quoteTweet, cfg, prefs)}
    </image>
 #let tweetsList = getTweetsWithPinned(profile)
 #if tweetsList.len > 0:
-${renderRssTweets(tweetsList, cfg, prefs, userId=profile.user.id)}
+${renderRssTweets(tweetsList, cfg, userId=profile.user.id)}
 #end if
  </channel>
 </rss>
 #end proc
 #
-#proc renderListRss*(tweets: seq[Tweets]; list: List; cfg: Config; prefs: Prefs): string =
+#proc renderListRss*(tweets: seq[Tweets]; list: List; cfg: Config): string =
 #let link = &"{getUrlPrefix(cfg)}/i/lists/{list.id}"
 #result = ""
 <?xml version="1.0" encoding="UTF-8"?>
@@ -187,12 +154,12 @@ ${renderRssTweets(tweetsList, cfg, prefs, userId=profile.user.id)}
    <description>${getDescription(&"{list.name} by @{list.username}", cfg)}</description>
    <language>en-us</language>
    <ttl>40</ttl>
-${renderRssTweets(tweets, cfg, prefs)}
+${renderRssTweets(tweets, cfg)}
 </channel>
 </rss>
 #end proc
 #
-#proc renderSearchRss*(tweets: seq[Tweets]; name, param: string; cfg: Config; prefs: Prefs): string =
+#proc renderSearchRss*(tweets: seq[Tweets]; name, param: string; cfg: Config): string =
 #let link = &"{getUrlPrefix(cfg)}/search"
 #let escName = xmltree.escape(name)
 #result = ""
@@ -205,7 +172,7 @@ ${renderRssTweets(tweets, cfg, prefs)}
    <description>${getDescription(&"Search \"{escName}\"", cfg)}</description>
    <language>en-us</language>
    <ttl>40</ttl>
-${renderRssTweets(tweets, cfg, prefs)}
+${renderRssTweets(tweets, cfg)}
  </channel>
 </rss>
 #end proc
--- a/src/views/search.nim
+++ b/src/views/search.nim
@@ -10,12 +10,14 @@ const toggles = {
  "media": "Media",
  "videos": "Videos",
  "news": "News",
+  "verified": "Verified",
  "native_video": "Native videos",
  "replies": "Replies",
  "links": "Links",
  "images": "Images",
+  "safe": "Safe",
  "quote": "Quotes",
-  "spaces": "Spaces"
+  "pro_video": "Pro videos"
 }.toOrderedTable

 proc renderSearch*(): VNode =
@@ -51,7 +53,7 @@ proc renderSearchTabs*(query: Query): VNode =

 proc isPanelOpen(q: Query): bool =
  q.fromUser.len == 0 and (q.filters.len > 0 or q.excludes.len > 0 or
-  @[q.minLikes, q.until, q.since].anyIt(it.len > 0))
+  @[q.near, q.until, q.since].anyIt(it.len > 0))

 proc renderSearchPanel*(query: Query): VNode =
  let user = query.fromUser.join(",")
@@ -83,8 +85,8 @@ proc renderSearchPanel*(query: Query): VNode =
            span(class="search-title"): text "-"
            genDate("until", query.until)
        tdiv:
-          span(class="search-title"): text "Minimum likes"
-          genNumberInput("min_faves", "", query.minLikes, "Number...", autofocus=false)
+          span(class="search-title"): text "Near"
+          genInput("near", "", query.near, "Location...", autofocus=false)

 proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string;
                        pinned=none(Tweet)): VNode =
--- a/src/views/status.nim
+++ b/src/views/status.nim
@@ -28,19 +28,14 @@ proc renderReplyThread(thread: Chain; prefs: Prefs; path: string): VNode =
    if thread.hasMore:
      renderMoreReplies(thread)

-proc renderReplies*(replies: Result[Chain]; prefs: Prefs; path: string; tweet: Tweet = nil): VNode =
+proc renderReplies*(replies: Result[Chain]; prefs: Prefs; path: string): VNode =
  buildHtml(tdiv(class="replies", id="r")):
-    var hasReplies = false
-    var replyCount = 0
    for thread in replies.content:
      if thread.content.len == 0: continue
-      hasReplies = true
-      replyCount += thread.content.len
      renderReplyThread(thread, prefs, path)

-    if hasReplies and replies.bottom.len > 0:
-      if tweet == nil or not replies.beginning or replyCount < tweet.stats.replies:
-        renderMore(Query(), replies.bottom, focus="#r")
+    if replies.bottom.len > 0:
+      renderMore(Query(), replies.bottom, focus="#r")

 proc renderConversation*(conv: Conversation; prefs: Prefs; path: string): VNode =
  let hasAfter = conv.after.content.len > 0
@@ -75,20 +70,6 @@ proc renderConversation*(conv: Conversation; prefs: Prefs; path: string): VNode
      if not conv.replies.beginning:
        renderNewer(Query(), getLink(conv.tweet), focus="#r")
      if conv.replies.content.len > 0 or conv.replies.bottom.len > 0:
-        renderReplies(conv.replies, prefs, path, conv.tweet)
+        renderReplies(conv.replies, prefs, path)

    renderToTop(focus="#m")
-
-proc renderEditHistory*(edits: EditHistory; prefs: Prefs; path: string): VNode =
-  buildHtml(tdiv(class="edit-history")):
-    tdiv(class="latest-edit"):
-      tdiv(class="edit-history-header"): 
-        text "Latest post"
-      renderTweet(edits.latest, prefs, path)
-
-    tdiv(class="previous-edits"):
-      tdiv(class="edit-history-header"): 
-        text "Version history"
-      for tweet in edits.history:
-        tdiv(class="tweet-edit"):
-          renderTweet(tweet, prefs, path)
--- a/src/views/timeline.nim
+++ b/src/views/timeline.nim
@@ -53,10 +53,10 @@ proc renderThread(thread: Tweets; prefs: Prefs; path: string): VNode =
      let show = i == thread.high and sortedThread[0].id != tweet.threadId
      let header = if tweet.pinned or tweet.retweet.isSome: "with-header " else: ""
      renderTweet(tweet, prefs, path, class=(header & "thread"),
-                  index=i, last=(i == thread.high))
+                  index=i, last=(i == thread.high), showThread=show)

 proc renderUser(user: User; prefs: Prefs): VNode =
-  buildHtml(tdiv(class="timeline-item", data-username=user.username)):
+  buildHtml(tdiv(class="timeline-item")):
    a(class="tweet-link", href=("/" & user.username))
    tdiv(class="tweet-body profile-result"):
      tdiv(class="tweet-header"):
@@ -66,7 +66,6 @@ proc renderUser(user: User; prefs: Prefs): VNode =
        tdiv(class="tweet-name-row"):
          tdiv(class="fullname-and-username"):
            linkUser(user, class="fullname")
-            verifiedIcon(user)
        linkUser(user, class="username")

      tdiv(class="tweet-content media-body", dir="auto"):
@@ -96,7 +95,7 @@ proc renderTimelineTweets*(results: Timeline; prefs: Prefs; path: string;

    if not prefs.hidePins and pinned.isSome:
      let tweet = get pinned
-      renderTweet(tweet, prefs, path)
+      renderTweet(tweet, prefs, path, showThread=tweet.hasThread)

    if results.content.len == 0:
      if not results.beginning:
@@ -116,9 +115,11 @@ proc renderTimelineTweets*(results: Timeline; prefs: Prefs; path: string;
             tweet.pinned and prefs.hidePins:
            continue

+          var hasThread = tweet.hasThread
          if retweetId != 0 and tweet.retweet.isSome:
            retweets &= retweetId
-          renderTweet(tweet, prefs, path)
+            hasThread = get(tweet.retweet).hasThread
+          renderTweet(tweet, prefs, path, showThread=hasThread)
        else:
          renderThread(thread, prefs, path)

--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -31,26 +31,28 @@ proc renderHeader(tweet: Tweet; retweet: string; pinned: bool; prefs: Prefs): VN
      tdiv(class="tweet-name-row"):
        tdiv(class="fullname-and-username"):
          linkUser(tweet.user, class="fullname")
-          verifiedIcon(tweet.user)
          linkUser(tweet.user, class="username")

        span(class="tweet-date"):
          a(href=getLink(tweet), title=tweet.getTime):
            text tweet.getShortTime

-proc renderAltText(altText: string): VNode =
-  buildHtml(p(class="alt-text")):
-    text "ALT  " & altText
+proc renderAlbum(tweet: Tweet): VNode =
+  let
+    groups = if tweet.photos.len < 3: @[tweet.photos]
+             else: tweet.photos.distribute(2)

-proc renderPhotoAttachment(photo: Photo): VNode =
-  buildHtml(tdiv(class="attachment")):
-    let
-      named = "name=" in photo.url
-      small = if named: photo.url else: photo.url & smallWebp
-    a(href=getOrigPicUrl(photo.url), class="still-image", target="_blank"):
-      genImg(small, alt=photo.altText)
-    if photo.altText.len > 0:
-      renderAltText(photo.altText)
+  buildHtml(tdiv(class="attachments")):
+    for i, photos in groups:
+      let margin = if i > 0: ".25em" else: ""
+      tdiv(class="gallery-row", style={marginTop: margin}):
+        for photo in photos:
+          tdiv(class="attachment image"):
+            let
+              named = "name=" in photo
+              small = if named: photo else: photo & smallWebp
+            a(href=getOrigPicUrl(photo), class="still-image", target="_blank"):
+              genImg(small)

 proc isPlaybackEnabled(prefs: Prefs; playbackType: VideoType): bool =
  case playbackType
@@ -60,7 +62,7 @@ proc isPlaybackEnabled(prefs: Prefs; playbackType: VideoType): bool =
 proc hasMp4Url(video: Video): bool =
  video.variants.anyIt(it.contentType == mp4)

-proc renderVideoDisabled(playbackType: VideoType; path=""): VNode =
+proc renderVideoDisabled(playbackType: VideoType; path: string): VNode =
  buildHtml(tdiv(class="video-overlay")):
    case playbackType
    of mp4:
@@ -76,97 +78,51 @@ proc renderVideoUnavailable(video: Video): VNode =
    else:
      p: text "This media is unavailable"

-proc renderVideoAttachment(videoData: Video; prefs: Prefs; path=""): VNode =
-  let
-    playbackType = if not prefs.proxyVideos and videoData.hasMp4Url: mp4
-                   else: videoData.playbackType
-    thumb = getSmallPic(videoData.thumb)
-
-  buildHtml(tdiv(class="attachment")):
-    if not videoData.available:
-      img(src=thumb, loading="lazy")
-      renderVideoUnavailable(videoData)
-    elif not prefs.isPlaybackEnabled(playbackType):
-      img(src=thumb, loading="lazy")
-      renderVideoDisabled(playbackType, path)
-    else:
-      let
-        vars = videoData.variants.filterIt(it.contentType == playbackType)
-        vidUrl = vars.sortedByIt(it.resolution)[^1].url
-        source = if prefs.proxyVideos: getVidUrl(vidUrl)
-                 else: vidUrl
-      case playbackType
-      of mp4:
-        video(poster=thumb, controls="", muted=prefs.muteVideos):
-          source(src=source, `type`="video/mp4")
-      of m3u8, vmap:
-        video(poster=thumb, data-url=source, data-autoload="false", muted=prefs.muteVideos)
-        verbatim "<div class=\"video-overlay\" onclick=\"playVideo(this)\">"
-        tdiv(class="overlay-circle"): span(class="overlay-triangle")
-        tdiv(class="overlay-duration"): text getDuration(videoData)
-        verbatim "</div>"
-
 proc renderVideo*(video: Video; prefs: Prefs; path: string): VNode =
-  let hasCardContent = video.description.len > 0 or video.title.len > 0
+  let
+    container = if video.description.len == 0 and video.title.len == 0: ""
+                else: " card-container"
+    playbackType = if not prefs.proxyVideos and video.hasMp4Url: mp4
+                   else: video.playbackType

  buildHtml(tdiv(class="attachments card")):
-    tdiv(class=("gallery-video" & (if hasCardContent: " card-container" else: ""))):
-      renderVideoAttachment(video, prefs, path)
-      if hasCardContent:
+    tdiv(class="gallery-video" & container):
+      tdiv(class="attachment video-container"):
+        let thumb = getSmallPic(video.thumb)
+        if not video.available:
+          img(src=thumb, loading="lazy")
+          renderVideoUnavailable(video)
+        elif not prefs.isPlaybackEnabled(playbackType):
+          img(src=thumb, loading="lazy")
+          renderVideoDisabled(playbackType, path)
+        else:
+          let
+            vars = video.variants.filterIt(it.contentType == playbackType)
+            vidUrl = vars.sortedByIt(it.resolution)[^1].url
+            source = if prefs.proxyVideos: getVidUrl(vidUrl)
+                     else: vidUrl
+          case playbackType
+          of mp4:
+            video(poster=thumb, controls="", muted=prefs.muteVideos):
+              source(src=source, `type`="video/mp4")
+          of m3u8, vmap:
+            video(poster=thumb, data-url=source, data-autoload="false", muted=prefs.muteVideos)
+            verbatim "<div class=\"video-overlay\" onclick=\"playVideo(this)\">"
+            tdiv(class="overlay-circle"): span(class="overlay-triangle")
+            verbatim "</div>"
+      if container.len > 0:
        tdiv(class="card-content"):
          h2(class="card-title"): text video.title
          if video.description.len > 0:
            p(class="card-description"): text video.description

-proc renderGifAttachment(gif: Gif; prefs: Prefs): VNode =
-  let thumb = getSmallPic(gif.thumb)
-
-  buildHtml(tdiv(class="attachment")):
-    if not prefs.mp4Playback:
-      img(src=thumb, loading="lazy")
-      renderVideoDisabled(mp4)
-    elif prefs.autoplayGifs:
-      video(class="gif", poster=thumb, autoplay="", muted="", loop=""):
-        source(src=getPicUrl(gif.url), `type`="video/mp4")
-    else:
-      video(class="gif", poster=thumb, controls="", muted="", loop=""):
-        source(src=getPicUrl(gif.url), `type`="video/mp4")
-    if gif.altText.len > 0:
-      renderAltText(gif.altText)
-
 proc renderGif(gif: Gif; prefs: Prefs): VNode =
  buildHtml(tdiv(class="attachments media-gif")):
-    renderGifAttachment(gif, prefs)
-
-proc renderMedia(media: seq[Media]; prefs: Prefs; path: string): VNode =
-  if media.len == 0:
-    return nil
-
-  if media.len == 1:
-    let item = media[0]
-    if item.kind == videoMedia:
-      return renderVideo(item.video, prefs, path)
-    if item.kind == gifMedia:
-      return renderGif(item.gif, prefs)
-
-  let
-    groups = if media.len < 3: @[media]
-             else: media.distribute(2)
-
-  buildHtml(tdiv(class="attachments")):
-    for i, mediaGroup in groups:
-      let margin = if i > 0: ".25em" else: ""
-      let rowClass = "gallery-row" &
-                     (if mediaGroup.allIt(it.kind == photoMedia): "" else: " mixed-row")
-      tdiv(class=rowClass, style={marginTop: margin}):
-        for mediaItem in mediaGroup:
-          case mediaItem.kind
-          of photoMedia:
-            renderPhotoAttachment(mediaItem.photo)
-          of videoMedia:
-            renderVideoAttachment(mediaItem.video, prefs, path)
-          of gifMedia:
-            renderGifAttachment(mediaItem.gif, prefs)
+    tdiv(class="gallery-gif", style={maxHeight: "unset"}):
+      tdiv(class="attachment"):
+        video(class="gif", poster=getSmallPic(gif.thumb), autoplay=prefs.autoplayGifs,
+              controls="", muted="", loop=""):
+          source(src=getPicUrl(gif.url), `type`="video/mp4")

 proc renderPoll(poll: Poll): VNode =
  buildHtml(tdiv(class="poll")):
@@ -251,28 +207,19 @@ proc renderMediaTags(tags: seq[User]): VNode =
      if i < tags.high:
        text ", "

-proc renderLatestPost(username: string; id: int64): VNode =
-  buildHtml(tdiv(class="latest-post-version")):
-    text "There's a new version of this post. "
-    a(href=getLink(id, username)):
-      text "See the latest post"
-
 proc renderQuoteMedia(quote: Tweet; prefs: Prefs; path: string): VNode =
  buildHtml(tdiv(class="quote-media-container")):
-    renderMedia(quote.media, prefs, path)
-
-proc renderCommunityNote(note: string; prefs: Prefs): VNode =
-  buildHtml(tdiv(class="community-note")):
-    tdiv(class="community-note-header"):
-      icon "group"
-      span: text "Community note"
-    tdiv(class="community-note-text", dir="auto"):
-      verbatim replaceUrls(note, prefs)
+    if quote.photos.len > 0:
+      renderAlbum(quote)
+    elif quote.video.isSome:
+      renderVideo(quote.video.get(), prefs, path)
+    elif quote.gif.isSome:
+      renderGif(quote.gif.get(), prefs)

 proc renderQuote(quote: Tweet; prefs: Prefs; path: string): VNode =
  if not quote.available:
    return buildHtml(tdiv(class="quote unavailable")):
-      a(class="unavailable-quote", href=getLink(quote, focus=false)):
+      tdiv(class="unavailable-quote"):
        if quote.tombstone.len > 0:
          text quote.tombstone
        elif quote.text.len > 0:
@@ -287,7 +234,6 @@ proc renderQuote(quote: Tweet; prefs: Prefs; path: string): VNode =
      tdiv(class="fullname-and-username"):
        renderMiniAvatar(quote.user, prefs)
        linkUser(quote.user, class="fullname")
-        verifiedIcon(quote.user)
        linkUser(quote.user, class="username")

      span(class="tweet-date"):
@@ -301,19 +247,12 @@ proc renderQuote(quote: Tweet; prefs: Prefs; path: string): VNode =
      tdiv(class="quote-text", dir="auto"):
        verbatim replaceUrls(quote.text, prefs)

-    if quote.media.len > 0:
-      renderQuoteMedia(quote, prefs, path)
-
-    if quote.note.len > 0 and not prefs.hideCommunityNotes:
-      renderCommunityNote(quote.note, prefs)
-
    if quote.hasThread:
      a(class="show-thread", href=getLink(quote)):
        text "Show this thread"

-    if quote.history.len > 0 and quote.id != max(quote.history):
-      tdiv(class="quote-latest"):
-        text "There's a new version of this post"
+    if quote.photos.len > 0 or quote.video.isSome or quote.gif.isSome:
+      renderQuoteMedia(quote, prefs, path)

 proc renderLocation*(tweet: Tweet): string =
  let (place, url) = tweet.getLocation()
@@ -327,14 +266,14 @@ proc renderLocation*(tweet: Tweet): string =
  return $node

 proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
-                  last=false; mainTweet=false; afterTweet=false): VNode =
+                  last=false; showThread=false; mainTweet=false; afterTweet=false): VNode =
  var divClass = class
  if index == -1 or last:
    divClass = "thread-last " & class

  if not tweet.available:
-    return buildHtml(tdiv(class=divClass & "unavailable timeline-item", data-username=tweet.user.username)):
-      a(class="unavailable-box", href=getLink(tweet)):
+    return buildHtml(tdiv(class=divClass & "unavailable timeline-item")):
+      tdiv(class="unavailable-box"):
        if tweet.tombstone.len > 0:
          text tweet.tombstone
        elif tweet.text.len > 0:
@@ -355,7 +294,7 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
    tweet = tweet.retweet.get
    retweet = fullTweet.user.fullname

-  buildHtml(tdiv(class=("timeline-item " & divClass), data-username=tweet.user.username)):
+  buildHtml(tdiv(class=("timeline-item " & divClass))):
    if not mainTweet:
      a(class="tweet-link", href=getLink(tweet))

@@ -363,7 +302,7 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
      renderHeader(tweet, retweet, pinned, prefs)

      if not afterTweet and index == 0 and tweet.reply.len > 0 and
-         (tweet.reply.len > 1 or tweet.reply[0] != tweet.user.username or pinned):
+         (tweet.reply.len > 1 or tweet.reply[0] != tweet.user.username):
        renderReply(tweet)

      var tweetClass = "tweet-content media-body"
@@ -379,8 +318,12 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
      if tweet.card.isSome and tweet.card.get().kind != hidden:
        renderCard(tweet.card.get(), prefs, path)

-      if tweet.media.len > 0:
-        renderMedia(tweet.media, prefs, path)
+      if tweet.photos.len > 0:
+        renderAlbum(tweet)
+      elif tweet.video.isSome:
+        renderVideo(tweet.video.get(), prefs, path)
+      elif tweet.gif.isSome:
+        renderGif(tweet.gif.get(), prefs)

      if tweet.poll.isSome:
        renderPoll(tweet.poll.get())
@@ -388,23 +331,8 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
      if tweet.quote.isSome:
        renderQuote(tweet.quote.get(), prefs, path)

-      if tweet.note.len > 0 and not prefs.hideCommunityNotes:
-        renderCommunityNote(tweet.note, prefs)
-
-      let
-        hasEdits = tweet.history.len > 1
-        isLatest = hasEdits and tweet.id == max(tweet.history)
-
      if mainTweet:
-        p(class="tweet-published"): 
-          if hasEdits and isLatest:
-            a(href=(getLink(tweet, focus=false) & "/history")):
-              text &"Last edited {getTime(tweet)}"
-          else:
-            text &"{getTime(tweet)}"
-
-        if hasEdits and not isLatest:
-          renderLatestPost(tweet.user.username, max(tweet.history))
+        p(class="tweet-published"): text &"{getTime(tweet)}"

      if tweet.mediaTags.len > 0:
        renderMediaTags(tweet.mediaTags)
@@ -412,6 +340,10 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
      if not prefs.hideTweetStats:
        renderStats(tweet.stats)

+      if showThread:
+        a(class="show-thread", href=("/i/status/" & $tweet.threadId)):
+          text "Show this thread"
+
 proc renderTweetEmbed*(tweet: Tweet; path: string; prefs: Prefs; cfg: Config; req: Request): string =
  let node = buildHtml(html(lang="en")):
    renderHead(prefs, cfg, req)
--- a/tests/base.py
+++ b/tests/base.py
@@ -79,7 +79,7 @@ class Media(object):
    row = '.gallery-row'
    image = '.still-image'
    video = '.gallery-video'
-    gif = '.media-gif'
+    gif = '.gallery-gif'


 class BaseTestCase(BaseCase):
--- a/tests/poetry.lock
+++ b/tests/poetry.lock
--- a/tests/poetry.toml
+++ b/tests/poetry.toml
@@ -1,2 +0,0 @@
-[virtualenvs]
-in-project = true
--- a/tests/pyproject.toml
+++ b/tests/pyproject.toml
@@ -1,8 +0,0 @@
-[tool.poetry]
-name = "nitter-tests"
-version = "0.0.0"
-package-mode = false
-
-[tool.poetry.dependencies]
-python = "^3.14"
-seleniumbase = "4.46.5"
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1 +1 @@
-seleniumbase==4.46.5
+seleniumbase
--- a/tests/test_card.py
+++ b/tests/test_card.py
@@ -11,7 +11,12 @@ card = [
    ['voidtarget/status/1094632512926605312',
     'Basic OBS Studio plugin, written in nim, supporting C++ (C fine too)',
     'Basic OBS Studio plugin, written in nim, supporting C++ (C fine too) - obsplugin.nim',
-     'gist.github.com', True]
+     'gist.github.com', True],
+
+    ['nim_lang/status/1082989146040340480',
+     'Nim in 2018: A short recap',
+     'There were several big news in the Nim world in 2018 – two new major releases, partnership with Status, and much more. But let us go chronologically.',
+     'nim-lang.org', True]
 ]

 no_thumb = [
--- a/tests/test_profile.py
+++ b/tests/test_profile.py
@@ -15,19 +15,7 @@ protected = [
    ['Poop', 'Randy', 'Social media fanatic.']
 ]

-invalid = [['thisprofiledoesntexist']]
-
-malformed = [
-    ['${userId}'],
-    ['$%7BuserId%7D'],  # URL encoded version
-    ['%'],  # Percent sign is invalid
-    ['user@name'],
-    ['user.name'],
-    ['user-name'],
-    ['user$name'],
-    ['user{name}'],
-    ['user name'],  # space
-]
+invalid = [['thisprofiledoesntexist'], ['%']]

 banner_image = [
    ['mobile_test', 'profile_banners%2F82135242%2F1384108037%2F1500x500']
@@ -77,13 +65,6 @@ class ProfileTest(BaseTestCase):
        self.open_nitter(username)
        self.assert_text(f'User "{username}" not found')

-    @parameterized.expand(malformed)
-    def test_malformed_username(self, username):
-        """Test that malformed usernames (with invalid characters) return 404"""
-        self.open_nitter(username)
-        # Malformed usernames should return 404 page not found, not try to fetch from Twitter
-        self.assert_text('Page not found')
-
    def test_suspended(self):
        self.open_nitter('suspendme')
        self.assert_text('User "suspendme" has been suspended')
--- a/tools/create_session_browser.py
+++ b/tools/create_session_browser.py
@@ -20,112 +20,73 @@ Output:
  {"kind": "cookie", "username": "...", "id": "...", "auth_token": "...", "ct0": "..."}
 """

-import asyncio
-import json
-import os
 import sys
-
-import nodriver as uc
+import json
+import asyncio
 import pyotp
+import nodriver as uc
+import os


 async def login_and_get_cookies(username, password, totp_seed=None, headless=False):
    """Authenticate with X.com and extract session cookies"""
    # Note: headless mode may increase detection risk from bot-detection systems
    browser = await uc.start(headless=headless)
-    tab = await browser.get("https://x.com/i/flow/login")
+    tab = await browser.get('https://x.com/i/flow/login')

    try:
        # Enter username
-        print(f"[*] Entering username {username}...", file=sys.stderr)
-
-        retry = 0
-        while retry < 5:
-            username_input = await tab.find(
-                'input[autocomplete="username"]', timeout=10
-            )
-
-            pos = await username_input.get_position()
-            await tab.mouse_move(pos.x, pos.y, steps=50, flash=True)
-            await asyncio.sleep(0.1)
-
-            await username_input.click()
-            await asyncio.sleep(0.5)
-            await username_input.send_keys(username)
-            await asyncio.sleep(0.2)
-            await username_input.send_keys("\n")
-            await asyncio.sleep(2)
-
-            page_content = await tab.get_content()
-            if "Could not log you in" in page_content:
-                retry += 1
-                wait = retry * 10
-                print(f"Retrying in {wait} seconds...")
-                await asyncio.sleep(wait)
-            else:
-                break
+        print('[*] Entering username...', file=sys.stderr)
+        username_input = await tab.find('input[autocomplete="username"]', timeout=10)
+        await username_input.send_keys(username + '\n')
+        await asyncio.sleep(1)

        # Enter password
-        print("[*] Entering password...", file=sys.stderr)
-        pretry = 0
-        while pretry < 5:
-            password_input = await tab.find(
-                'input[autocomplete="current-password"]', timeout=15
-            )
-            await password_input.click()
-            await asyncio.sleep(0.5)
-            await password_input.send_keys(password)
-            await asyncio.sleep(0.2)
-            await password_input.send_keys("\n")
-            await asyncio.sleep(2)
-
-            page_content = await tab.get_content()
-            if "Could not log you in" in page_content:
-                pretry += 1
-                wait = pretry * 10
-                print(f"Retrying in {wait} seconds...")
-                await asyncio.sleep(wait)
-            else:
-                break
+        print('[*] Entering password...', file=sys.stderr)
+        password_input = await tab.find('input[autocomplete="current-password"]', timeout=15)
+        await password_input.send_keys(password + '\n')
+        await asyncio.sleep(2)

        # Handle 2FA if needed
        page_content = await tab.get_content()
-        if "verification code" in page_content or "Enter code" in page_content:
+        if 'verification code' in page_content or 'Enter code' in page_content:
            if not totp_seed:
-                raise Exception("2FA required but no TOTP seed provided")
+                raise Exception('2FA required but no TOTP seed provided')

-            print("[*] 2FA detected, entering code...", file=sys.stderr)
+            print('[*] 2FA detected, entering code...', file=sys.stderr)
            totp_code = pyotp.TOTP(totp_seed).now()
            code_input = await tab.select('input[type="text"]')
-            await code_input.send_keys(totp_code + "\n")
+            await code_input.send_keys(totp_code + '\n')
            await asyncio.sleep(3)

        # Get cookies
-        print("[*] Retrieving cookies...", file=sys.stderr)
+        print('[*] Retrieving cookies...', file=sys.stderr)
        for _ in range(20):  # 20 second timeout
            cookies = await browser.cookies.get_all()
            cookies_dict = {cookie.name: cookie.value for cookie in cookies}

-            if "auth_token" in cookies_dict and "ct0" in cookies_dict:
+            if 'auth_token' in cookies_dict and 'ct0' in cookies_dict:
+                print('[*] Found both cookies', file=sys.stderr)
+
                # Extract ID from twid cookie (may be URL-encoded)
                user_id = None
-                if "twid" in cookies_dict:
-                    twid = cookies_dict["twid"]
+                if 'twid' in cookies_dict:
+                    twid = cookies_dict['twid']
                    # Try to extract the ID from twid (format: u%3D<id> or u=<id>)
-                    if "u%3D" in twid:
-                        user_id = twid.split("u%3D")[1].split("&")[0].strip('"')
-                    elif "u=" in twid:
-                        user_id = twid.split("u=")[1].split("&")[0].strip('"')
+                    if 'u%3D' in twid:
+                        user_id = twid.split('u%3D')[1].split('&')[0].strip('"')
+                    elif 'u=' in twid:
+                        user_id = twid.split('u=')[1].split('&')[0].strip('"')

-                cookies_dict["username"] = username
+                cookies_dict['username'] = username
                if user_id:
-                    cookies_dict["id"] = user_id
+                    cookies_dict['id'] = user_id

                return cookies_dict

            await asyncio.sleep(1)

-        raise Exception("Timeout waiting for cookies")
+        raise Exception('Timeout waiting for cookies')

    finally:
        browser.stop()
@@ -133,9 +94,7 @@ async def login_and_get_cookies(username, password, totp_seed=None, headless=Fal

 async def main():
    if len(sys.argv) < 3:
-        print(
-            "Usage: python3 create_session_browser.py username password [totp_seed] [--append file.jsonl] [--headless]"
-        )
+        print('Usage: python3 twitter-auth.py username password [totp_seed] [--append sessions.jsonl] [--headless]')
        sys.exit(1)

    username = sys.argv[1]
@@ -148,49 +107,49 @@ async def main():
    i = 3
    while i < len(sys.argv):
        arg = sys.argv[i]
-        if arg == "--append":
+        if arg == '--append':
            if i + 1 < len(sys.argv):
                append_file = sys.argv[i + 1]
                i += 2  # Skip '--append' and filename
            else:
-                print("[!] Error: --append requires a filename", file=sys.stderr)
+                print('[!] Error: --append requires a filename', file=sys.stderr)
                sys.exit(1)
-        elif arg == "--headless":
+        elif arg == '--headless':
            headless = True
            i += 1
-        elif not arg.startswith("--"):
-            if totp_seed is None:
+        elif not arg.startswith('--'):
+            if totp_seed is None: 
                totp_seed = arg
            i += 1
        else:
            # Unkown args
-            print(f"[!] Warning: Unknown argument: {arg}", file=sys.stderr)
+            print(f'[!] Warning: Unknown argument: {arg}', file=sys.stderr)
            i += 1

    try:
        cookies = await login_and_get_cookies(username, password, totp_seed, headless)
        session = {
-            "kind": "cookie",
-            "username": cookies["username"],
-            "id": cookies.get("id"),
-            "auth_token": cookies["auth_token"],
-            "ct0": cookies["ct0"],
+            'kind': 'cookie',
+            'username': cookies['username'],
+            'id': cookies.get('id'),
+            'auth_token': cookies['auth_token'],
+            'ct0': cookies['ct0']
        }
        output = json.dumps(session)

        if append_file:
-            with open(append_file, "a") as f:
-                f.write(output + "\n")
-            print(f"✓ Session appended to {append_file}", file=sys.stderr)
+            with open(append_file, 'a') as f:
+                f.write(output + '\n')
+            print(f'✓ Session appended to {append_file}', file=sys.stderr)
        else:
            print(output)

        os._exit(0)

    except Exception as error:
-        print(f"[!] Error: {error}", file=sys.stderr)
+        print(f'[!] Error: {error}', file=sys.stderr)
        sys.exit(1)


-if __name__ == "__main__":
+if __name__ == '__main__':
    asyncio.run(main())
--- a/tools/create_sessions_browser.py
+++ b/tools/create_sessions_browser.py
@@ -1,219 +0,0 @@
-#!/usr/bin/env python3
-"""
-Requirements:
-  pip install -r tools/requirements.txt
-
-Usage:
-  python3 tools/create_sessions_browser.py <accounts_file> [--append sessions.jsonl] [--headless] [--delay]
-
-Examples:
-  # Output to terminal
-  python3 tools/create_sessions_browser.py <accounts_file>
-
-  # Append to sessions.jsonl
-  python3 tools/create_sessions_browser.py <accounts_file> --append sessions.jsonl
-
-  # Add 5 second delay between sessions (default: 1)
-  python3 tools/create_sessions_browser.py <accounts_file> --delay 5
-
-  # Headless mode (may increase detection risk)
-  python3 tools/create_sessions_browser.py <accounts_file> --headless
-
-Input (accounts_file):
-  [{"username": "user", "password": "pass", "totp": "totp_code"}, {...}, ...]
-
-Output:
-  {"kind": "cookie", "username": "...", "id": "...", "auth_token": "...", "ct0": "..."}
-  {"kind": "cookie", "username": "...", "id": "...", "auth_token": "...", "ct0": "..."}
-  ...
-"""
-
-import asyncio
-import json
-import sys
-from time import sleep
-
-import nodriver as uc
-import pyotp
-
-
-async def login_and_get_cookies(account, headless=False):
-    """Authenticate with X.com and extract session cookies"""
-    # Note: headless mode may increase detection risk from bot-detection systems
-    browser = await uc.start(headless=headless)
-    tab = await browser.get("https://x.com/i/flow/login")
-
-    username = account["username"]
-    password = account["password"]
-    totp_seed = account["totp"]
-
-    try:
-        # Enter username
-        print(f"[*] Entering username {username}...", file=sys.stderr)
-
-        retry = 0
-        while retry < 5:
-            username_input = await tab.find(
-                'input[autocomplete="username"]', timeout=10
-            )
-
-            pos = await username_input.get_position()
-            await tab.mouse_move(pos.x, pos.y, steps=50, flash=True)
-            await asyncio.sleep(0.1)
-
-            await username_input.click()
-            await asyncio.sleep(0.5)
-            await username_input.send_keys(username)
-            await asyncio.sleep(0.2)
-            await username_input.send_keys("\n")
-            await asyncio.sleep(2)
-
-            page_content = await tab.get_content()
-            if "Could not log you in" in page_content:
-                retry += 1
-                wait = retry * 10
-                print(f"Retrying in {wait} seconds...")
-                await asyncio.sleep(wait)
-            else:
-                break
-
-        # Enter password
-        print("[*] Entering password...", file=sys.stderr)
-        pretry = 0
-        while pretry < 5:
-            password_input = await tab.find(
-                'input[autocomplete="current-password"]', timeout=15
-            )
-            await password_input.click()
-            await asyncio.sleep(0.5)
-            await password_input.send_keys(password)
-            await asyncio.sleep(0.2)
-            await password_input.send_keys("\n")
-            await asyncio.sleep(2)
-
-            page_content = await tab.get_content()
-            if "Could not log you in" in page_content:
-                pretry += 1
-                wait = pretry * 10
-                print(f"Retrying in {wait} seconds...")
-                await asyncio.sleep(wait)
-            else:
-                break
-
-        # Handle 2FA if needed
-        page_content = await tab.get_content()
-        if "verification code" in page_content or "Enter code" in page_content:
-            if not totp_seed:
-                raise Exception("2FA required but no TOTP seed provided")
-
-            print("[*] 2FA detected, entering code...", file=sys.stderr)
-            totp_code = pyotp.TOTP(totp_seed).now()
-            code_input = await tab.select('input[type="text"]')
-            await code_input.send_keys(totp_code + "\n")
-            await asyncio.sleep(3)
-
-        # Get cookies
-        print("[*] Retrieving cookies...", file=sys.stderr)
-        for _ in range(20):  # 20 second timeout
-            cookies = await browser.cookies.get_all()
-            cookies_dict = {cookie.name: cookie.value for cookie in cookies}
-
-            if "auth_token" in cookies_dict and "ct0" in cookies_dict:
-                # Extract ID from twid cookie (may be URL-encoded)
-                user_id = None
-                if "twid" in cookies_dict:
-                    twid = cookies_dict["twid"]
-                    # Try to extract the ID from twid (format: u%3D<id> or u=<id>)
-                    if "u%3D" in twid:
-                        user_id = twid.split("u%3D")[1].split("&")[0].strip('"')
-                    elif "u=" in twid:
-                        user_id = twid.split("u=")[1].split("&")[0].strip('"')
-
-                cookies_dict["username"] = username
-                if user_id:
-                    cookies_dict["id"] = user_id
-
-                return cookies_dict
-
-            await asyncio.sleep(1)
-
-        raise Exception("Timeout waiting for cookies")
-
-    finally:
-        browser.stop()
-
-
-async def main():
-    if len(sys.argv) < 2:
-        print(
-            "Usage: python3 create_sessions_browser.py <accounts_file> [--append sessions.jsonl] [--headless]"
-        )
-        sys.exit(1)
-
-    input = sys.argv[1]
-    append_file = None
-    headless = False
-    delay = 1
-
-    # Parse optional arguments
-    i = 2
-    while i < len(sys.argv):
-        arg = sys.argv[i]
-        if arg == "--append":
-            if i + 1 < len(sys.argv):
-                append_file = sys.argv[i + 1]
-                i += 2  # Skip '--append' and filename
-            else:
-                print("[!] Error: --append requires a filename", file=sys.stderr)
-                sys.exit(1)
-        elif arg == "--headless":
-            headless = True
-            i += 1
-        elif arg == "--delay":
-            delay = int(sys.argv[i + 1])
-            i += 2
-        else:
-            # Unkown args
-            print(f"[!] Warning: Unknown argument: {arg}", file=sys.stderr)
-            i += 1
-
-    accounts = []
-    with open(input) as f:
-        accounts = json.load(f)
-
-    if len(accounts) == 0:
-        print("no accounts in file")
-        sys.exit(0)
-
-    sessions = 0
-    for acc in accounts:
-        sessions += 1
-        try:
-            cookies = await login_and_get_cookies(acc, headless)
-            session = {
-                "kind": "cookie",
-                "username": cookies["username"],
-                "id": cookies.get("id"),
-                "auth_token": cookies["auth_token"],
-                "ct0": cookies["ct0"],
-            }
-
-            if append_file:
-                with open(append_file, "a") as f:
-                    f.write(json.dumps(session) + "\n")
-            else:
-                print(json.dumps(session))
-
-            print(f"Progress: {sessions} / {len(accounts)}")
-            if sessions < len(accounts):
-                print("Waiting", delay, "seconds")
-                sleep(delay)
-        except Exception as error:
-            print(
-                f"[!] Error getting session for {acc["username"]}, skipping: {error}",
-                file=sys.stderr,
-            )
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
--- a/tools/get_session.py
+++ b/tools/get_session.py
@@ -21,10 +21,7 @@ def auth(username, password, otp_secret):

    guest_token = requests.post(
        "https://api.twitter.com/1.1/guest/activate.json",
-        headers={
-            'Authorization': bearer_token,
-             "User-Agent": "TwitterAndroid/10.21.0-release.0 (310210000-r-0) ONEPLUS+A3010/9"
-        }
+        headers={'Authorization': bearer_token}
    ).json().get('guest_token')

    if not guest_token: