diff --git a/archiver/archiver-cli.rkt b/archiver/archiver-cli.rkt
deleted file mode 100644
index 11f25d0..0000000
--- a/archiver/archiver-cli.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang cli
-(require charterm
-         "archiver.rkt")
-
-(help (usage "Downloads a single Fandom wiki in BreezeWiki offline format."
-             ""
-             "Downloaded pages go into `archive/` next to the executable."
-             "Database goes into `archiver.db*` next to the executable."
-             "The database is necessary to store your download progress and resume where you left off if the process is interrupted."))
-
-(flag (output-quiet?)
-      ("-q" "--output-quiet" "disable progress output")
-      (output-quiet? #t))
-
-(flag (output-progress?)
-      ("-p" "--output-progress" "progress output for terminals (default in a tty)")
-      (output-progress? #t))
-
-(flag (output-lines?)
-      ("-l" "--output-lines" "output the name of each file downloaded (default outside of a tty)")
-      (output-lines? #t))
-
-(constraint (one-of output-quiet? output-lines? output-progress?))
-
-
-
-(program
- (start [wikiname "wikiname to download"])
- ;; set up arguments
- (define width 80)
- (when (not (or (output-quiet?) (output-lines?) (output-progress?)))
-   (cond [(terminal-port? current-input-port)
-          (output-progress? #t)]
-         [else
-          (output-lines? #t)]))
- (define (update-width)
-   (when (output-progress?)
-     (with-charterm
-       (call-with-values (λ () (charterm-screen-size))
-                         (λ (cols rows) (set! width cols))))))
- (update-width)
- ;; check
- (when (or (not wikiname) (equal? wikiname ""))
-   (raise-user-error "Please specify the wikiname to download on the command line."))
- ;; progress reporting based on selected mode
- (define (report-progress a b c)
-   (define basename (basename->name-for-query c))
-   (cond
-     [(output-lines?)
-      (displayln basename)]
-     [(output-progress?)
-      (when (eq? (modulo a 20) 0)
-        (thread (λ () (update-width))))
-      (define prefix (format "[~a] [~a/~a] " wikiname a b))
-      (define rest (- width (string-length prefix)))
-      (define real-width (min (string-length basename) rest))
-      (define spare-width (- rest real-width))
-      (define name-display (substring basename 0 real-width))
-      (define whitespace (make-string spare-width #\ ))
-      (printf "~a~a~a\r" prefix name-display whitespace)]))
- ;; download all stages
- (for ([stage all-stages]
-       [i (in-naturals 1)])
-   (printf "> Stage ~a/~a~n" i (length all-stages))
-   (stage wikiname report-progress)
-   (displayln "")))
-
-(run start)
diff --git a/archiver/archiver-database.rkt b/archiver/archiver-database.rkt
deleted file mode 100644
index b81ad6c..0000000
--- a/archiver/archiver-database.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/list
-         racket/path
-         racket/string
-         json
-         json-pointer
-         db
-         "../lib/syntax.rkt")
-
-(provide
- get-slc
- query-exec*
- query-rows*
- query-list*
- query-value*
- query-maybe-value*
- query-maybe-row*)
-
-(define storage-path (anytime-path ".." "storage"))
-(define database-file (build-path storage-path "archiver.db"))
-
-(define slc (box #f))
-(define (get-slc)
-  (define slc* (unbox slc))
-  (cond
-    [slc* slc*]
-    [else
-     (make-directory* storage-path)
-     (define slc* (sqlite3-connect #:database database-file #:mode 'create))
-     (query-exec slc* "PRAGMA journal_mode=WAL")
-     (define database-version
-       (with-handlers ([exn:fail:sql?
-                        (λ (exn)
-                          ; need to set up the database
-                          (query-exec slc* "create table database_version (version integer, primary key (version))")
-                          (query-exec slc* "insert into database_version values (0)")
-                          0)])
-         (query-value slc* "select version from database_version")))
-
-     (define migrations
-       (wrap-sql
-        ((query-exec slc* "create table page (wikiname TEXT NOT NULL, basename TEXT NOT NULL, progress INTEGER NOT NULL, PRIMARY KEY (wikiname, basename))")
-         (query-exec slc* "create table wiki (wikiname TEXT NOT NULL, progress INTEGER, PRIMARY KEY (wikiname))"))
-        ((query-exec slc* "create table special_page (wikiname TEXT NOT NULL, key TEXT NOT NULL, basename TEXT NOT NULL, PRIMARY KEY (wikiname, key))"))
-        ((query-exec slc* "update wiki set progress = 2 where wikiname in (select wikiname from wiki inner join page using (wikiname) group by wikiname having min(page.progress) = 1)"))
-        ((query-exec slc* "create table image (wikiname TEXT NOT NULL, hash TEXT NTO NULL, url TEXT NOT NULL, ext TEXT, source INTEGER NOT NULL, progress INTEGER NOT NULL, PRIMARY KEY (wikiname, hash))"))
-        ((query-exec slc* "alter table wiki add column sitename TEXT")
-         (query-exec slc* "alter table wiki add column basepage TEXT")
-         (query-exec slc* "alter table wiki add column license_text TEXT")
-         (query-exec slc* "alter table wiki add column license_url TEXT"))))
-
-     (let do-migrate-step ()
-       (when (database-version . < . (length migrations))
-         (call-with-transaction
-          slc*
-          (list-ref migrations database-version))
-         (set! database-version (add1 database-version))
-         (query-exec slc* "update database_version set version = $1" database-version)
-         (do-migrate-step)))
-
-     (set-box! slc slc*)
-     slc*]))
-
-(define (query-exec* . args)
-  (apply query-exec (get-slc) args))
-
-(define (query-rows* . args)
-  (apply query-rows (get-slc) args))
-
-(define (query-list* . args)
-  (apply query-list (get-slc) args))
-
-(define (query-value* . args)
-  (apply query-value (get-slc) args))
-
-(define (query-maybe-value* . args)
-  (apply query-maybe-value (get-slc) args))
-
-(define (query-maybe-row* . args)
-  (apply query-maybe-row (get-slc) args))
diff --git a/archiver/archiver-gui.rkt b/archiver/archiver-gui.rkt
deleted file mode 100644
index 6f09cb8..0000000
--- a/archiver/archiver-gui.rkt
+++ /dev/null
@@ -1,347 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         racket/format
-         racket/list
-         racket/port
-         racket/set
-         racket/splicing
-         racket/string
-         db
-         net/http-easy
-         memo
-         (only-in racket/gui timer%)
-         racket/gui/easy
-         racket/gui/easy/operator
-         (only-in pict bitmap)
-         images/icons/arrow
-         images/icons/control
-         images/icons/stickman
-         images/icons/style
-         images/icons/symbol
-         "archiver-database.rkt"
-         "archiver.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
-
-(default-icon-material rubber-icon-material)
-
-(require (for-syntax racket/base racket/match racket/set racket/string))
-
-(define-syntax (@> stx)
-  (define form (cdr (syntax->datum stx)))
-  (match form
-    [(list form) ; (@> (fn @obs))
-     ;; identify the observables and replace with non-@ symbols
-     (define collection (mutable-set))
-     (define updated
-       (let loop ([sexp form])
-         (cond [(symbol? sexp)
-                (let ([as-s (symbol->string sexp)])
-                  (if (string-prefix? as-s "@")
-                      (let ([without-@ (string->symbol (substring as-s 1))])
-                        (set-add! collection (cons sexp without-@))
-                        without-@)
-                      sexp))]
-               [(pair? sexp) (cons (loop (car sexp)) (loop (cdr sexp)))]
-               [#t sexp])))
-     (define collection-l (set->list collection))
-     ;; return obs-combine -> updated-form
-     (datum->syntax stx `(obs-combine (λ (,@(map cdr collection-l)) ,updated) ,@(map car collection-l)))]
-    [(list (? string? str) args ...) ; (@> "Blah: ~a/~a" @arg1 arg2)
-     ;; identify the observables and replace with non-@ symbols
-     (define collection-l
-       (for/list ([arg args])
-         (if (symbol? arg)
-             (let ([as-s (symbol->string arg)])
-               (if (string-prefix? as-s "@")
-                   (let ([without-@ (string->symbol (substring as-s 1))])
-                     (cons arg without-@))
-                   (cons #f arg)))
-             (cons #f arg))))
-     (define collection-lo (filter car collection-l))
-     ;; return obs-combine -> format
-     (datum->syntax stx `(obs-combine (λ (,@(map cdr collection-lo)) (format ,str ,@(map cdr collection-l))) ,@(map car collection-lo)))]))
-
-(define/obs @auto-retry #f)
-
-(define-struct qi^ (wikiname st stage progress max-progress eta th) #:transparent) ;; queue item
-
-(define rows (query-rows* "select wikiname, progress from wiki where progress < 4"))
-(define/obs @queue null)
-(define (add-wikiname-to-queue wikiname st stage)
-  (@queue . <~ . (λ (queue)
-                   (define already-exists? (findf (λ (qi) (equal? (qi^-wikiname qi) wikiname)) queue))
-                   (if already-exists?
-                       queue
-                       (append queue (list (qi^ wikiname st stage 0 1 "..." #f)))))))
-(for ([row rows])
-  (add-wikiname-to-queue (vector-ref row 0)
-                         (if (= (vector-ref row 1) 4)
-                             'complete
-                             'queued)
-                         (vector-ref row 1)))
-
-(define status-icon-size 32)
-(define status-icon-min-width 36)
-(define button-icon-size 12)
-
-(define color-green (make-color 90 212 68))
-
-(define/obs @input "")
-
-(splicing-let ([frame-count 30])
-  (define stickman-frames
-    (for/vector ([s (in-range 0 1 (/ 1 frame-count))])
-      (running-stickman-icon
-       s
-       #:height status-icon-size
-       #:material (default-icon-material))))
-
-  (define/obs @stick-frame-no 0)
-  (define stick-timer
-    (new timer%
-         [notify-callback (λ () (@stick-frame-no . <~ . add1))]
-         [interval (truncate (/ 1000 frame-count))]))
-  (define/obs @stick
-    (@stick-frame-no . ~> . (λ (n) (vector-ref stickman-frames
-                                               (modulo n (vector-length stickman-frames)))))))
-
-(define status-icons
-  (hasheq 'queued (stop-icon #:color syntax-icon-color #:height status-icon-size)
-          'paused (continue-forward-icon #:color syntax-icon-color #:height status-icon-size)
-          'running @stick
-          'error (x-icon #:height status-icon-size)
-          'complete (check-icon #:color color-green #:height status-icon-size)))
-
-(define action-icons
-  (hasheq 'pause (pause-icon #:color syntax-icon-color #:height button-icon-size)
-          'resume (play-icon #:color color-green #:height button-icon-size)
-          'reset (left-over-arrow-icon #:color halt-icon-color #:height button-icon-size)))
-
-(define (bitmap-view @the-bitmap [min-width 1])
-  (pict-canvas #:min-size (@> (list (max min-width (send @the-bitmap get-width)) (send @the-bitmap get-height))) #;(if min-size (list min-size min-size) #f)
-               #:stretch '(#f #f)
-               #:style '(transparent)
-               @the-bitmap
-               bitmap))
-
-(define (exn->string e)
-  (with-output-to-string
-    (λ ()
-      (displayln (exn-message e))
-      (displayln "context:")
-      (for ([item (continuation-mark-set->context (exn-continuation-marks e))])
-        (printf "  ~a" (srcloc->string (cdr item)))
-        (when (car item)
-          (printf ": ~a" (car item)))
-        (displayln "")))))
-
-(define ((handle-graphical-exn @qi) e)
-  (displayln (exn->string e) (current-error-port))
-  (cond
-    [(obs-peek @auto-retry)
-     (void) ;; TODO
-     #;(do-retry-end wikiname)]
-    [#t
-     (update-qi @qi [st 'error])
-     (do-try-unpause-next-entry)
-     (thread
-      (λ ()
-        (define/obs @visible? #t)
-        (render
-         (dialog #:title "Download Error"
-                 #:style '(resize-border)
-                 #:mixin (λ (%) (class % (super-new)
-                                  (obs-observe! @visible? (λ (visible?) (send this show visible?)))))
-                 (vpanel #:margin '(15 15)
-                         (text "Encountered this error while downloading:")
-                         (input #:style '(multiple hscroll)
-                                #:min-size '(#f 200)
-                                (exn->string e))
-                         ;; TODO
-                         #;(button "Retry Now" (λ () (:= @visible? #f) (do-retry-now wikiname)))
-                         #;(button "Retry Round-Robin" (λ () (:= @visible? #f) (do-retry-end wikiname)))
-                         #;(button "Skip Wiki" (λ () (:= @visible? #f) (do-continue)))
-                         #;(button "Use Auto-Retry" (λ ()
-                                                      (:= @auto-retry #t)
-                                                      (:= @visible? #f)
-                                                      (do-retry-end wikiname)))
-                         #;(text "Be careful not to auto-retry an infinite loop!")))
-         main-window)))
-     (sleep)
-     ; make sure the broken thread is gone
-     (define th (qi^-th (obs-peek @qi)))
-     (when th (kill-thread th))]))
-
-(define segments
-  (list
-   (list 5/100 (make-color 0 223 217))
-   (list 88/100 color-green)
-   (list 2/100 (make-color 0 223 217))
-   (list 5/100 color-green)))
-(define segment-spacing 2)
-(unless (= (apply + (map car segments)) 1)
-  (error 'segments "segments add up to ~a, not 1" (apply + (map car segments))))
-
-;; return the new bitmap, which can be drawn on a dc<%>
-(define/memoize (ray-trace width height stage progress max-progress)
-  ;; (printf "rendering ~a ~a/~a at ~a~n" stage progress max-progress (current-inexact-milliseconds))
-  (define bm (make-object bitmap% width height #f #t))
-  (define dc (make-object bitmap-dc% bm))
-  (define width-available (- width (* (length segments) segment-spacing)))
-  (send dc set-smoothing 'unsmoothed)
-  (send dc set-pen "black" 0 'transparent)
-  (for/fold ([offset 0])
-            ([segment segments]
-             [i (in-naturals 0)]) ;; zero indexed stages?
-    ;; calculate start and end locations of grey bar
-    (define-values (segment-proportion segment-color) (apply values segment))
-    (define segment-start (if (= offset 0) 0 (+ offset segment-spacing)))
-    (define segment-width (* width-available segment-proportion))
-    ;; draw grey bar
-    (send dc set-brush (make-color 180 180 180 0.4) 'solid)
-    (send dc draw-rectangle segment-start 0 segment-width height)
-    ;; draw solid bar according to the current item's progress
-    (define proportion
-      (cond [(stage . < . i) 0]
-            [(stage . > . i) 1]
-            [(max-progress . <= . 0) 0]
-            [(progress . < . 0) 0]
-            [(progress . >= . max-progress) 1]
-            [else (progress . / . max-progress)]))
-    (send dc set-brush segment-color 'solid)
-    (send dc draw-rectangle segment-start 0 (* proportion segment-width) height)
-    (+ segment-start segment-width))
-  (bitmap-render-icon bm 6/8))
-
-;; get ray traced bitmap (possibly from cache) and draw on dc<%>
-(define (draw-bar orig-dc qi)
-  ;; (println ray-traced)
-  (define-values (width height) (send orig-dc get-size))
-  (send orig-dc draw-bitmap (ray-trace width height  (qi^-stage qi) (qi^-progress qi) (qi^-max-progress qi)) 0 0))
-
-(define ((make-progress-updater @qi) a b c)
-  ;; (printf "~a: ~a/~a ~a~n" (qi^-wikiname (obs-peek @qi)) a b c)
-  (update-qi @qi [progress a] [max-progress b]))
-
-(define (do-add-to-queue)
-  (define wikiname (string-trim (obs-peek @input)))
-  (when ((string-length wikiname) . > . 0)
-    (add-wikiname-to-queue wikiname 'queued 0)) ;; TODO: automatically start?
-  (:= @input ""))
-
-(define-syntax-rule (update-qi @qi args ...)
-  (let ([wikiname (qi^-wikiname (obs-peek @qi))])
-    (@queue . <~ . (λ (queue)
-                     (for/list ([qi queue])
-                       (if (equal? (qi^-wikiname qi) wikiname)
-                           (struct-copy qi^ qi args ...)
-                           qi))))))
-
-(define (do-start-qi @qi)
-  (define th
-    (thread (λ ()
-              (with-handlers ([exn? (handle-graphical-exn @qi)])
-                (define last-stage
-                  (for/last ([stage all-stages]
-                             [i (in-naturals)])
-                    (update-qi @qi [stage i])
-                    (stage (qi^-wikiname (obs-peek @qi)) (make-progress-updater @qi))
-                    i))
-                (update-qi @qi [st 'complete] [stage (add1 last-stage)])
-                (do-try-unpause-next-entry)))))
-  (update-qi @qi [st 'running] [th th]))
-
-(define (do-stop-qi @qi)
-  (define th (qi^-th (obs-peek @qi)))
-  (when th (kill-thread th))
-  (update-qi @qi [th #f] [st 'paused]))
-
-(define (do-reset-qi @qi)
-  (define th (qi^-th (obs-peek @qi)))
-  (when th (kill-thread th))
-  (update-qi @qi [th #f] [st 'queued] [stage 0] [progress 0] [max-progress 0])
-  (query-exec* "update wiki set progress = 0 where wikiname = ?" (qi^-wikiname (obs-peek @qi))))
-
-(define (do-try-unpause-next-entry)
-  (define queue (obs-peek @queue))
-  (define next-qi (for/first ([qi queue]
-                              #:when (memq (qi^-st qi) '(paused queued error)))
-                    qi))
-  (when next-qi
-    (define @qi (@queue . ~> . (λ (queue) (findf (λ (qi) (equal? (qi^-wikiname qi) (qi^-wikiname next-qi))) queue))))
-    (do-start-qi @qi)))
-
-(define main-window
-  (render
-   (window
-    #:title "Fandom Archiver"
-    #:size '(400 300)
-    #:mixin (λ (%) (class %
-                     (super-new)
-                     (define/augment (on-close)
-                       (send stick-timer stop)
-                       (for ([qi (obs-peek @queue)])
-                         (when (qi^-th qi)
-                           (kill-thread (qi^-th qi))))
-                       #;(disconnect*))))
-    (vpanel
-     #:spacing 10
-     #:margin '(5 5)
-     (hpanel
-      #:stretch '(#t #f)
-      #:spacing 10
-      (hpanel
-       (text "https://")
-       (input @input
-              (λ (event data) (cond
-                                [(eq? event 'input) (:= @input data)]
-                                [(eq? event 'return) (do-add-to-queue)])))
-       (text ".fandom.com"))
-      (button "Download Wiki" do-add-to-queue))
-     (list-view
-      #:style '(vertical)
-      @queue
-      #:key qi^-wikiname
-      (λ (k @qi)
-        (define @status-icons
-          (@> (case (qi^-st @qi)
-                [(running) @stick]
-                [else (hash-ref status-icons (qi^-st @qi))])))
-        (define @is-running?
-          (@> (memq (qi^-st @qi) '(running))))
-        (define @is-complete?
-          (@> (eq? (qi^-st @qi) 'complete)))
-        ;; state icon at the left side
-        (hpanel #:stretch '(#t #f)
-                #:alignment '(left center)
-                #:spacing 8
-                (bitmap-view @status-icons status-icon-min-width)
-                (vpanel
-                 ;; name and buttons (top half)
-                 (hpanel #:alignment '(left bottom)
-                         (text (@> (qi^-wikiname @qi)))
-                         (spacer)
-                         (hpanel
-                          #:stretch '(#f #f)
-                          (if-view @is-complete?
-                                   (button (hash-ref action-icons 'reset)
-                                           (λ () (do-reset-qi @qi)))
-                                   (spacer))
-                          (if-view @is-running?
-                                   (button (hash-ref action-icons 'pause)
-                                           (λ () (do-stop-qi @qi)))
-                                   (button (hash-ref action-icons 'resume)
-                                           (λ () (do-start-qi @qi))))))
-                 ;; progress bar (bottom half)
-                 (hpanel
-                  (canvas
-                   @qi
-                   #:style '(transparent)
-                   #:margin '(3 3)
-                   draw-bar)
-                  (hpanel #:min-size '(68 #f)
-                          #:stretch '(#f #f)
-                          #:alignment '(right center)
-                          (text (@> (format "eta ~a" (qi^-eta @qi))))))))))))))
diff --git a/archiver/archiver.rkt b/archiver/archiver.rkt
deleted file mode 100644
index edd0d2b..0000000
--- a/archiver/archiver.rkt
+++ /dev/null
@@ -1,335 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/function
-         racket/list
-         racket/path
-         racket/sequence
-         racket/string
-         net/url
-         net/mime
-         file/sha1
-         net/http-easy
-         db
-         json
-         "archiver-database.rkt"
-         "../lib/html-parsing/main.rkt"
-         "../lib/mime-types.rkt"
-         "../lib/syntax.rkt"
-         "../lib/tree-updater.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt"
-         "../lib/archive-file-mappings.rkt")
-
-(provide
- basename->name-for-query
- image-url->values
- hash->save-dir
- all-stages)
-
-(module+ test
-  (require rackunit))
-
-(define archive-root (anytime-path ".." "storage/archive"))
-(make-directory* archive-root)
-
-(define sources '#hasheq((style . 1) (page . 2)))
-
-(define (get-origin wikiname)
-  (format "https://~a.fandom.com" wikiname))
-
-(define (insert-wiki-entry wikiname)
-  (define dest-url
-    (format "https://~a.fandom.com/api.php?~a"
-            wikiname
-            (params->query '(("action" . "query")
-                             ("meta" . "siteinfo")
-                             ("siprop" . "general|rightsinfo|statistics")
-                             ("format" . "json")
-                             ("formatversion" . "2")))))
-  (define data (response-json (get dest-url)))
-  (define exists? (query-maybe-value* "select progress from wiki where wikiname = ?" wikiname))
-  (if (and exists? (not (sql-null? exists?)))
-      (query-exec* "update wiki set sitename = ?, basepage = ?, license_text = ?, license_url = ? where wikiname = ?"
-                  (jp "/query/general/sitename" data)
-                  (second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data)))
-                  (jp "/query/rightsinfo/text" data)
-                  (jp "/query/rightsinfo/url" data)
-                  wikiname)
-      (query-exec* "insert into wiki (wikiname, progress, sitename, basepage, license_text, license_url) values (?, 0, ?, ?, ?, ?)"
-                  wikiname
-                  (jp "/query/general/sitename" data)
-                  (second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data)))
-                  (jp "/query/rightsinfo/text" data)
-                  (jp "/query/rightsinfo/url" data)))
-  (jp "/query/statistics/articles" data))
-
-
-(define (check-style-for-images wikiname path)
-  (define content (file->string path))
-  (define urls (regexp-match* #rx"url\\(\"?'?([^)]*)'?\"?\\)" content #:match-select cadr))
-  (for/list ([url urls]
-             #:when (not (or (equal? url "")
-                             (equal? url "'")
-                             (string-suffix? url "\"")
-                             (string-contains? url "/resources-ucp/")
-                             (string-contains? url "/fonts/")
-                             (string-contains? url "/drm_fonts/")
-                             (string-contains? url "//db.onlinewebfonts.com/")
-                             (string-contains? url "//bits.wikimedia.org/")
-                             (string-contains? url "dropbox")
-                             (string-contains? url "only=styles")
-                             (string-contains? url "https://https://")
-                             (regexp-match? #rx"^%20" url)
-                             (regexp-match? #rx"^data:" url))))
-    (cond
-      [(string-prefix? url "https://") url]
-      [(string-prefix? url "http://") (regexp-replace #rx"http:" url "https:")]
-      [(string-prefix? url "//") (string-append "https:" url)]
-      [(string-prefix? url "/") (format "https://~a.fandom.com~a" wikiname url)]
-      [else (raise-user-error "While calling check-style-for-images, this URL had an unknown format and couldn't be saved:" url path)])))
-
-(define (download-styles-for-wiki wikiname callback)
-  (define save-dir (build-path archive-root wikiname "styles"))
-  (make-directory* save-dir)
-  (define theme (λ (theme-name)
-                  (cons (format "https://~a.fandom.com/wikia.php?controller=ThemeApi&method=themeVariables&variant=~a" wikiname theme-name)
-                        (build-path save-dir (format "themeVariables-~a.css" theme-name)))))
-  ;; (Listof (Pair url save-path))
-  (define styles
-    (list
-     (theme "default")
-     (theme "light")
-     (theme "dark")
-     (cons (format "https://~a.fandom.com/load.php?lang=en&modules=site.styles%7Cskin.fandomdesktop.styles%7Cext.fandom.PortableInfoboxFandomDesktop.css%7Cext.fandom.GlobalComponents.CommunityHeaderBackground.css%7Cext.gadget.site-styles%2Csound-styles&only=styles&skin=fandomdesktop" wikiname)
-           (build-path save-dir "site.css"))))
-  (for ([style styles]
-        [i (in-naturals)])
-    (callback i (length styles) "styles...")
-    (define r (get (car style)))
-    (define body (response-body r))
-    (display-to-file body (cdr style) #:exists 'replace)
-    ;; XXX: how the HELL do I deal with @import?? would need some kind of recursion here. how will the page server know where to look up the style file to be able to serve them again? do I add another link-stylesheet tag to the main page? what about the remaining stuck @import url?
-    )
-  (callback (length styles) (length styles) "styles...")
-  styles)
-
-(define (hash->save-dir wikiname hash)
-  (build-path archive-root wikiname "images" (substring hash 0 1) (substring hash 0 2)))
-
-(define (image-url->values i)
-  ;; TODO: handle case where there is multiple broken cb parameter on minecraft wiki
-  ;; TODO: ensure it still "works" with broken &amp; on minecraft wiki
-  (define no-cb (regexp-replace #rx"\\cb=[0-9]+&?" i "")) ; remove cb url parameter which does nothing
-  (define key (regexp-replace #rx"[&?]$" no-cb "")) ; remove extra separator if necessary
-  (define hash (sha1 (string->bytes/utf-8 key)))
-  (cons key hash))
-
-
-;; 1. Download list of wiki pages and store in database, if not done yet for that wiki
-(define (if-necessary-download-list-of-pages wikiname callback)
-  (define wiki-progress (query-maybe-value* "select progress from wiki where wikiname = ?" wikiname))
-  ;; done yet?
-  (unless (and (real? wiki-progress) (wiki-progress . >= . 1))
-    ;; Count total pages
-    (define num-pages (insert-wiki-entry wikiname))
-    ;; Download the entire index of pages
-    (define basenames
-      (let loop ([path-with-namefrom "/wiki/Local_Sitemap"]
-                 [basenames-previous-pages null])
-        ;; Download the current index page
-        (define url (format "https://~a.fandom.com~a" wikiname path-with-namefrom))
-        (define r (get url))
-        ;; Metadata from this page (the link to the next page)
-        (define page (html->xexp (bytes->string/utf-8 (response-body r))))
-        (define link-namefrom
-          ((query-selector (λ (t a c x) (and (eq? t 'a)
-                                             (pair? x)
-                                             (string-contains? (car x) "Next page")
-                                             (let ([href (get-attribute 'href a)] )
-                                               (and href (string-contains? href "/wiki/Local_Sitemap")))))
-                           page #:include-text? #t)))
-        ;; Content from this page
-        (define basenames-this-page
-          (for/list ([link (in-producer
-                            (query-selector
-                             (λ (t a c) (eq? t 'a))
-                             ((query-selector (λ (t a c) (has-class? "mw-allpages-chunk" a)) page)))
-                            #f)])
-            (local-encoded-url->basename (get-attribute 'href (bits->attributes link)))))
-        ;; Call the progress callback
-        (define all-basenames (append basenames-previous-pages basenames-this-page))
-        (callback (length all-basenames) num-pages (last all-basenames))
-        ;; Recurse to download from the next page
-        (if link-namefrom
-            (loop (get-attribute 'href (bits->attributes link-namefrom)) all-basenames)
-            all-basenames)))
-    ;; Save those pages into the database
-    ;; SQLite can have a maximum of 32766 parameters in a single query
-    (for ([slice (in-slice 32760 basenames)])
-      (define query-template (string-join (make-list (length slice) "(?1, ?, 0)") ", " #:before-first "insert or ignore into page (wikiname, basename, progress) values "))
-      (call-with-transaction
-       (get-slc)
-       (λ ()
-         (apply query-exec* query-template wikiname slice)
-         ;; Record that we have the complete list of pages
-         (query-exec* "update wiki set progress = 1 where wikiname = ?" wikiname))))))
-
-
-;; 2. Download each page via API and:
-;; * Save API response to file
-(define max-page-progress 1)
-(define (save-each-page wikiname callback)
-  ;; prepare destination folder
-  (define save-dir (build-path archive-root wikiname))
-  (make-directory* save-dir)
-  ;; gather list of basenames to download (that aren't yet complete)
-  (define basenames (query-list* "select basename from page where wikiname = ? and progress < ?"
-                                wikiname max-page-progress))
-  ;; counter of complete/incomplete basenames
-  (define already-done-count
-    (query-value* "select count(*) from page where wikiname = ? and progress = ?"
-                 wikiname max-page-progress))
-  (define not-done-count
-    (query-value* "select count(*) from page where wikiname = ? and progress < ?"
-                  wikiname max-page-progress))
-  (define total-count (+ already-done-count not-done-count))
-  ;; set initial progress
-  (callback already-done-count total-count "")
-  ;; loop through basenames and download
-  (for ([basename basenames]
-        [i (in-naturals (add1 already-done-count))])
-    (define name-for-query (basename->name-for-query basename))
-    (define dest-url
-      (format "https://~a.fandom.com/api.php?~a"
-              wikiname
-              (params->query `(("action" . "parse")
-                               ("page" . ,name-for-query)
-                               ("prop" . "text|headhtml|langlinks")
-                               ("formatversion" . "2")
-                               ("format" . "json")))))
-    (define r (get dest-url))
-    (define body (response-body r))
-    (define filename (string-append basename ".json"))
-    (define save-path
-      (cond [((string-length basename) . > . 240)
-             (define key (sha1 (string->bytes/latin-1 basename)))
-             (query-exec* "insert into special_page (wikiname, key, basename) values (?, ?, ?)"
-                         wikiname key basename)
-             (build-path save-dir (string-append key ".json"))]
-            [#t
-             (build-path save-dir (string-append basename ".json"))]))
-    (display-to-file body save-path #:exists 'replace)
-    (query-exec* "update page set progress = 1 where wikiname = ? and basename = ?"
-                wikiname basename)
-    (callback i total-count basename))
-  ;; saved all pages, register that fact in the database
-  (query-exec* "update wiki set progress = 2 where wikiname = ?" wikiname))
-
-
-;; 3. Download CSS and:
-;; * Save CSS to file
-;; * Record style images to database
-(define (if-necessary-download-and-check-styles wikiname callback)
-  (define wiki-progress (query-maybe-value* "select progress from wiki where wikiname = ?" wikiname))
-  (unless (and (number? wiki-progress) (wiki-progress . >= . 3))
-    (define styles (download-styles-for-wiki wikiname callback))
-    (define unique-image-urls
-      (remove-duplicates
-       (map image-url->values
-            (flatten
-             (for/list ([style styles])
-               (check-style-for-images wikiname (cdr style)))))
-       #:key cdr))
-    (for ([pair unique-image-urls])
-      (query-exec* "insert or ignore into image (wikiname, url, hash, ext, source, progress) values (?, ?, ?, NULL, 1, 0)" wikiname (car pair) (cdr pair)))
-    (query-exec* "update wiki set progress = 3 where wikiname = ?" wikiname)))
-
-
-;; 4: From downloaded pages, record URLs of image sources and inline style images to database
-(define (check-json-for-images wikiname path)
-  (define data (with-input-from-file path (λ () (read-json))))
-  (define page (html->xexp (preprocess-html-wiki (jp "/parse/text" data))))
-  (define tree (update-tree-wiki page wikiname))
-  null
-  #;(remove-duplicates
-     (for/list ([element (in-producer
-                          (query-selector
-                           (λ (t a c)
-                             (and (eq? t 'img)
-                                  (get-attribute 'src a)))
-                           tree)
-                          #f)])
-       (image-url->values (get-attribute 'src (bits->attributes element))))))
-
-
-;; 5. Download image sources and style images according to database
-(define (save-each-image wikiname callback)
-  (define source (hash-ref sources 'style)) ;; TODO: download entire wiki images instead?
-  ;; gather list of basenames to download (that aren't yet complete)
-  (define rows (query-rows* "select url, hash from image where wikiname = ? and source <= ? and progress < 1"
-                                wikiname source))
-  ;; counter of complete/incomplete basenames
-  (define already-done-count
-    (query-value* "select count(*) from image where wikiname = ? and source <= ? and progress = 1"
-                 wikiname source))
-  (define not-done-count
-    (query-value* "select count(*) from image where wikiname = ? and source <= ? and progress < 1"
-                 wikiname source))
-  ;; set initial progress
-  (callback already-done-count (+ already-done-count not-done-count) "")
-  ;; loop through urls and download
-  (for ([row rows]
-        [i (in-naturals 1)])
-    ;; row fragments
-    (define url (vector-ref row 0))
-    (define hash (vector-ref row 1))
-    ;; check
-    #; (printf "~a -> ~a~n" url hash)
-    (define r (get url))
-    (define declared-type (response-headers-ref r 'content-type))
-    (define final-type (if (equal? declared-type #"application/octet-stream")
-                           (let ([sniff-entity (message-entity (mime-analyze (response-body r)))])
-                             (string->bytes/latin-1 (format "~a/~a" (entity-type sniff-entity) (entity-subtype sniff-entity))))
-                           declared-type))
-    (define ext
-      (with-handlers ([exn:fail:contract? (λ _ (error 'save-each-image "no ext found for mime type `~a` in file ~a" final-type url))])
-        (bytes->string/latin-1 (mime-type->ext final-type))))
-    ;; save
-    (define save-dir (hash->save-dir wikiname hash))
-    (make-directory* save-dir)
-    (define save-path (build-path save-dir (string-append hash "." ext)))
-    (define body (response-body r))
-    (display-to-file body save-path #:exists 'replace)
-    (query-exec* "update image set progress = 1, ext = ? where wikiname = ? and hash = ?"
-                ext wikiname hash)
-    (callback (+ already-done-count i) (+ already-done-count not-done-count) (string-append (substring hash 0 6) "..." ext)))
-  ;; saved all images, register that fact in the database
-  (query-exec* "update wiki set progress = 4 where wikiname = ?" wikiname))
-
-(define all-stages
-  (list
-   if-necessary-download-list-of-pages
-   save-each-page
-   if-necessary-download-and-check-styles
-   ;; check-json-for-images
-   save-each-image))
-
-(module+ test
-  (check-equal? (html->xexp "<img src=\"https://example.com/images?src=Blah.jpg&amp;width=150\">")
-                '(*TOP* (img (@ (src "https://example.com/images?src=Blah.jpg&width=150")))))
-  #;(download-list-of-pages "minecraft" values)
-  #;(save-each-page "minecraft" values)
-  #;(check-json-for-images "chiki" (build-path archive-root "chiki" "Fiona.json"))
-  #;(do-step-3 "gallowmere")
-  #;(save-each-image "gallowmere" (hash-ref sources 'style) (λ (a b c) (printf "~a/~a ~a~n" a b c)))
-
-  #;(for ([wikiname (query-list* "select wikiname from wiki")])
-      (println wikiname)
-      (insert-wiki-entry wikiname))
-
-  #;(for ([wikiname (query-list* "select wikiname from wiki")])
-      (println wikiname)
-      (do-step-3 wikiname)
-      (save-each-image wikiname (hash-ref sources 'style) (λ (a b c) (printf "~a/~a ~a~n" a b c)))))
-
-; (for ([stage all-stages]) (stage "create" (λ (a b c) (printf "~a/~a ~a~n" a b c))))
diff --git a/archiver/info.rkt b/archiver/info.rkt
deleted file mode 100644
index 17bb747..0000000
--- a/archiver/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define build-deps '("rackunit-lib" "web-server-lib" "http-easy-lib" "html-parsing" "html-writing" "json-pointer" "ini-lib" "memo" "net-cookies-lib" "gui-easy-lib" "sql" "charterm" "cli"))
diff --git a/archiver/req.rktd b/archiver/req.rktd
deleted file mode 100644
index e2d2fc2..0000000
--- a/archiver/req.rktd
+++ /dev/null
@@ -1 +0,0 @@
-((local (".")))
diff --git a/breezewiki.rkt b/breezewiki.rkt
index 5fd34b2..a8b8c28 100644
--- a/breezewiki.rkt
+++ b/breezewiki.rkt
@@ -17,12 +17,9 @@
 (require-reloadable "src/page-proxy.rkt" page-proxy)
 (require-reloadable "src/page-redirect-wiki-home.rkt" redirect-wiki-home)
 (require-reloadable "src/page-search.rkt" page-search)
-(require-reloadable "src/page-set-user-settings.rkt" page-set-user-settings)
 (require-reloadable "src/page-static.rkt" static-dispatcher)
-(require-reloadable "src/page-static-archive.rkt" page-static-archive)
 (require-reloadable "src/page-subdomain.rkt" subdomain-dispatcher)
 (require-reloadable "src/page-wiki.rkt" page-wiki)
-(require-reloadable "src/page-wiki-offline.rkt" page-wiki-offline)
 (require-reloadable "src/page-file.rkt" page-file)
 
 (reload!)
@@ -30,9 +27,7 @@
 (define ch (make-channel))
 (define (start)
   (serve/launch/wait
-   #:listen-ip (if (equal? (config-get 'bind_host) "auto")
-                 (if (config-true? 'debug) "127.0.0.1" #f)
-                 (config-get 'bind_host))
+   #:listen-ip (if (config-true? 'debug) "127.0.0.1" #f)
    #:port (string->number (config-get 'port))
    (λ (quit)
      (channel-put ch (lambda () (semaphore-post quit)))
@@ -45,10 +40,7 @@
       page-not-found
       page-proxy
       page-search
-      page-set-user-settings
-      page-static-archive
       page-wiki
-      page-wiki-offline
       page-file
       redirect-wiki-home
       static-dispatcher
diff --git a/dist.rkt b/dist.rkt
index 2e46f8c..777e81a 100644
--- a/dist.rkt
+++ b/dist.rkt
@@ -11,18 +11,13 @@
 (require (only-in "src/page-proxy.rkt" page-proxy))
 (require (only-in "src/page-redirect-wiki-home.rkt" redirect-wiki-home))
 (require (only-in "src/page-search.rkt" page-search))
-(require (only-in "src/page-set-user-settings.rkt" page-set-user-settings))
 (require (only-in "src/page-static.rkt" static-dispatcher))
-(require (only-in "src/page-static-archive.rkt" page-static-archive))
 (require (only-in "src/page-subdomain.rkt" subdomain-dispatcher))
 (require (only-in "src/page-wiki.rkt" page-wiki))
-(require (only-in "src/page-wiki-offline.rkt" page-wiki-offline))
 (require (only-in "src/page-file.rkt" page-file))
 
 (serve/launch/wait
- #:listen-ip (if (equal? (config-get 'bind_host) "auto")
-                 (if (config-true? 'debug) "127.0.0.1" #f)
-                 (config-get 'bind_host))
+ #:listen-ip (if (config-true? 'debug) "127.0.0.1" #f)
  #:port (string->number (config-get 'port))
  (λ (quit)
    (dispatcher-tree
@@ -34,10 +29,7 @@
     page-not-found
     page-proxy
     page-search
-    page-set-user-settings
-    page-static-archive
     page-wiki
-    page-wiki-offline
     page-file
     redirect-wiki-home
     static-dispatcher
diff --git a/info.rkt b/info.rkt
index c290d5b..46512df 100644
--- a/info.rkt
+++ b/info.rkt
@@ -1,3 +1,3 @@
 #lang info
 
-(define build-deps '("rackunit-lib" "web-server-lib" "http-easy-lib" "html-parsing" "html-writing" "json-pointer" "typed-ini-lib" "memo" "net-cookies-lib" "db"))
+(define build-deps '("rackunit-lib" "web-server-lib" "http-easy-lib" "html-parsing" "html-writing" "json-pointer" "ini-lib" "memo"))
diff --git a/lib/archive-file-mappings.rkt b/lib/archive-file-mappings.rkt
deleted file mode 100644
index 4aa8a69..0000000
--- a/lib/archive-file-mappings.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require racket/string
-         net/url
-         (only-in net/uri-codec uri-decode)
-         "url-utils.rkt")
-(provide
- local-encoded-url->segments
- url-segments->basename
- local-encoded-url->basename
- basename->name-for-query
- url-segments->guess-title)
-
-(define (local-encoded-url->segments str) ; '("wiki" "Page_title")
-  (map path/param-path (url-path (string->url str))))
-
-(define (url-segments->basename segments) ; "Page_title" filename encoded, no extension or dir prefix
-  (define extra-encoded (map (λ (s) (bytes->string/latin-1 (percent-encode s filename-set #f))) (cdr segments)))
-  (define basic-filename (string-join extra-encoded "#"))
-  basic-filename)
-
-(define (local-encoded-url->basename str) ; '("wiki" "Page_title"), no extension or dir prefix
-  (url-segments->basename (local-encoded-url->segments str)))
-
-(define (basename->name-for-query str)
-  (uri-decode (regexp-replace* #rx"#" str "/")))
-
-(define (url-segments->guess-title segments)
-  (regexp-replace* #rx"_" (cadr segments) " "))
diff --git a/lib/html-parsing/main.rkt b/lib/html-parsing/main.rkt
deleted file mode 100644
index bdc09b1..0000000
--- a/lib/html-parsing/main.rkt
+++ /dev/null
@@ -1,1887 +0,0 @@
-#lang racket/base
-;; Copyright Neil Van Dyke.  For legal info, see file "info.rkt".
-
-(require mcfly)
-
-(module+ test
-  (require overeasy))
-
-(doc (section "Introduction")
-
-     (para "The "
-           (code "html-parsing")
-           " library provides a permissive HTML parser.  The parser is useful
-for software agent extraction of information from Web pages, for
-programmatically transforming HTML files, and for implementing interactive Web
-browsers.  "
-           (code "html-parsing")
-           " emits "
-           ;; TODO: 2016-02-21 Once create sxml-doc package, reference that.
-           (seclink "top"
-                    #:doc '(lib "sxml-intro/sxml-intro.scrbl")
-                    #:indirect? #true
-                    "SXML/xexp")
-           ", so that conventional HTML may be processed with XML tools such as
-SXPath.  Like Oleg Kiselyov's "
-           (hyperlink "http://pobox.com/~oleg/ftp/Scheme/xml.html#HTML-parser"
-                      "SSAX-based HTML parser")
-           ", "
-           (code "html-parsing")
-           " provides a permissive tokenizer, but "
-           (code "html-parsing")
-           " extends this by attempting to recover syntactic structure.")
-
-     (para "The "
-           (code "html-parsing")
-           " parsing behavior is permissive in that it accepts erroneous HTML,
-handling several classes of HTML syntax errors gracefully, without yielding a
-parse error.  This is crucial for parsing arbitrary real-world Web pages, since
-many pages actually contain syntax errors that would defeat a strict or
-validating parser.  "
-           (code "html-parsing")
-           "'s handling of errors is intended to generally emulate popular Web
-browsers' interpretation of the structure of erroneous HTML.")
-     (para (code "html-parsing")
-           " also has some support for XHTML, although XML namespace qualifiers
-are accepted but stripped from the resulting SXML/xexp.  Note that "
-           (italic "valid")
-           " XHTML input might be better handled by a validating XML parser
-like Kiselyov's SSAX."))
-
-;; BEGIN COPIED FROM XEXP PACKAGE
-
-(define (%html-parsing:make-xexp-char-ref val)
-  (if (or (symbol? val) (integer? val))
-      `(& ,val)
-      (error 'make-xexp-char-ref
-             "invalid xexp reference value: ~S"
-             val)))
-
-(define %html-parsing:always-empty-html-elements
-  '(area base br frame hr img input isindex keygen link meta param
-         spacer wbr))
-
-;; END COPIED FROM XEXP PACKAGE
-
-(define %html-parsing:empty-token-symbol       '*empty*)
-(define %html-parsing:end-token-symbol         '*end*)
-(define %html-parsing:start-token-symbol       '*start*)
-(define %html-parsing:entity-token-symbol      '*entity*)
-(define %html-parsing:text-string-token-symbol '*text-string*)
-(define %html-parsing:text-char-token-symbol   '*text-char*)
-
-(define %html-parsing:make-html-tokenizer
-  ;; TODO: Have the tokenizer replace contiguous whitespace within individual
-  ;; text tokens with single space characters (except for when in `pre' and
-  ;; verbatim elements).  The parser will introduce new contiguous whitespace
-  ;; (e.g., when text tokens are concatenated, invalid end tags are removed,
-  ;; whitespace is irrelevant between certain elements), but then the parser
-  ;; only has to worry about the first and last character of each string.
-  ;; Perhaps the text tokens should have both leading and trailing whitespace
-  ;; stripped, and contain flags for whether or not leading and trailing
-  ;; whitespace occurred.
-  (letrec ((no-token '())
-
-           ;; TODO: Maybe make these three variables options.
-
-           (verbatim-to-eof-elems '(plaintext))
-
-           (verbatim-pair-elems '(script server style xmp))
-
-           (ws-chars (list #\space
-                           (integer->char 9)
-                           (integer->char 10)
-                           (integer->char 11)
-                           (integer->char 12)
-                           (integer->char 13)))
-
-           (gosc/string-or-false
-            (lambda (os)
-              (let ((s (get-output-string os)))
-                (if (string=? s "") #f s))))
-
-           (gosc/symbol-or-false
-            (lambda (os)
-              (let ((s (gosc/string-or-false os)))
-                (if s (string->symbol s) #f))))
-           )
-    (lambda (in normalized?)
-      ;; TODO: Make a tokenizer option that causes XML namespace qualifiers to
-      ;; be ignored.
-      (letrec
-          (
-           ;; Port buffer with inexpensive unread of one character and slightly
-           ;; more expensive pushback of second character to unread.  The
-           ;; procedures themselves do no consing.  The tokenizer currently
-           ;; needs two-symbol lookahead, due to ambiguous "/" while parsing
-           ;; element and attribute names, which could be either empty-tag
-           ;; syntax or XML qualified names.
-           (c           #f)
-           (next-c      #f)
-           (c-consumed? #t)
-           (read-c      (lambda ()
-                          (if c-consumed?
-                              (if next-c
-                                  (begin (set! c      next-c)
-                                         (set! next-c #f))
-                                  (set! c (read-char in)))
-                              (set! c-consumed? #t))))
-           (unread-c    (lambda ()
-                          (if c-consumed?
-                              (set! c-consumed? #f)
-                              ;; TODO: Procedure name in error message really
-                              ;; isn't "%html-parsing:make-html-tokenizer"...
-                              (error '%html-parsing:make-html-tokenizer
-                                     "already unread: ~S"
-                                     c))))
-           (push-c      (lambda (new-c)
-                          (if c-consumed?
-                              (begin (set! c           new-c)
-                                     (set! c-consumed? #f))
-                              (if next-c
-                                  (error '%html-parsing:make-html-tokenizer
-                                         "pushback full: ~S"
-                                         c)
-                                  (begin (set! next-c      c)
-                                         (set! c           new-c)
-                                         (set! c-consumed? #f))))))
-
-           ;; TODO: These procedures are a temporary convenience for
-           ;; enumerating the pertinent character classes, with an eye towards
-           ;; removing redundant tests of character class.  These procedures
-           ;; should be eliminated in a future version.
-           (c-eof?      (lambda () (eof-object? c)))
-           (c-amp?      (lambda () (eqv? c #\&)))
-           (c-apos?     (lambda () (eqv? c #\')))
-           (c-bang?     (lambda () (eqv? c #\!)))
-           (c-colon?    (lambda () (eqv? c #\:)))
-           (c-quot?     (lambda () (eqv? c #\")))
-           (c-equals?   (lambda () (eqv? c #\=)))
-           (c-gt?       (lambda () (eqv? c #\>)))
-           (c-lsquare?  (lambda () (eqv? c #\[)))
-           (c-lt?       (lambda () (eqv? c #\<)))
-           (c-minus?    (lambda () (eqv? c #\-)))
-           (c-pound?    (lambda () (eqv? c #\#)))
-           (c-ques?     (lambda () (eqv? c #\?)))
-           (c-semi?     (lambda () (eqv? c #\;)))
-           (c-slash?    (lambda () (eqv? c #\/)))
-           (c-splat?    (lambda () (eqv? c #\*)))
-           (c-lf?       (lambda () (eqv? c #\newline)))
-           (c-angle?    (lambda () (memv c '(#\< #\>))))
-           (c-ws?       (lambda () (memv c ws-chars)))
-           (c-alpha?    (lambda () (char-alphabetic? c)))
-           (c-digit?    (lambda () (char-numeric? c)))
-           (c-alphanum? (lambda () (or (c-alpha?) (c-digit?))))
-           (c-hexlet?   (lambda () (memv c '(#\a #\b #\c #\d #\e #\f
-                                             #\A #\B #\C #\D #\E #\F))))
-
-           (skip-ws     (lambda () (read-c) (if (c-ws?) (skip-ws) (unread-c))))
-
-           (if-read-chars
-            (lambda (match-chars yes-thunk no-proc)
-              (let loop ((chars       match-chars)
-                         (match-count 0))
-                (if (null? chars)
-                    (yes-thunk)
-                    (begin (read-c)
-                           (if (eqv? c (car chars))
-                               (begin (loop (cdr chars) (+ 1 match-count)))
-                               (begin (unread-c)
-                                      (no-proc match-chars match-count))))))))
-
-           (write-chars-count
-            (lambda (chars count port)
-              (let loop ((chars chars)
-                         (count count))
-                (or (zero? count)
-                    (begin (write-char (car chars) port)
-                           (loop (cdr chars)
-                                 (- count 1)))))))
-
-           (make-start-token
-            (if normalized?
-                (lambda (name ns attrs)
-                  (list name (cons '@ attrs)))
-                (lambda (name ns attrs)
-                  (if (null? attrs)
-                      (list name)
-                      (list name (cons '@ attrs))))))
-
-           (make-empty-token
-            (lambda (name ns attrs)
-              (cons %html-parsing:empty-token-symbol
-                    (make-start-token name ns attrs))))
-
-           (make-end-token
-            (if normalized?
-                (lambda (name ns attrs)
-                  (list %html-parsing:end-token-symbol
-                        name
-                        (cons '@ attrs)))
-                (lambda (name ns attrs)
-                  (if (null? attrs)
-                      (list %html-parsing:end-token-symbol name)
-                      (list %html-parsing:end-token-symbol
-                            name
-                            (cons '@ attrs))))))
-
-           (make-comment-token
-            (lambda (str) (list '*COMMENT* str)))
-
-           (make-decl-token
-            (lambda (parts) (cons '*DECL* parts)))
-
-           (scan-qname
-            ;; TODO: Make sure we don't accept local names that have "*", since
-            ;; this can break SXML tools.  Have to validate this afterwards if
-            ;; "verbatim-safe?".  Also check for "@" and maybe "@@".  Check
-            ;; qname parsing code, especially for verbatim mode.  This is
-            ;; important!
-            (lambda (verbatim-safe?)
-              ;; Note: If we accept some invalid local names, we only need two
-              ;; symbols of lookahead to determine the end of a qname.
-              (letrec ((os      #f)
-                       (ns      '())
-                       (vcolons 0)
-                       (good-os (lambda ()
-                                  (or os
-                                      (begin (set! os (open-output-string))
-                                             os)))))
-                (let loop ()
-                  (read-c)
-                  (cond ((c-eof?) #f)
-                        ((or (c-ws?) (c-splat?))
-                         (if verbatim-safe?
-                             (unread-c)
-                             #f))
-                        ((or (c-angle?) (c-equals?) (c-quot?) (c-apos?))
-                         (unread-c))
-                        ((c-colon?)
-                         (or (null? ns)
-                             (set! ns (cons ":" ns)))
-                         (if os
-                             (begin
-                               (set! ns (cons (get-output-string os)
-                                              ns))
-                               (set! os #f))
-                             #f)
-                         (loop))
-                        ((c-slash?)
-                         (read-c)
-                         (cond ((or (c-eof?)
-                                    (c-ws?)
-                                    (c-equals?)
-                                    (c-apos?)
-                                    (c-quot?)
-                                    (c-angle?)
-                                    (c-splat?))
-                                (unread-c)
-                                (push-c #\/))
-                               (else (write-char #\/ (good-os))
-                                     (write-char c   os)
-                                     (loop))))
-                        (else (write-char c (good-os))
-                              (loop))))
-                (let ((ns    (if (null? ns)
-                                 #f
-                                 (apply string-append
-                                        (reverse ns))))
-                      (localname (if os (get-output-string os) #f)))
-                  (if verbatim-safe?
-                      ;; TODO: Make sure we don't have ambiguous ":" or drop
-                      ;; any characters!
-                      (cons ns localname)
-                      ;; Note: We represent "xml:" and "xmlns:" syntax as
-                      ;; normal qnames, for lack of something better to do with
-                      ;; them when we don't support XML namespaces.
-                      ;;
-                      ;; TODO: Local names are currently forced to lowercase,
-                      ;; since HTML is usually case-insensitive.  If XML
-                      ;; namespaces are used, we might wish to keep local names
-                      ;; case-sensitive.
-                      (if localname
-                          (if ns
-                              (if (or (string=? ns "xml")
-                                      (string=? ns "xmlns"))
-                                  (string->symbol (string-append ns
-                                                                 ":"
-                                                                 localname))
-                                  (cons ns
-                                        (string->symbol (string-downcase
-                                                         localname))))
-                              (string->symbol (string-downcase localname)))
-                          (if ns
-                              (string->symbol (string-downcase ns))
-                              ;; TODO: Ensure in rest of code that returning #f
-                              ;; as a name here is OK.
-                              #f)))))))
-
-           (scan-tag
-            (lambda (start?)
-              (skip-ws)
-              (let ((tag-name   (scan-qname #f))
-                    (tag-ns     #f)
-                    (tag-attrs  #f)
-                    (tag-empty? #f))
-                ;; Scan element name.
-                (if (pair? tag-name)
-                    (begin (set! tag-ns   (car tag-name))
-                           (set! tag-name (cdr tag-name)))
-                    #f)
-                ;; TODO: Ensure there's no case in which a #f tag-name isn't
-                ;; compensated for later.
-                ;;
-                ;; Scan element attributes.
-                (set! tag-attrs
-                      (let scan-attr-list ()
-                        (read-c)
-                        (cond ((c-eof?)   '())
-                              ((c-angle?) (unread-c) '())
-                              ((c-slash?)
-                               (set! tag-empty? #t)
-                               (scan-attr-list))
-                              ((c-alpha?)
-                               (unread-c)
-                               (let ((attr (scan-attr)))
-                                 (cons attr (scan-attr-list))))
-                              (else (scan-attr-list)))))
-                ;; Find ">" or unnatural end.
-                (let loop ()
-                  (read-c)
-                  (cond ((c-eof?)   no-token)
-                        ((c-slash?) (set! tag-empty? #t) (loop))
-                        ((c-gt?)    #f)
-                        ((c-ws?)    (loop))
-                        (else       (unread-c))))
-                ;; Change the tokenizer mode if necessary.
-                (cond ((not start?) #f)
-                      (tag-empty?   #f)
-                      ;; TODO: Maybe make one alist lookup here, instead of
-                      ;; two.
-                      ((memq tag-name verbatim-to-eof-elems)
-                       (set! nexttok verbeof-nexttok))
-                      ((memq tag-name verbatim-pair-elems)
-                       (set! nexttok (make-verbpair-nexttok tag-name))))
-                ;; Return a token object.
-                (if start?
-                    (if tag-empty?
-                        (make-empty-token tag-name tag-ns tag-attrs)
-                        (make-start-token tag-name tag-ns tag-attrs))
-                    (make-end-token tag-name tag-ns tag-attrs)))))
-
-           (scan-attr
-            (lambda ()
-              (let ((name (scan-qname #f))
-                    (val  #f))
-                (if (pair? name)
-                    (set! name (cdr name))
-                    #f)
-                (let loop-equals-or-end ()
-                  (read-c)
-                  (cond ((c-eof?) no-token)
-                        ((c-ws?)  (loop-equals-or-end))
-                        ((c-equals?)
-                         (let loop-quote-or-unquoted ()
-                           (read-c)
-                           (cond ((c-eof?) no-token)
-                                 ((c-ws?) (loop-quote-or-unquoted))
-                                 ((or (c-apos?) (c-quot?))
-                                  (let ((term c))
-                                    (set! val (open-output-string))
-                                    (let loop-quoted-val ()
-                                      (read-c)
-                                      (cond ((c-eof?)      #f)
-                                            ((eqv? c term) #f)
-                                            ((c-amp?) (let ((entity (scan-entity)))
-                                                        (display entity val)
-                                                        (loop-quoted-val)))
-                                            (else (write-char c val)
-                                                  (loop-quoted-val))))))
-                                 ((c-angle?) (unread-c))
-                                 (else
-                                  (set! val (open-output-string))
-                                  (write-char c val)
-                                  (let loop-unquoted-val ()
-                                    (read-c)
-                                    (cond ((c-eof?)  no-token)
-                                          ((c-apos?) #f)
-                                          ((c-quot?) #f)
-                                          ((or (c-ws?) (c-angle?)
-                                               ;;(c-slash?)
-                                               )
-                                           (unread-c))
-                                          ;; Note: We can treat a slash in an
-                                          ;; unquoted attribute value as a
-                                          ;; value constituent because the
-                                          ;; slash is specially-handled only
-                                          ;; for XHTML, and XHTML attribute
-                                          ;; values must always be quoted.  We
-                                          ;; could do lookahead for "/>", but
-                                          ;; that wouldn't let us parse HTML
-                                          ;; "<a href=/>" correctly, so this is
-                                          ;; an easier and more correct way to
-                                          ;; do things.
-                                          (else (write-char c val)
-                                                (loop-unquoted-val))))))))
-                        (else (unread-c))))
-                (if normalized?
-                    (list name (if val
-                                   (get-output-string val)
-                                   (symbol->string name)))
-                    (if val
-                        (list name (get-output-string val))
-                        (list name))))))
-
-           (scan-comment
-            ;; TODO: Rewrite this to use tail recursion rather than a state
-            ;; variable.
-            (lambda ()
-              (let ((os    (open-output-string))
-                    (state 'start-minus))
-                (let loop ()
-                  (read-c)
-                  (cond ((c-eof?) #f)
-                        ((c-minus?)
-                         (set! state
-                               (case state
-                                 ((start-minus)            'start-minus-minus)
-                                 ((start-minus-minus body) 'end-minus)
-                                 ((end-minus)              'end-minus-minus)
-                                 ((end-minus-minus) (write-char #\- os) state)
-                                 (else (error '<%html-parsing:make-html-tokenizer>
-                                              "invalid state: ~S"
-                                              state))))
-                         (loop))
-                        ((and (c-gt?) (eq? state 'end-minus-minus)) #f)
-                        (else (case state
-                                ((end-minus)       (write-char #\- os))
-                                ((end-minus-minus) (display "--" os)))
-                              (set! state 'body)
-                              (write-char c os)
-                              (loop))))
-                (make-comment-token (get-output-string os)))))
-
-           (scan-possible-cdata
-            (lambda ()
-              ;; Read "<!" and current character is "[", so try to read the
-              ;; rest of the CDATA start delimeter.
-              (if-read-chars
-               '(#\C #\D #\A #\T #\A #\[)
-               (lambda ()
-                 ;; Successfully read CDATA section start delimiter, so read
-                 ;; the section.
-                 (scan-cdata))
-               (lambda (chars count)
-                 ;; Did not read rest of CDATA section start delimiter, so
-                 ;; return a string for what we did read.
-                 (let ((os (open-output-string)))
-                   (display "<![" os)
-                   (write-chars-count chars count os)
-                   (get-output-string os))))))
-
-           (scan-cdata
-            (lambda ()
-              (let ((os (open-output-string)))
-                (let loop ()
-                  (if-read-chars
-                   '(#\] #\] #\>)
-                   (lambda () (get-output-string os))
-                   (lambda (chars count)
-                     (if (zero? count)
-                         (if (eof-object? c)
-                             (get-output-string os)
-                             (begin (write-char c os)
-                                    (read-c)
-                                    (loop)))
-                         (begin (write-char #\] os)
-                                (if (= count 2)
-                                    (push-c #\])
-                                    #f)
-                                (loop)))))))))
-
-           (scan-pi
-            (lambda ()
-              (skip-ws)
-              (let ((name (open-output-string))
-                    (val  (open-output-string)))
-                (let scan-name ()
-                  (read-c)
-                  (cond ((c-eof?)   #f)
-                        ((c-ws?)    #f)
-                        ((c-alpha?) (write-char c name) (scan-name))
-                        (else       (unread-c))))
-                ;; TODO: Do we really want to emit #f for PI name?
-                (set! name (gosc/symbol-or-false name))
-                (let scan-val ()
-                  (read-c)
-                  (cond ((c-eof?)  #f)
-                        ;; ((c-amp?) (display (scan-entity) val)
-                        ;;           (scan-val))
-                        ((c-ques?)
-                         (read-c)
-                         (cond ((c-eof?) (write-char #\? val))
-                               ((c-gt?)  #f)
-                               (else     (write-char #\? val)
-                                         (unread-c)
-                                         (scan-val))))
-                        (else (write-char c val) (scan-val))))
-                (list '*PI*
-                      name
-                      (get-output-string val)))))
-
-           (scan-decl
-            ;; TODO: Find if SXML includes declaration forms, and if so, use
-            ;; whatever format SXML wants.
-            ;;
-            ;; TODO: Rewrite to eliminate state variables.
-            (letrec
-                ((scan-parts
-                  (lambda ()
-                    (let ((part       (open-output-string))
-                          (nonsymbol? #f)
-                          (state      'before)
-                          (last?      #f))
-                      (let loop ()
-                        (read-c)
-                        (cond ((c-eof?) #f)
-                              ((c-ws?)
-                               (case state
-                                 ((before) (loop))
-                                 ((quoted) (write-char c part) (loop))))
-                              ((and (c-gt?) (not (eq? state 'quoted)))
-                               (set! last? #t))
-                              ((and (c-lt?) (not (eq? state 'quoted)))
-                               (unread-c))
-                              ((c-quot?)
-                               (case state
-                                 ((before)   (set! state 'quoted) (loop))
-                                 ((unquoted) (unread-c))
-                                 ((quoted)   #f)))
-                              (else
-                               (if (eq? state 'before)
-                                   (set! state 'unquoted)
-                                   #f)
-                               (set! nonsymbol? (or nonsymbol?
-                                                    (not (c-alphanum?))))
-                               (write-char c part)
-                               (loop))))
-                      (set! part (get-output-string part))
-                      (if (string=? part "")
-                          '()
-                          (cons (if (or (eq? state 'quoted) nonsymbol?)
-                                    part
-                                    ;; TODO: Normalize case of things we make
-                                    ;; into symbols here.
-                                    (string->symbol part))
-                                (if last?
-                                    '()
-                                    (scan-parts))))))))
-              (lambda () (make-decl-token (scan-parts)))))
-
-           (special-entity-reverse-chars-to-string-alist
-            '(((#\p #\m #\a)     . "&")
-              ((#\s #\o #\p #\a) . "'")
-              ((#\t #\g)         . ">")
-              ((#\t #\l)         . "<")
-              ((#\t #\o #\u #\q) . "\"")))
-           
-           (finish-terminated-named-entity
-            (lambda (reverse-name-chars)
-              (cond ((equal? '() reverse-name-chars)
-                     "&")
-                    ((assoc reverse-name-chars
-                            special-entity-reverse-chars-to-string-alist)
-                     => (lambda (p)
-                          (cdr p)))
-                    (else (%html-parsing:make-xexp-char-ref 
-                           (string->symbol (apply string (reverse reverse-name-chars))))))))
-           
-           (finish-unterminated-named-entity
-            (lambda (reverse-name-chars)
-              (apply string (cons #\& (reverse reverse-name-chars)))))
-           
-           (scan-entity
-            (lambda ()
-              (read-c)
-              (cond ((c-eof?) "&")
-                    ((c-alpha?)
-                     ;; TODO: Do entity names have a maximum length?
-                       (let loop ((reverse-name-chars (cons c '())))
-                         (read-c)
-                         (cond ((c-eof?)   (finish-unterminated-named-entity
-                                            reverse-name-chars))
-                               ((c-alpha?) (let ((reverse-name-chars (cons c reverse-name-chars)))
-                                             (cond ((assoc reverse-name-chars
-                                                           special-entity-reverse-chars-to-string-alist)
-                                                    => (lambda (p)
-                                                         (read-c)
-                                                         (or (c-semi?)
-                                                             (unread-c))
-                                                         (cdr p)))
-                                                   (else (loop reverse-name-chars)))))
-                               ((c-semi?)  (finish-terminated-named-entity
-                                            reverse-name-chars))
-                               (else       (unread-c)
-                                           (finish-unterminated-named-entity
-                                            reverse-name-chars)))))
-                    ((c-pound?)
-                     (let ((num  (open-output-string))
-                           (hex? #f))
-                       (read-c)
-                       (cond ((c-eof?)            #f)
-                             ((memv c '(#\x #\X)) (set! hex? #t) (read-c)))
-                       (let loop ()
-                         (cond ((c-eof?)  #f)
-                               ((c-semi?) #f)
-                               ((or (c-digit?) (and hex? (c-hexlet?)))
-                                (write-char c num)
-                                (read-c)
-                                (loop))
-                               (else (unread-c))))
-                       (set! num (get-output-string num))
-                       (if (string=? num "")
-                           "&#;"
-                           (let ((n (string->number num (if hex? 16 10))))
-                             (if (<= 32 n 126)
-                                 (string (integer->char n))
-                                 (string (integer->char n)))))))
-                    (else (unread-c) "&"))))
-
-           (normal-nexttok
-            (lambda ()
-              (read-c)
-              (cond ((c-eof?) no-token)
-                    ((c-lt?)
-                     (let loop ()
-                       (read-c)
-                       (cond ((c-eof?)   "<")
-                             ;; ((c-ws?)    (loop))
-                             ((c-slash?) (scan-tag #f))
-                             ((c-ques?)  (scan-pi))
-                             ((c-alpha?) (unread-c) (scan-tag #t))
-                             ((c-bang?)
-                              (read-c)
-                              (if (c-lsquare?)
-                                  (scan-possible-cdata)
-                                  (let loop ()
-                                    (cond ((c-eof?)   no-token)
-                                          ((c-ws?)    (read-c) (loop))
-                                          ((c-minus?) (scan-comment))
-                                          (else       (unread-c)
-                                                      (scan-decl))))))
-                             (else (unread-c) "<"))))
-                    ((c-gt?) ">")
-                    (else (let ((os (open-output-string)))
-                            (let loop ()
-                              (cond ((c-eof?)   #f)
-                                    ((c-angle?) (unread-c))
-                                    ((c-amp?)
-                                     (let ((entity (scan-entity)))
-                                       (if (string? entity)
-                                           (begin (display entity os)
-                                                  (read-c)
-                                                  (loop))
-                                           (let ((saved-nexttok nexttok))
-                                             (set! nexttok
-                                                   (lambda ()
-                                                     (set! nexttok
-                                                           saved-nexttok)
-                                                     entity))))))
-                                    (else (write-char c os)
-                                          (or (c-lf?)
-                                              (begin (read-c) (loop))))))
-                            (let ((text (get-output-string os)))
-                              (if (equal? text "")
-                                  (nexttok)
-                                  text)))))))
-
-           (verbeof-nexttok
-            (lambda ()
-              (read-c)
-              (if (c-eof?)
-                  no-token
-                  (let ((os (open-output-string)))
-                    (let loop ()
-                      (or (c-eof?)
-                          (begin (write-char c os)
-                                 (or (c-lf?)
-                                     (begin (read-c) (loop))))))
-                    (get-output-string os)))))
-
-           (make-verbpair-nexttok
-            (lambda (elem-name)
-              (lambda ()
-                (let ((os (open-output-string)))
-                  ;; Accumulate up to a newline-terminated line.
-                  (let loop ()
-                    (read-c)
-                    (cond ((c-eof?)
-                           ;; Got EOF in verbatim context, so set the normal
-                           ;; nextok procedure, then fall out of loop.
-                           (set! nexttok normal-nexttok))
-                          ((c-lt?)
-                           ;; Got "<" in verbatim context, so get next
-                           ;; character.
-                           (read-c)
-                           (cond ((c-eof?)
-                                  ;; Got "<" then EOF, so set to the normal
-                                  ;; nexttok procedure, add the "<" to the
-                                  ;; verbatim string, and fall out of loop.
-                                  (set! nexttok normal-nexttok)
-                                  (write-char #\< os))
-                                 ((c-slash?)
-                                  ;; Got "</", so...
-                                  (read-c)
-                                  (cond
-                                   ((c-eof?)
-                                    (display "</" os))
-                                   ((c-alpha?)
-                                    ;; Got "</" followed by alpha, so unread
-                                    ;; the alpha, scan qname, compare...
-                                    (unread-c)
-                                    (let* ((vqname (scan-qname #t))
-                                           (ns     (car vqname))
-                                           (local  (cdr vqname)))
-                                      ;; Note: We ignore XML namespace
-                                      ;; qualifier for purposes of comparison.
-                                      ;;
-                                      ;; Note: We're interning strings here for
-                                      ;; comparison when in theory there could
-                                      ;; be many such unique interned strings
-                                      ;; in a valid HTML document, although in
-                                      ;; practice this should not be a problem.
-                                      (if (and local
-                                               (eqv? (string->symbol
-                                                      (string-downcase local))
-                                                     elem-name))
-                                          ;; This is the terminator tag, so
-                                          ;; scan to the end of it, set the
-                                          ;; nexttok, and fall out of the loop.
-                                          (begin
-                                            (let scan-to-end ()
-                                              (read-c)
-                                              (cond ((c-eof?) #f)
-                                                    ((c-gt?)  #f)
-                                                    ((c-lt?)  (unread-c))
-                                                    ((c-alpha?)
-                                                     (unread-c)
-                                                     ;; Note: This is an
-                                                     ;; expensive way to skip
-                                                     ;; over an attribute, but
-                                                     ;; in practice more
-                                                     ;; verbatim end tags will
-                                                     ;; not have attributes.
-                                                     (scan-attr)
-                                                     (scan-to-end))
-                                                    (else (scan-to-end))))
-                                            (set! nexttok
-                                                  (lambda ()
-                                                    (set! nexttok
-                                                          normal-nexttok)
-                                                    (make-end-token
-                                                     elem-name #f '()))))
-                                          ;; This isn't the terminator tag, so
-                                          ;; add to the verbatim string the
-                                          ;; "</" and the characters of what we
-                                          ;; were scanning as a qname, and
-                                          ;; recurse in the loop.
-                                          (begin
-                                            (display "</" os)
-                                            (if ns
-                                                (begin (display ns os)
-                                                       (display ":" os))
-                                                #f)
-                                            (if local
-                                                (display local os)
-                                                #f)
-                                            (loop)))))
-                                   (else
-                                    ;; Got "</" and non-alpha, so unread new
-                                    ;; character, add the "</" to verbatim
-                                    ;; string, then loop.
-                                    (unread-c)
-                                    (display "</" os)
-                                    (loop))))
-                                 (else
-                                  ;; Got "<" and non-slash, so unread the new
-                                  ;; character, write the "<" to the verbatim
-                                  ;; string, then loop.
-                                  (unread-c)
-                                  (write-char #\< os)
-                                  (loop))))
-                          (else
-                           ;; Got non-"<" in verbatim context, so just add it
-                           ;; to the buffer, then, if it's not a linefeed, fall
-                           ;; out of the loop so that the token can be
-                           ;; returned.
-                           (write-char c os)
-                           (or (c-lf?) (loop)))))
-                  ;; Return the accumulated line string, if non-null, or call
-                  ;; nexttok.
-                  (or (gosc/string-or-false os) (nexttok))))))
-
-           (nexttok #f))
-
-        (set! nexttok normal-nexttok)
-        (lambda () (nexttok))))))
-
-(define (%html-parsing:tokenize-html in normalized?)
-  (let ((next-tok (%html-parsing:make-html-tokenizer in normalized?)))
-    (let loop ((tok (next-tok)))
-      (if (null? tok)
-          '()
-          (cons tok (loop (next-tok)))))))
-
-(define (%html-parsing:xexp-token-kind token)
-  (cond ((string? token) %html-parsing:text-string-token-symbol)
-        ((char?   token) %html-parsing:text-char-token-symbol)
-        ((list?   token)
-         (let ((s (car token)))
-           (if (memq s `(*COMMENT*
-                         *DECL*
-                         *PI*
-                         ,%html-parsing:empty-token-symbol
-                         ,%html-parsing:end-token-symbol
-                         ,%html-parsing:entity-token-symbol))
-               s
-               %html-parsing:start-token-symbol)))
-        (else (error '%html-parsing:xexp-token-kind
-                     "unrecognized token kind: ~S"
-                     token))))
-
-(doc (section "Interface"))
-
-;; @defvar %html-parsing:empty-elements
-;;
-;; List of names of HTML element types that have no content, represented as a
-;; list of symbols.  This is used internally by the parser and encoder.  The
-;; effect of mutating this list is undefined.
-
-;; TODO: Document exactly which elements these are, after we make the new
-;; parameterized parser constructor.
-
-(define %html-parsing:empty-elements
-  (cons '& %html-parsing:always-empty-html-elements))
-
-;; @defproc parse-html/tokenizer tokenizer normalized?
-;;
-;; Emits a parse tree like @code{html->xexp} and related procedures, except
-;; using @var{tokenizer} as a source of tokens, rather than tokenizing from an
-;; input port.  This procedure is used internally, and generally should not be
-;; called directly.
-
-(define %html-parsing:parse-html/tokenizer
-  ;; Note: This algorithm was originally written in 2001 (as part of the first
-  ;; Scheme library the author ever wrote), and then on 2009-08-16 was revamped
-  ;; to not use mutable pairs, for PLT 4 compatibility.  It could still use
-  ;; some work to be more FP, but it works for now.
-  (letrec ((empty-elements
-            ;; TODO: Maybe make this an option.
-            %html-parsing:empty-elements)
-           (h-elem-parents
-            ;; Am doing this kludge mainly for mid-1990s HTML that uses the `p`
-            ;; element wrong.  Trying to get all appropriate parents other than
-            ;; `p` that I can, to reduce breaking other code.
-            '(a article aside blink blockquote body center footer form header html li main nav section slot template))
-           (parent-constraints
-            ;; TODO: Maybe make this an option.
-            `((area     . (map span))
-              (body     . (html))
-              (caption  . (table))
-              (colgroup . (table))
-              (dd       . (dl))
-              (dt       . (dl))
-              (frame    . (frameset))
-              (head     . (html))
-              (h1       . ,h-elem-parents)
-              (h2       . ,h-elem-parents)
-              (h3       . ,h-elem-parents)
-              (h4       . ,h-elem-parents)
-              (h5       . ,h-elem-parents)
-              (h6       . ,h-elem-parents)
-              (isindex  . (head))
-              (li       . (dir menu ol ul))
-              (meta     . (head))
-              (noframes . (frameset))
-              (option   . (select))
-              (p        . (blockquote body details figcaption html li td th))
-              (param    . (applet))
-              (tbody    . (table))
-              (td       . (tr))
-              (th       . (tr))
-              (thead    . (table))
-              (title    . (head))
-              (tr       . (table tbody thead))))
-           (token-kinds-that-always-get-added
-            `(*COMMENT*
-              *DECL*
-              *PI*
-              ,%html-parsing:entity-token-symbol
-              ,%html-parsing:text-string-token-symbol
-              ,%html-parsing:text-char-token-symbol))
-           (start-tag-name (lambda (tag-token) (car tag-token)))
-           (end-tag-name   (lambda (tag-token) (list-ref tag-token 1))))
-    (lambda (tokenizer normalized?)
-      ;;(log-html-parsing-debug "(%html-parsing:parse-html/tokenizer ~S ~S)" tokenizer normalized?)
-      (let ((begs (list (vector #f '()))))
-        (letrec ((add-thing-as-child-of-current-beg
-                  (lambda (tok)
-                    (let ((beg (car begs)))
-                      (vector-set! beg 1 (cons tok (vector-ref beg 1))))))
-
-                 (beg->elem
-                  (lambda (beg)
-                    (let ((elem-name          (vector-ref beg 0))
-                          (attrs-and-contents (reverse (vector-ref beg 1))))
-                      (cons elem-name attrs-and-contents))))
-
-                 (finish-current-beg-and-return-elem
-                  (lambda ()
-                    (let ((elem (beg->elem (car begs))))
-                      (set! begs (cdr begs))
-                      (or (null? begs)
-                          (add-thing-as-child-of-current-beg elem))
-                      elem)))
-
-                 (finish-current-beg
-                  (lambda ()
-                    (finish-current-beg-and-return-elem)))
-
-                 (finish-all-begs-and-return-top
-                  (lambda ()
-                    (let loop ()
-                      (let ((elem (finish-current-beg-and-return-elem)))
-                        (if (car elem)
-                            (loop)
-                            (cdr elem))))))
-
-                 (finish-begs-up-to-and-including-name
-                  (lambda (name)
-                    ;; (log-html-parsing-debug "(finish-begs-up-to-and-including-name ~S)" name)
-                    (let loop-find-name ((find-begs begs)
-                                         (depth     1))
-                      (let ((beg-name (vector-ref (car find-begs) 0)))
-                        (cond ((not beg-name)
-                               ;; We reached the root without finding a
-                               ;; matching beg, so don't finish anything.
-                               ;;
-                               ;; TODO: 2022-04-02: Consider having a `*TOP*`
-                               ;; kludge in `parent-constraints` that's checked
-                               ;; here, especially for handling mid-1990s HTML
-                               ;; `p` element (so that we can keep `p` from
-                               ;; being a child of `p` even when there's no
-                               ;; parent `body` or `html` element).
-                               (void))
-                              ((eqv? name beg-name)
-                               ;; We found a match, so finish the begs up to
-                               ;; depth.
-                               (let loop-finish ((depth depth))
-                                 (or (zero? depth)
-                                     (begin
-                                       (finish-current-beg)
-                                       (loop-finish (- depth 1))))))
-                              (else
-                               ;; Didn't find a match yet, and there's still at
-                               ;; least one more beg to look at, so recur.
-                               (loop-find-name (cdr find-begs)
-                                               (+ depth 1))))))))
-
-                 (finish-begs-upto-but-not-including-names
-                  (lambda (names)
-                    ;; (log-html-parsing-debug "(finish-begs-upto-but-not-including-names ~S)" names)
-                    ;; (log-html-parsing-debug "begs = ~S" begs)
-                    (let loop-find-name ((find-begs begs)
-                                         (depth     0))
-                      (let ((beg-name (vector-ref (car find-begs) 0)))
-                        (cond ((not beg-name)
-                               ;; We reached the root without finding a
-                               ;; matching beg, so simply discard it.
-                               (void))
-                              ((memq beg-name names)
-                               ;; We found a match, so finish the begs up to
-                               ;; depth.
-                               (let loop-finish ((depth depth))
-                                 (or (zero? depth)
-                                     (begin
-                                       (finish-current-beg)
-                                       (loop-finish (- depth 1))))))
-                              (else
-                               ;; Didn't find a match yet, and there's still at
-                               ;; least one more beg to look at, so recur.
-                               (loop-find-name (cdr find-begs)
-                                               (+ depth 1)))))))))
-
-          (let loop ()
-            (let ((tok (tokenizer)))
-              (if (null? tok)
-                  (finish-all-begs-and-return-top)
-                  (let ((kind (%html-parsing:xexp-token-kind tok)))
-                    ;; (log-html-parsing-debug "kind = ~S" kind)
-                    (cond ((memv kind token-kinds-that-always-get-added)
-                           (add-thing-as-child-of-current-beg tok))
-                          ((eqv? kind %html-parsing:start-token-symbol)
-                           ;; (log-html-parsing-debug "is-start-token-symbol")
-                           (let* ((name (start-tag-name tok))
-                                  (cell (assq name parent-constraints)))
-                             ;; (log-html-parsing-debug "name = ~S cell = ~S" name cell)
-                             (and cell
-                                  (finish-begs-upto-but-not-including-names
-                                   (cons 'div (cdr cell))))
-                             (if (memq name empty-elements)
-                                 (add-thing-as-child-of-current-beg tok)
-                                 (set! begs (cons (vector (car tok)
-                                                          (cdr tok))
-                                                  begs)))))
-                          ((eqv? kind %html-parsing:empty-token-symbol)
-                           ;; Empty tag token, so just add it to current
-                           ;; beginning while stripping off leading `*EMPTY*'
-                           ;; symbol so that the token becomes normal SXML
-                           ;; element syntax.
-                           (add-thing-as-child-of-current-beg (cdr tok)))
-                          ((eqv? kind %html-parsing:end-token-symbol)
-                           (let ((name (end-tag-name tok)))
-                             (if name
-                                 ;; Try to finish to a start tag matching this
-                                 ;; end tag.  If none, just drop the token,
-                                 ;; though we used to add it to the current
-                                 ;; beginning.
-                                 (finish-begs-up-to-and-including-name
-                                  name)
-                                 ;; We have an anonymous end tag, so match it
-                                 ;; with the most recent beginning.  If no
-                                 ;; beginning to match, then just drop the
-                                 ;; token, though we used to add it to the
-                                 ;; current beginning.
-                                 (and (vector-ref (car begs) 0)
-                                      (finish-current-beg)))))
-                          (else (error 'parse-html/tokenizer
-                                       "unknown tag kind: ~S"
-                                       kind)))
-                    (loop))))))))))
-
-;; TODO: Quote of message to a user:
-;;
-;; >I think this behavior is due to HtmlPrag's use in "parse-html/tokenizer"
-;; >of its local "parent-constraints" variable.
-;; >
-;; >The following line of code from the variable binding expresses the
-;; >constraint that any "p" element can have as immediate parent element
-;; >only "body", "td", or "th":
-;; >
-;; >              (p        . (body td th))
-;; >
-;; >I think I know a good heuristic for dealing with unfamiliar but
-;; >seemingly well-formed elements, like "page" in this case, but I'm afraid
-;; >I don't have time to implement it right now.  (I am job-hunting right
-;; >now, and there are many other coding things I need to do first.)
-;; >
-;; >Would adding "page" to the above line of the HtmlPrag source code work
-;; >around the current problem, or do you need a better solution right now?
-
-;; @defproc %parse-html input normalized? top?
-;;
-;; This procedure is now used internally by @code{html->xexp} and its
-;; variants, and should not be used directly by programs.  The interface is
-;; likely to change in future versions of HtmlPrag.
-
-(define (%html-parsing:parse-html input normalized? top?)
-  (let ((parse
-         (lambda ()
-           (%html-parsing:parse-html/tokenizer
-            (%html-parsing:make-html-tokenizer
-             (cond ((input-port? input) input)
-                   ((string?     input) (open-input-string input))
-                   (else (error
-                          '%html-parsing:parse-html
-                          "invalid input type: ~E"
-                          input)))
-             normalized?)
-            normalized?))))
-    (if top?
-        (cons '*TOP* (parse))
-        (parse))))
-
-;; @defproc  html->sxml-0nf input
-;; @defprocx html->sxml-1nf input
-;; @defprocx html->sxml-2nf input
-;; @defprocx html->sxml     input
-(doc (defproc (html->xexp (input (or/c input-port? string?)))
-         xexp
-
-       (para "Parse HTML permissively from "
-             (racket input)
-             ", which is either an input port or a string, and emit an
-SXML/xexp equivalent or approximation.  To borrow and slightly modify an
-example from Kiselyov's discussion of his HTML parser:")
-
-       (racketinput
-        (html->xexp
-         (string-append
-          "<html><head><title></title><title>whatever</title></head>"
-          "<body> <a href=\"url\">link</a><p align=center>"
-          "<ul compact style=\"aa\"> <p>BLah<!-- comment <comment> -->"
-          " <i> italic <b> bold <tt> ened</i> still &lt; bold </b>"
-          "</body><P> But not done yet...")))
-       (racketresultblock
-        (*TOP* (html (head (title) (title "whatever"))
-                     (body "\n"
-                           (a (@ (href "url")) "link")
-                           (p (@ (align "center"))
-                              (ul (@ (compact) (style "aa")) "\n"))
-                           (p "BLah"
-                              (*COMMENT* " comment <comment> ")
-                              " "
-                              (i " italic " (b " bold " (tt " ened")))
-                              "\n"
-                              "still < bold "))
-                     (p " But not done yet..."))))
-
-       (para "Note that, in the emitted SXML/xexp, the text token "
-             (racket "still < bold")
-             " is "
-             (italic "not")
-             " inside the "
-             (racketfont "b")
-             " element.  This is one old Web browser quirk-handling of invalid
-HTML that this parser does not try to emulate.")))
-;; (: html->xexp ((U String InputPort) -> Xexp))
-(provide html->xexp)
-(define (html->xexp input)
-  (%html-parsing:parse-html input #f #t))
-
-;; (define-logger html-parsing)
-
-(module+ test
-
-  (test (html->xexp "<a>>") '(*TOP* (a ">")))
-  (test (html->xexp "<a<>") '(*TOP* (a "<" ">")))
-
-  (test (html->xexp "<>")      '(*TOP* "<" ">"))
-  (test (html->xexp "< >")
-        ;; `(*TOP* "<" ">")
-        '(*TOP* "<" " " ">"))
-  (test (html->xexp "< a>")
-        ;; `(*TOP* (a))
-        '(*TOP*  "<" " a" ">"))
-  (test (html->xexp "< a / >")
-        ;; `(*TOP* (a))
-        '(*TOP* "<" " a / " ">"))
-
-  (test (html->xexp "<a<")  '(*TOP* (a "<")))
-  (test (html->xexp "<a<b") '(*TOP* (a (b))))
-
-  (test (html->xexp "><a>") '(*TOP* ">" (a)))
-
-  (test (html->xexp "</>") '(*TOP*))
-
-  (test (html->xexp "<\">") '(*TOP* "<" "\"" ">"))
-
-  (test (html->xexp (string-append "<a>xxx<plaintext>aaa" "\n"
-                                   "bbb" "\n"
-                                   "c<c<c"))
-        `(*TOP*
-          (a "xxx" (plaintext ,(string-append "aaa" "\n")
-                              ,(string-append "bbb" "\n")
-                              "c<c<c"))))
-
-  (test (html->xexp "aaa<!-- xxx -->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* " xxx ")   "bbb"))
-
-  (test (html->xexp "aaa<! -- xxx -->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* " xxx ")   "bbb"))
-
-  (test (html->xexp "aaa<!-- xxx --->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* " xxx -")  "bbb"))
-
-  (test (html->xexp "aaa<!-- xxx ---->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* " xxx --") "bbb"))
-
-  (test (html->xexp "aaa<!-- xxx -y-->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* " xxx -y") "bbb"))
-
-  (test (html->xexp "aaa<!----->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* "-")       "bbb"))
-
-  (test (html->xexp "aaa<!---->bbb")
-        `(*TOP*
-          "aaa" (*COMMENT* "")        "bbb"))
-
-  (test (html->xexp "aaa<!--->bbb")
-        `(*TOP* "aaa" (*COMMENT* "->bbb")))
-
-  (test (html->xexp "<hr>")   `(*TOP* (hr)))
-  (test (html->xexp "<hr/>")  `(*TOP* (hr)))
-  (test (html->xexp "<hr />") `(*TOP* (hr)))
-
-  (test (html->xexp "<hr noshade>")
-        `(*TOP* (hr (@ (noshade)))))
-  (test (html->xexp "<hr noshade/>")
-        `(*TOP* (hr (@ (noshade)))))
-  (test (html->xexp "<hr noshade />")
-        `(*TOP* (hr (@ (noshade)))))
-  (test (html->xexp "<hr noshade / >")
-        `(*TOP* (hr (@ (noshade)))))
-  (test (html->xexp "<hr noshade=1 />")
-        `(*TOP* (hr (@ (noshade "1")))))
-  (test (html->xexp "<hr noshade=1/>")
-        `(*TOP* (hr (@ (noshade "1/")))))
-
-  (test (html->xexp "<q>aaa<p/>bbb</q>ccc</p>ddd")
-        `(*TOP* (q "aaa" (p) "bbb") "ccc" "ddd"))
-
-  (test (html->xexp "&lt;") `(*TOP* "<"))
-  (test (html->xexp "&gt;") `(*TOP* ">"))
-
-  (test (html->xexp "Gilbert &amp; Sullivan")
-        `(*TOP* "Gilbert & Sullivan"))
-  (test (html->xexp "Gilbert &amp Sullivan")
-        `(*TOP* "Gilbert & Sullivan"))
-  (test (html->xexp "Gilbert & Sullivan")
-        `(*TOP* "Gilbert & Sullivan"))
-
-  (test (html->xexp "Copyright &copy; Foo")
-        `(*TOP* "Copyright "
-                (& copy)
-                " Foo"))
-  (test (html->xexp "aaa&copy;bbb")
-        `(*TOP*
-          "aaa" (& copy) "bbb"))
-  
-  (test 'unterminated-nonspecial-character-entity-reference-at-eof
-        (html->xexp "aaa&copy")
-        ;; Note: 20180518 Previously, we parsed this as (*TOP* "aaa" (& copy))
-        `(*TOP* "aaa&copy"))
-
-  (test (html->xexp "&#42;")  '(*TOP* "*"))
-  (test (html->xexp "&#42")   '(*TOP* "*"))
-  (test (html->xexp "&#42x")  '(*TOP* "*x"))
-  (test (html->xexp "&#151")  `(*TOP* ,(string (integer->char 151))))
-  (test (html->xexp "&#1000") `(*TOP* ,(string (integer->char 1000))))
-  (test (html->xexp "&#x42")  '(*TOP* "B"))
-  (test (html->xexp "&#xA2")  `(*TOP* ,(string (integer->char 162))))
-  (test (html->xexp "&#xFF")  `(*TOP* ,(string (integer->char 255))))
-  (test (html->xexp "&#x100") `(*TOP* ,(string (integer->char 256))))
-  (test (html->xexp "&#X42")  '(*TOP* "B"))
-  (test (html->xexp "&42;")   '(*TOP* "&42;"))
-
-  (test (html->xexp (string-append "aaa&copy;bbb&amp;ccc&lt;ddd&&gt;"
-                                   "eee&#42;fff&#1000;ggg&#x5a;hhh"))
-        `(*TOP*
-          "aaa"
-          (& copy)
-          ,(string-append "bbb&ccc<ddd&>eee*fff"
-                          (string (integer->char 1000))
-                          "gggZhhh")))
-
-  (test (html->xexp
-         (string-append
-          "<IMG src=\"http://e.e/aw/pics/listings/"
-          "ebayLogo_38x16.gif\" border=0 width=\"38\" height=\"16\" "
-          "HSPACE=5 VSPACE=0\">2</FONT>"))
-        `(*TOP*
-          (img (@
-                (src
-                 "http://e.e/aw/pics/listings/ebayLogo_38x16.gif")
-                (border "0") (width "38") (height "16")
-                (hspace "5") (vspace "0")))
-          "2"))
-
-  (test (html->xexp "<aaa bbb=ccc\"ddd>eee")
-        `(*TOP* (aaa (@ (bbb "ccc") (ddd)) "eee")))
-  (test (html->xexp "<aaa bbb=ccc \"ddd>eee")
-        `(*TOP* (aaa (@ (bbb "ccc") (ddd)) "eee")))
-
-  (test (html->xexp
-         (string-append
-          "<HTML><Head><Title>My Title</Title></Head>"
-          "<Body BGColor=\"white\" Foo=42>"
-          "This is a <B><I>bold-italic</B></I> test of </Erk>"
-          "broken HTML.<br>Yes it is.</Body></HTML>"))
-        `(*TOP*
-          (html (head (title "My Title"))
-                (body (@ (bgcolor "white") (foo "42"))
-                      "This is a "
-                      (b (i "bold-italic"))
-                      " test of "
-                      "broken HTML."
-                      (br)
-                      "Yes it is."))))
-
-  (test (html->xexp
-         (string-append
-          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
-          " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"))
-        `(*TOP*
-          (*DECL*
-           DOCTYPE
-           html
-           PUBLIC
-           "-//W3C//DTD XHTML 1.0 Strict//EN"
-           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")))
-
-  (test (html->xexp
-         (string-append
-          "<html xmlns=\"http://www.w3.org/1999/xhtml\" "
-          "xml:lang=\"en\" "
-          "lang=\"en\">"))
-        `(*TOP*
-          (html (@ (xmlns "http://www.w3.org/1999/xhtml")
-                   (xml:lang "en") (lang "en")))))
-
-  (test (html->xexp
-         (string-append
-          "<html:html xmlns:html=\"http://www.w3.org/TR/REC-html40\">"
-          "<html:head><html:title>Frobnostication</html:title></html:head>"
-          "<html:body><html:p>Moved to <html:a href=\"http://frob.com\">"
-          "here.</html:a></html:p></html:body></html:html>"))
-        `(*TOP*
-          (html (@ (xmlns:html "http://www.w3.org/TR/REC-html40"))
-                (head (title "Frobnostication"))
-                (body (p "Moved to "
-                         (a (@ (href "http://frob.com"))
-                            "here."))))))
-
-  (test (html->xexp
-         (string-append
-          "<RESERVATION xmlns:HTML=\"http://www.w3.org/TR/REC-html40\">"
-          "<NAME HTML:CLASS=\"largeSansSerif\">Layman, A</NAME>"
-          "<SEAT CLASS=\"Y\" HTML:CLASS=\"largeMonotype\">33B</SEAT>"
-          "<HTML:A HREF=\"/cgi-bin/ResStatus\">Check Status</HTML:A>"
-          "<DEPARTURE>1997-05-24T07:55:00+1</DEPARTURE></RESERVATION>"))
-        `(*TOP*
-          (reservation (@ (,(string->symbol "xmlns:HTML")
-                           "http://www.w3.org/TR/REC-html40"))
-                       (name (@ (class "largeSansSerif"))
-                             "Layman, A")
-                       (seat (@ (class "Y") (class "largeMonotype"))
-                             "33B")
-                       (a (@ (href "/cgi-bin/ResStatus"))
-                          "Check Status")
-                       (departure "1997-05-24T07:55:00+1"))))
-
-  (test (html->xexp
-         (string-append
-          "<html><head><title></title><title>whatever</title></head><body>"
-          "<a href=\"url\">link</a><p align=center><ul compact style=\"aa\">"
-          "<p>BLah<!-- comment <comment> --> <i> italic <b> bold <tt> ened </i>"
-          " still &lt; bold </b></body><P> But not done yet..."))
-        `(*TOP*
-          (html (head (title) (title "whatever"))
-                (body (a (@ (href "url")) "link")
-                      (p (@ (align "center"))
-                         (ul (@ (compact) (style "aa"))))
-                      (p "BLah"
-                         (*COMMENT* " comment <comment> ")
-                         " "
-                         (i " italic " (b " bold " (tt " ened ")))
-                         " still < bold "))
-                (p " But not done yet..."))))
-
-  (test (html->xexp "<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
-        `(*TOP*
-          (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")))
-
-  (test (html->xexp "<?php php_info(); ?>")
-        `(*TOP* (*PI* php "php_info(); ")))
-  (test (html->xexp "<?php php_info(); ?")
-        `(*TOP* (*PI* php "php_info(); ?")))
-  (test (html->xexp "<?php php_info(); ")
-        `(*TOP* (*PI* php "php_info(); ")))
-
-  (test (html->xexp "<?foo bar ? baz > blort ?>")
-        `(*TOP*
-          (*PI* foo "bar ? baz > blort ")))
-
-  (test (html->xexp "<?foo b?>x")
-        `(*TOP* (*PI* foo "b") "x"))
-  (test (html->xexp "<?foo ?>x")
-        `(*TOP* (*PI* foo "")  "x"))
-  (test (html->xexp "<?foo ?>x")
-        `(*TOP* (*PI* foo "")  "x"))
-  (test (html->xexp "<?foo?>x")
-        `(*TOP* (*PI* foo "")  "x"))
-  (test (html->xexp "<?f?>x")
-        `(*TOP* (*PI* f   "")  "x"))
-  (test (html->xexp "<??>x")
-        `(*TOP* (*PI* #f  "")  "x"))
-  (test (html->xexp "<?>x")
-        `(*TOP* (*PI* #f  ">x")))
-
-  (test (html->xexp "<foo bar=\"baz\">blort")
-        `(*TOP* (foo (@ (bar "baz")) "blort")))
-  (test (html->xexp "<foo bar='baz'>blort")
-        `(*TOP* (foo (@ (bar "baz")) "blort")))
-  (test (html->xexp "<foo bar=\"baz'>blort")
-        `(*TOP* (foo (@ (bar "baz'>blort")))))
-  (test (html->xexp "<foo bar='baz\">blort")
-        `(*TOP* (foo (@ (bar "baz\">blort")))))
-
-  (test (html->xexp (string-append "<p>A</p>"
-                                   "<script>line0 <" "\n"
-                                   "line1" "\n"
-                                   "<line2></script>"
-                                   "<p>B</p>"))
-        `(*TOP* (p "A")
-                (script ,(string-append "line0 <" "\n")
-                        ,(string-append "line1"   "\n")
-                        "<line2>")
-                (p "B")))
-
-  (test (html->xexp "<xmp>a<b>c</XMP>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-  (test (html->xexp "<XMP>a<b>c</xmp>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-  (test (html->xexp "<xmp>a<b>c</foo:xmp>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-  (test (html->xexp "<foo:xmp>a<b>c</xmp>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-  (test (html->xexp "<foo:xmp>a<b>c</foo:xmp>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-  (test (html->xexp "<foo:xmp>a<b>c</bar:xmp>d")
-        `(*TOP* (xmp "a<b>c") "d"))
-
-  (test (html->xexp "<xmp>a</b>c</xmp>d")
-        `(*TOP* (xmp "a</b>c")     "d"))
-  (test (html->xexp "<xmp>a</b >c</xmp>d")
-        `(*TOP* (xmp "a</b >c")    "d"))
-  (test (html->xexp "<xmp>a</ b>c</xmp>d")
-        `(*TOP* (xmp "a</ b>c")    "d"))
-  (test (html->xexp "<xmp>a</ b >c</xmp>d")
-        `(*TOP* (xmp "a</ b >c")   "d"))
-  (test (html->xexp "<xmp>a</b:x>c</xmp>d")
-        `(*TOP* (xmp "a</b:x>c")   "d"))
-  (test (html->xexp "<xmp>a</b::x>c</xmp>d")
-        `(*TOP* (xmp "a</b::x>c")  "d"))
-  (test (html->xexp "<xmp>a</b:::x>c</xmp>d")
-        `(*TOP* (xmp "a</b:::x>c") "d"))
-  (test (html->xexp "<xmp>a</b:>c</xmp>d")
-        `(*TOP* (xmp "a</b:>c")    "d"))
-  (test (html->xexp "<xmp>a</b::>c</xmp>d")
-        `(*TOP* (xmp "a</b::>c")   "d"))
-  (test (html->xexp "<xmp>a</xmp:b>c</xmp>d")
-        `(*TOP* (xmp "a</xmp:b>c") "d"))
-
-  (let ((expected `(*TOP* (p "real1")
-                          "\n"
-                          (xmp "\n"
-                               ,(string-append "alpha"       "\n")
-                               ,(string-append "<P>fake</P>" "\n")
-                               ,(string-append "bravo"       "\n"))
-                          (p "real2"))))
-
-    (test (html->xexp (string-append "<P>real1</P>" "\n"
-                                     "<XMP>"        "\n"
-                                     "alpha"        "\n"
-                                     "<P>fake</P>"  "\n"
-                                     "bravo"        "\n"
-                                     "</XMP "       "\n"
-                                     "<P>real2</P>"))
-          expected)
-
-    (test (html->xexp (string-append "<P>real1</P>" "\n"
-                                     "<XMP>"        "\n"
-                                     "alpha"        "\n"
-                                     "<P>fake</P>"  "\n"
-                                     "bravo"        "\n"
-                                     "</XMP"        "\n"
-                                     "<P>real2</P>"))
-          expected))
-
-  (test (html->xexp "<xmp>a</xmp>x")
-        `(*TOP* (xmp "a")   "x"))
-  (test (html->xexp (string-append "<xmp>a" "\n" "</xmp>x"))
-        `(*TOP* (xmp ,(string-append "a" "\n")) "x"))
-  (test (html->xexp "<xmp></xmp>x")
-        `(*TOP* (xmp)       "x"))
-
-  (test (html->xexp "<xmp>a</xmp") `(*TOP* (xmp "a")))
-  (test (html->xexp "<xmp>a</xm")  `(*TOP* (xmp "a</xm")))
-  (test (html->xexp "<xmp>a</x")   `(*TOP* (xmp "a</x")))
-  (test (html->xexp "<xmp>a</")    `(*TOP* (xmp "a</")))
-  (test (html->xexp "<xmp>a<")     `(*TOP* (xmp "a<")))
-  (test (html->xexp "<xmp>a")      `(*TOP* (xmp "a")))
-  (test (html->xexp "<xmp>")       `(*TOP* (xmp)))
-  (test (html->xexp "<xmp")        `(*TOP* (xmp)))
-
-  (test (html->xexp "<xmp x=42 ")
-        `(*TOP* (xmp (@ (x "42")))))
-  (test (html->xexp "<xmp x= ")   `(*TOP* (xmp (@ (x)))))
-  (test (html->xexp "<xmp x ")    `(*TOP* (xmp (@ (x)))))
-  (test (html->xexp "<xmp x")     `(*TOP* (xmp (@ (x)))))
-
-  (test (html->xexp "<script>xxx")
-        `(*TOP* (script "xxx")))
-  (test (html->xexp "<script/>xxx")
-        `(*TOP* (script) "xxx"))
-
-  (test (html->xexp "<html xml:lang=\"en\" lang=\"en\">")
-        `(*TOP* (html (@ (xml:lang "en") (lang "en")))))
-
-  (test (html->xexp "<a href=/foo.html>")
-        `(*TOP* (a (@ (href "/foo.html")))))
-  (test (html->xexp "<a href=/>foo.html")
-        `(*TOP* (a (@ (href "/")) "foo.html")))
-
-  ;; TODO: Add verbatim-pair cases with attributes in the end tag.
-
-  (test (html->xexp "&copy;")
-        `(*TOP* (& copy)))
-  (test (html->xexp "&rArr;")
-        `(*TOP* (& ,(string->symbol "rArr"))))
-  (test (html->xexp "&#151;")
-        `(*TOP* ,(string (integer->char 151))))
-
-  (test (html->xexp "&#999;")
-        `(*TOP* ,(string (integer->char 999))))
-
-  (test (html->xexp "xxx<![CDATA[abc]]>yyy")
-        `(*TOP* "xxx" "abc" "yyy"))
-
-  (test (html->xexp "xxx<![CDATA[ab]c]]>yyy")
-        `(*TOP* "xxx" "ab]c" "yyy"))
-
-  (test (html->xexp "xxx<![CDATA[ab]]c]]>yyy")
-        `(*TOP* "xxx" "ab]]c" "yyy"))
-
-  (test (html->xexp "xxx<![CDATA[]]]>yyy")
-        `(*TOP* "xxx" "]" "yyy"))
-
-  (test (html->xexp "xxx<![CDATAyyy")
-        `(*TOP* "xxx" "<![CDATA" "yyy"))
-
-  (test (html->xexp "<html><div><p>P1</p><p>P2</p></div><p>P3</p>")
-        `(*TOP* (html (div (p "P1")
-                           (p "P2"))
-                      (p "P3")))
-        #:id 'parent-constraints-with-div)
-
-  (test (html->xexp "&#151;")
-        `(*TOP* ,(string (integer->char 151)))
-        #:id 'once-again-converting-character-references-above-126-to-string)
-
-  (test (html->xexp "<ul><li>a<p>b</p>")
-        `(*TOP* (ul (li "a" (p "b"))))
-        #:id 'p-element-can-be-child-of-li-element)
-
-  (test-section 'unterminated-named-character-entity-references
-
-    (test-section 'old-school-names
-      (test 'amp  (html->xexp "<p>a&ampz</p>")  '(*TOP* (p "a&z")))
-      (test 'apos (html->xexp "<p>a&aposz</p>") '(*TOP* (p "a'z")))
-      (test 'lt   (html->xexp "<p>a&ltz</p>")   '(*TOP* (p "a<z")))
-      (test 'gt   (html->xexp "<p>a&gtz</p>")   '(*TOP* (p "a>z")))
-      (test 'quot (html->xexp "<p>a&quotz</p>") '(*TOP* (p "a\"z"))))
-
-    (test-section 'new-school-names
-      (test 'rarr (html->xexp "<p>a&rarrz</p>") '(*TOP* (p "a&rarrz"))))
-
-    (test-section 'unrecognized-names
-      (test 'a-t-and-t
-            (html->xexp "<p>AT&T Bell Labs</p>")
-            '(*TOP* (p "AT&T Bell Labs")))))
-  
-  (test-section 'terminated-old-school-named-character-entity-references
-    (test 'amp  (html->xexp "<p>a&amp;z</p>")  '(*TOP* (p "a&z")))
-    (test 'apos (html->xexp "<p>a&apos;z</p>") '(*TOP* (p "a'z")))
-    (test 'lt   (html->xexp "<p>a&lt;z</p>")   '(*TOP* (p "a<z")))
-    (test 'gt   (html->xexp "<p>a&gt;z</p>")   '(*TOP* (p "a>z")))
-    (test 'quot (html->xexp "<p>a&quot;z</p>") '(*TOP* (p "a\"z"))))
-
-  (test-section 'parent-constraints-should-permit-p-inside-blockquote
-    (test 'basic
-          (html->xexp "<x>A<blockquote><p>B</p>C<p>D</p>E</blockquote>F</x>")
-          `(*TOP* (x "A"
-                     (blockquote (p "B")
-                                 "C"
-                                 (p "D")
-                                 "E")
-                     "F")))
-    (test 'initial-sorawee-porncharoenwase-example
-          (html->xexp 
-           "<blockquote><tr><td><blockquote><p></p></blockquote></td><div></div></tr></blockquote>")
-          '(*TOP* (blockquote (tr (td (blockquote (p)))
-                                  (div))))))
-
-  (test-section 'p-elem-can-be-child-of-details-elem
-
-    (test 'initial-jacder-example-modified
-          (html->xexp "<div><details><p>text in details</p></details></div>")
-          '(*TOP* (div (details (p "text in details"))))))
-
-  ;; TODO: 2022-01-22 Go through latest HTML elements and add them to parent constraints
-  ;; in the ancient quirks handling from over 20 years ago.
-
-  (test-section 'p-elem-cannot-be-child-of-p-elem
-
-    (test 'initial-simpson-example
-          (html->xexp "<html><p>foo<p>bar</html>")
-          '(*TOP* (html (p "foo") (p "bar"))))
-
-    (test 'non-p-parent-in-which-p-shouldnt-nest
-          (html->xexp "<html><xyz>foo<p>bar</html>")
-          '(*TOP* (html (xyz "foo") (p "bar"))))
-
-    (test 'p-shouldnt-nest-even-without-html-element
-          (html->xexp "<p>foo<p>bar")
-          '(*TOP* (p "foo") (p "bar"))
-          #:fail "see code comment about parent-constraints when no top elements"))
-
-  (test-section 'break-the-world-with-h-elem-mid-90s-handling
-
-    (test 'initial
-          (html->xexp "<html><p>foo<h3>bar</h3></html>")
-          '(*TOP* (html (p "foo") (h3 "bar")))))
-
-  (test-section 'twrpme-h2-in-li-elements
-
-    (test 'simple
-          (html->xexp "<html><body><ul><li><h2>My Header Item</h2></li><li>My Non-Header Item</li></ul></body></html>")
-          '(*TOP* (html (body (ul (li (h2 "My Header Item"))
-                                  (li "My Non-Header Item"))))))
-
-    (test 'simon-budinsky-example
-          (html->xexp
-           (string-append
-            "<html>"
-            "<head></head>"
-            "<body>"
-            "<ul class=\"post-list\">"
-            "<li>"
-            "<span class=\"post-meta\">Mar 10, 2022</span>"
-            "<h2>"
-            "<a class=\"post-link\" href=\"/site/update/2022/03/10/twrp-3.6.1-released.html\">TWRP 3.6.1 Released</a>"
-            "</h2>"
-            "</li>"
-            "<li>"
-            "<span class=\"post-meta\">Mar 10, 2022</span>"
-            "<h2>"
-            "<a class=\"post-link\" href=\"/site/update/2022/03/10/twrp-3.6.1-released.html\">TWRP 3.6.1 Released</a>"
-            "</h2>"
-            "</li>"
-            "</ul>"
-            "</body>"
-            "</html>"))
-          '(*TOP* (html (head)
-                        (body (ul (@ (class "post-list"))
-                                  (li (span (@ (class "post-meta"))
-                                            "Mar 10, 2022")
-                                      (h2 (a (@ (class "post-link")
-                                                (href "/site/update/2022/03/10/twrp-3.6.1-released.html"))
-                                             "TWRP 3.6.1 Released")))
-                                  
-                                  (li (span (@ (class "post-meta"))
-                                            "Mar 10, 2022")
-                                      (h2 (a (@ (class "post-link")
-                                                (href "/site/update/2022/03/10/twrp-3.6.1-released.html"))
-                                             "TWRP 3.6.1 Released")))))))))
-
-  (test-section 'area-in-span-in-microformats
-
-    (test 'area-from-jacob-hall
-          (html->xexp "<div><span><area></area></span></div>")
-          '(*TOP* (div (span (area)))))
-
-    (test 'object-from-jacob-hall
-          (html->xexp "<div><object>Jane Doe</object></div>")
-          '(*TOP* (div (object "Jane Doe")))))
-
-  (test-section 'bugs-from-cadence
-
-    (test 'figcaption-as-parent-of-p
-          (html->xexp "<figcaption> <p class=\"caption\">words</p><img src=\"nowhere\"></figcaption>")
-          '(*TOP* (figcaption " "
-                              (p (@ (class "caption")) "words")
-                              (img (@ (src "nowhere"))))))
-
-    (test 'attribute-html-entities-1
-          (html->xexp "<img src=\"https://example.com/images?src=Blah.jpg&amp;width=150\">")
-          '(*TOP* (img (@ (src "https://example.com/images?src=Blah.jpg&width=150")))))
-
-    (test 'attribute-html-entities-2
-          (html->xexp "<a href=\"https://example.com/phpbb/viewtopic.php?f=31&amp;t=1125\">https://example.com/phpbb/viewtopic.php?f=31&amp;t=1125</a>")
-          '(*TOP* (a (@ (href "https://example.com/phpbb/viewtopic.php?f=31&t=1125"))
-                     "https://example.com/phpbb/viewtopic.php?f=31&t=1125"))))
-
-  ;; TODO: Document this.
-  ;;
-  ;; (define html-1 "<myelem myattr=\"&\">")
-  ;; (define shtml   (html->xexp html-1))
-  ;; shtml
-  ;; (define html-2 (shtml->html shtml))
-  ;; html-2
-  )
-
-(doc history
-
-     (#:planet 12:0 #:date "2023-01-28"
-               (itemlist
-                (item "Within attributes, HTML entities like &amp; are now decoded.")
-                (item "A "
-                      (code "p")
-                      " element can now appear as a child of a "
-                      (code "figcaption")
-                      " element.")))
-
-     (#:planet 11:0 #:date "2022-07-19"
-               (itemlist
-                (item "An "
-                      (code "object")
-                      " element is no longer considered always-empty.  Incrementing major
-version again, because this could break parses.")))
-     
-     (#:planet 10:0 #:date "2022-07-19"
-               (itemlist
-                (item "To pass a \"microformats\" test suite ("
-                      (hyperlink "https://github.com/microformats/tests/blob/master/tests/microformats-v2/h-card/impliedname.html#L11"
-                                 "impliedname.html")
-                      "), an "
-                      (code "area")
-                      " element can now be a child of a "
-                      (code "span")
-                      " element.  In the future, we might be even more flexible about where "
-                      (code "span")
-                      " elements are permitted.  (Thanks to Jacob Hall for
-discussing.)")))
-     
-     (#:planet 9:0 #:date "2022-04-16"
-               (itemlist
-                (item "Header elements may once again appear as children of "
-                      (code "li")
-                      " elements (which we broke in the previous version), as we see how far we can stretch a 20 year-old hack for invalid HTML.  (Thanks for Simon Budinsky for reporting.)")))
-
-     (#:planet 8:0 #:date "2022-04-03"
-               (itemlist
-                (item "The original \"H\" elements ("
-                      (code "h1")
-                      ", "
-                      (code "h2")
-                      ", etc.) now are parsed with \"parent constraints\" for
-handling invalid HTML, to accommodate a need to parse mid-1990s HTML in which "
-                      (code "<P>")
-                      " was used as a separator or terminator, rather than a
-start delimeter.  There is a chance that change this will break a real-world
-scraper or other tool.")))
-                
-     (#:planet 7:1 #:date "2022-04-02"
-               (itemlist
-                (item "Include a test case #:fail that was unsaved in DrRacket.")))
-     
-     (#:planet 7:0 #:date "2022-04-02"
-               (itemlist
-                
-                (item "Fixed a quirks-handling bug in which "
-                      (code "p")
-                      " elements would be (directly or indirectly) nested under other "
-                      (code "p")
-                      " elements in cases in which there was no "
-                      (code "body")
-                      " element, but there was an "
-                      (code "html")
-                      " element.  (Thanks to Jonathan Simpson for reporting.)")))
-     
-     (#:planet 6:1 #:date "2022-01-22"
-               (itemlist
-                (item "Permit "
-                      (code "details")
-                      " element to be parent of "
-                      (code "p")
-                      " element in quirks handling. (Thanks to Jacder for reporting.)")))
-     
-     (#:planet 6:0 #:date "2018-05-22"
-               (itemlist
-                (item "Fix to permit "
-                      (code "p")
-                      " elements as children of "
-                      (code "blockquote")
-                      " elements.  Incrementing major version number because
-this is a breaking change of 17 years, but seems an appropriate change for
-modern HTML, and fixes a particular real-world problem.  (Thanks to
-Sorawee Porncharoenwase for reporting.)")))
-     
-     (#:planet 5:0 #:date "2018-05-15"
-               (itemlist
-                (item "In a breaking change of handing invalid HTML, most named
-character entity references that are invalid because (possibly among multiple
-reasons) they are not terminated by semicolon, now are treated as literal
-strings (including the ampersand), rather than as named character entites.  For
-example, parser input string "
-                      (racket "<p>A&B Co.<p>")
-                      " will now parse as "
-                      (racket (p "A&B Co."))
-                      " rather than as "
-                      (racket (p "A" (& B) " Co."))
-                      ".  (Thanks for Greg Hendershott for suggesting this, and discussing.)")
-                (item "For support of historical quirks handling, five early
-HTML named character entities (specifically, "
-                      (tt "amp")
-                      ", "
-                      (tt "apos")
-                      ", "
-                      (tt "lt")
-                      ", "
-                      (tt "gt")
-                      ", "
-                      (tt "quot")
-                      ") do not need to be terminated with a semicolon, and
-will even be recognized if followed immediately by an alphabetic.  For
-example, "
-                      (racket "<p>a&ltz</p>")
-                      " will now parse as "
-                      (racket (p "a<z"))
-                      ", rather than as "
-                      (racket (p (& ltz)))
-                      ".")
-                (item "Invalid character entity references that are terminated
-by EOF rather than semicolon may now be parsed as literal strings, rather than
-as entity references.")))
-               
-     (#:planet 4:3 #:date "2016-12-15"
-               (itemlist
-                (item "Error message ``"
-                      (code "%html-parsing:parse-html: invalid input type:")
-                      "'' now abbreviates the invalid value, to avoid possibly
-huge messages.  (Thanks to John B. Clements.)")))
-
-     (#:planet 4:2 #:date "2016-03-02"
-               (itemlist
-                (item "Tweaked info.rkt, filenames.")))
-     
-     (#:planet 4:1 #:date "2016-02-25"
-               (itemlist
-                (item "Updated deps.")
-                (item "Documentation tweaks.")))
-
-     (#:planet 4:0 #:date "2016-02-21"
-               (itemlist
-                (item "Moving from PLaneT to new package system.")
-                (item "Moved unit tests into main source file.")))
-
-     (#:planet 3:0 #:date "2015-04-24"
-               (itemlist
-                (item "Numeric character entities now parse to Racket strings
-instead of Racket characters, to bring SXML/xexp back closer to SXML.  (Thanks
-to John Clements for reporting.)")))
-
-     (#:planet 2:0 #:date "2012-06-13"
-               (itemlist
-                (item "Converted to McFly.")))
-
-     (#:version "0.3" #:planet 1:2 #:date "2011-08-27"
-                (itemlist
-                 (item "Converted test suite from Testeez to Overeasy.")))
-
-     (#:version "0.2" #:planet 1:1 #:date "2011-08-27"
-                (itemlist
-                 (item "Fixed embarrassing bug due to code tidying.  (Thanks to
-Danny Yoo for reporting.)")))
-
-     (#:version "0.1" #:planet 1:0 #:date "2011-08-21"
-                (itemlist
-                 (item "Part of forked development from HtmlPrag, parser
-originally written 2001-04."))))
diff --git a/lib/mime-types.rkt b/lib/mime-types.rkt
deleted file mode 100644
index 906219a..0000000
--- a/lib/mime-types.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/path
-         racket/runtime-path
-         racket/string)
-
-(provide
- (contract-out
-  [ext->mime-type (-> bytes? bytes?)]
-  [mime-type->ext (-> bytes? bytes?)]))
-
-(define-runtime-path mime.types-path "mime.types")
-
-(define ls
-  (call-with-input-file mime.types-path
-    (λ (in) (for/list ([line (in-lines in)]
-                       #:when (not (regexp-match? #rx"^ *($|#)" line)))
-              (match line
-                [(regexp #rx"^([^ ]+) +(.+)$" (list _ mime ext))
-                 (cons (string->bytes/utf-8 ext) (string->bytes/utf-8 mime))]
-                [(regexp #rx"^ *#") (void)]
-                [_ (log-warning "mime-types: failed to parse line ~s" line)])))))
-
-(define forward-hash (make-immutable-hash ls))
-(define reverse-hash (make-immutable-hash (map (λ (x) (cons (cdr x) (car x))) ls)))
-
-(define (ext->mime-type ext-in)
-  (define ext (regexp-replace #rx"^\\." ext-in #""))
-  (hash-ref forward-hash ext))
-
-(define (mime-type->ext m-in)
-  (define m (regexp-replace #rx";.*" m-in #""))
-  (hash-ref reverse-hash m))
diff --git a/lib/mime.types b/lib/mime.types
deleted file mode 100644
index c06a1e9..0000000
--- a/lib/mime.types
+++ /dev/null
@@ -1,88 +0,0 @@
-text/html                             html
-text/css                              css
-application/xml                       xml
-text/xml                              xml
-image/gif                             gif
-image/jpeg                            jpeg
-application/javascript                js
-text/javascript                       js
-application/atom+xml                  atom
-application/rss+xml                   rss
-
-text/mathml                           mml
-text/plain                            txt
-text/x-component                      htc
-
-image/png                             png
-image/tiff                            tiff
-image/vnd.wap.wbmp                    wbmp
-image/x-icon                          ico
-image/vnd.microsoft.icon              ico
-image/x-jng                           jng
-image/x-ms-bmp                        bmp
-image/svg+xml                         svg
-image/webp                            webp
-
-application/font-woff2                woff2
-application/acad                      woff2
-font/woff2                            woff2
-application/font-woff                 woff
-font/woff                             woff
-application/x-font-ttf                ttf
-application/x-font-truetype           ttf
-application/x-truetype-font           ttf
-application/font-sfnt                 ttf
-font/sfnt                             ttf
-application/vnd.oasis.opendocument.formula-template otf
-application/x-font-opentype           otf
-application/vnd.ms-opentype           otf
-font/otf                              otf
-application/java-archive              jar
-application/json                      json
-application/mac-binhex40              hqx
-application/msword                    doc
-application/pdf                       pdf
-application/postscript                ps
-application/rtf                       rtf
-application/vnd.apple.mpegurl         m3u8
-application/vnd.ms-excel              xls
-application/vnd.ms-fontobject         eot
-application/vnd.ms-powerpoint         ppt
-application/vnd.wap.wmlc              wmlc
-application/vnd.google-earth.kml+xml  kml
-application/vnd.google-earth.kmz      kmz
-application/x-7z-compressed           7z
-application/x-cocoa                   cco
-application/x-java-archive-diff       jardiff
-application/x-java-jnlp-file          jnlp
-application/x-makeself                run
-application/x-perl                    pl
-application/x-rar-compressed          rar
-application/x-redhat-package-manager  rpm
-application/x-sea                     sea
-application/x-shockwave-flash         swf
-application/x-stuffit                 sit
-application/x-tcl                     tcl
-application/x-x509-ca-cert            pem
-application/x-xpinstall               xpi
-application/xhtml+xml                 xhtml
-application/xspf+xml                  xspf
-application/zip                       zip
-application/gzip                      gz
-
-audio/midi                            mid midi kar
-audio/mpeg                            mp3
-audio/ogg                             ogg
-audio/x-m4a                           m4a
-audio/x-realaudio                     ra
-
-video/mp2t                            ts
-video/mp4                             mp4
-video/mpeg                            mpeg
-video/quicktime                       mov
-video/webm                            webm
-video/x-flv                           flv
-video/x-m4v                           m4v
-video/x-mng                           mng
-video/x-ms-wmv                        wmv
-video/x-msvideo                       avi
diff --git a/lib/syntax.rkt b/lib/syntax.rkt
deleted file mode 100644
index 650e2f5..0000000
--- a/lib/syntax.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base syntax/location))
-
-(provide
- ; help make a nested if. if/in will gain the same false form of its containing if/out.
- if/out
- ; cond, but values can be defined between conditions
- cond/var
- ; wrap sql statements into lambdas so they can be executed during migration
- wrap-sql
- ; get the name of the file that contains the currently evaluating form
- this-directory
- this-file
- ; replacement for define-runtime-path
- anytime-path)
-
-(module+ test
-  (require rackunit)
-  (define (check-syntax-equal? s1 s2)
-    (check-equal? (syntax->datum s1)
-                  (syntax->datum s2))))
-
-;; actual transforming goes on in here.
-;; it's in a submodule so that it can be required in both levels, for testing
-
-(module transform racket/base
-  (require racket/list)
-
-  (provide
-   transform-if/out
-   transform/out-cond/var)
-
-  (define (transform-if/out stx)
-    (define tree (cdr (syntax->datum stx))) ; condition true false
-    (define else (cddr tree)) ; the else branch cons cell
-    (define result
-      (let walk ([node tree])
-        (cond
-          ; normally, node should be a full cons cell (a pair) but it might be something else.
-          ; situation: reached the end of a list, empty cons cell
-          [(null? node) node]
-          ; situation: reached the end of a list, cons cdr was non-list
-          [(symbol? node) node]
-          ; normal situation, full cons cell
-          ; -- don't go replacing through nested if/out
-          [(and (pair? node) (eq? 'if/out (car node))) node]
-          ; -- replace if/in
-          [(and (pair? node) (eq? 'if/in (car node)))
-           (append '(if) (walk (cdr node)) else)]
-          ; recurse down pair head and tail
-          [(pair? node) (cons (walk (car node)) (walk (cdr node)))]
-          ; something else that can't be recursed into, so pass it through
-          [#t node])))
-    (datum->syntax stx (cons 'if result)))
-
-  (define (transform/out-cond/var stx)
-    (define tree (transform-cond/var (cdr (syntax->datum stx))))
-    (datum->syntax
-     stx
-     tree))
-
-  (define (transform-cond/var tree)
-    (define-values (els temp) (splitf-at tree (λ (el) (and (pair? el) (not (eq? (car el) 'var))))))
-    (define-values (vars rest) (splitf-at temp (λ (el) (and (pair? el) (eq? (car el) 'var)))))
-    (if (null? rest)
-        `(cond ,@els)
-        `(cond
-           ,@els
-           [#t
-            (let* ,(for/list ([var vars])
-                     (cdr var))
-              ,(transform-cond/var rest))]))))
-
-;; the syntax definitions and their tests go below here
-
-(require 'transform (for-syntax 'transform))
-
-(define-syntax (wrap-sql stx)
-  ; the arguments
-  (define xs (cdr (syntax->list stx)))
-  ; wrap each argument
-  (define wrapped (map (λ (xe) ; xe is the syntax of an argument
-                         (if (list? (car (syntax->datum xe)))
-                             ; it's a list of lists (a list of sql migration steps)
-                             ; return instead syntax of a lambda that will call everything in xe
-                             (datum->syntax stx `(λ () ,@xe))
-                             ; it's just a single sql migration step
-                             ; return instead syntax of a lambda that will call xe
-                             (datum->syntax stx `(λ () ,xe))))
-                       xs))
-  ; since I'm returning *code*, I need to return the form (list ...) so that runtime makes a list
-  (datum->syntax stx `(list ,@wrapped)))
-
-(define-syntax (if/out stx)
-  (transform-if/out stx))
-(module+ test
-  (check-syntax-equal? (transform-if/out #'(if/out (condition 1) (if/in (condition 2) (do-yes)) (do-no)))
-                       #'(if (condition 1) (if (condition 2) (do-yes) (do-no)) (do-no)))
-  (check-equal? (if/out #t (if/in #t 'yes) 'no) 'yes)
-  (check-equal? (if/out #f (if/in #t 'yes) 'no) 'no)
-  (check-equal? (if/out #t (if/in #f 'yes) 'no) 'no)
-  (check-equal? (if/out #f (if/in #f 'yes) 'no) 'no))
-
-(define-syntax (this-directory stx)
-  (datum->syntax stx (syntax-source-directory stx)))
-
-(define-syntax (this-file stx)
-  (datum->syntax stx (build-path (or (syntax-source-directory stx) 'same) (syntax-source-file-name stx))))
-
-(module+ test
-  (require racket/path)
-  (check-equal? (file-name-from-path (this-file)) (build-path "syntax.rkt")))
-
-(define-syntax (cond/var stx)
-  (transform/out-cond/var stx))
-(module+ test
-  (check-syntax-equal? (transform/out-cond/var #'(cond/def [#f 0] (var d (* a 2)) [(eq? d 8) d] [#t "not 4"]))
-                       #'(cond
-                           [#f 0]
-                           [#t
-                            (let* ([d (* a 2)])
-                              (cond
-                                [(eq? d 8) d]
-                                [#t "not 4"]))])))
-
-;;; Replacement for define-runtime-path that usually works well and doesn't include the files/folder contents into the distribution.
-;;; When running from source, should always work appropriately.
-;;; When running from a distribution, (current-directory) is treated as the root.
-;;; Usage:
-;;;   * to-root : Path-String * relative path from the source file to the project root
-;;;   * to-dest : Path-String * relative path from the root to the desired file/folder
-(define-syntax (anytime-path stx)
-  (define-values (_ to-root to-dest) (apply values (syntax->list stx)))
-  (define source (syntax-source stx))
-  (unless (complete-path? source)
-    (error 'anytime-path "syntax source has no directory: ~v" stx))
-  (datum->syntax
-   stx
-   `(let* ([source ,source]
-           [dir-of-source (path-only source)]
-           [_ (unless (path? dir-of-source) (error 'anytime-path "syntax source has no directory: ~v" ,source))]
-           [syntax-to-root (build-path dir-of-source ,to-root)]
-           [root (if (directory-exists? syntax-to-root)
-                     ;; running on the same filesystem it was compiled on, i.e. it's running the source code out of a directory, and the complication is the intermediate compilation
-                     syntax-to-root
-                     ;; not running on the same filesystem, i.e. it's a distribution. we assume that the current working directory is where the executable is, and treat this as the root.
-                     (current-directory))])
-      (simple-form-path (build-path root ,to-dest)))))
diff --git a/lib/thread-utils.rkt b/lib/thread-utils.rkt
deleted file mode 100644
index f907dac..0000000
--- a/lib/thread-utils.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-(require (prefix-in easy: net/http-easy)
-         "../src/data.rkt"
-         "xexpr-utils.rkt")
-
-(provide
- thread-values)
-
-(module+ test
-  (require rackunit))
-
-(define (thread-values . thunks)
-  (parameterize-break #t
-    (define the-exn (box #f))
-    (define original-thread (current-thread))
-    (define (break e)
-      (when (box-cas! the-exn #f e)
-        (break-thread original-thread))
-      (sleep 0))
-    (define-values (threads channels)
-      (for/fold ([ts null]
-                 [chs null]
-                 #:result (values (reverse ts) (reverse chs)))
-                ([th thunks])
-        (define ch (make-channel))
-        (define t
-          (thread (λ ()
-                    (with-handlers ([exn? break])
-                      (channel-put ch (th))))))
-        (values (cons t ts) (cons ch chs))))
-    (apply
-     values
-     (with-handlers ([exn:break? (λ (_)
-                                   (for ([t threads]) (kill-thread t))
-                                   (if (unbox the-exn)
-                                       (raise (unbox the-exn))
-                                       (error 'thread-values "a thread broke, but without reporting its exception")))])
-       (for/list ([ch channels])
-         (channel-get ch))))))
-
-(module+ test
-  ; check that they actually execute concurrently
-  (define ch (make-channel))
-  (check-equal? (let-values ([(a b)
-                              (thread-values
-                               (λ ()
-                                 (begin
-                                   (channel-put ch 'a)
-                                   (channel-get ch)))
-                               (λ ()
-                                 (begin0
-                                     (channel-get ch)
-                                   (channel-put ch 'b))))])
-                  (list a b))
-                '(b a))
-  ; check that it assigns the correct value to the correct variable
-  (check-equal? (let-values ([(a b)
-                              (thread-values
-                               (λ () (sleep 0) 'a)
-                               (λ () 'b))])
-                  (list a b))
-                '(a b))
-  ; check that exceptions are passed to the original thread, and other threads are killed
-  ;; TODO: if the other thread was making an HTTP request, could it be left stuck open by the kill?
-  (check-equal? (let* ([x "!"]
-                       [res
-                        (with-handlers ([exn:fail:user? (λ (e) (exn-message e))])
-                          (thread-values
-                           (λ () (sleep 0) (set! x "?") (println "this side effect should not happen"))
-                           (λ () (raise-user-error "catch me"))))])
-                  (string-append res x))
-                "catch me!"))
diff --git a/lib/tree-updater.rkt b/lib/tree-updater.rkt
deleted file mode 100644
index 074c5a1..0000000
--- a/lib/tree-updater.rkt
+++ /dev/null
@@ -1,305 +0,0 @@
-#lang racket/base
-(require racket/dict
-         racket/function
-         racket/match
-         racket/string
-         "pure-utils.rkt"
-         "url-utils.rkt"
-         "xexpr-utils.rkt")
-
-(provide
- preprocess-html-wiki
- update-tree-wiki)
-
-(define (preprocess-html-wiki html)
-  (define ((rr* find replace) contents)
-    (regexp-replace* find contents replace))
-  ((compose1
-    ; fix navbox list nesting
-    ; navbox on right of page has incorrect html "<td ...><li>" and the xexpr parser puts the <li> much further up the tree
-    ; add a <ul> to make the parser happy
-    ; usage: /fallout/wiki/Fallout:_New_Vegas_achievements_and_trophies
-    (rr* #rx"(<td[^>]*>\n?)(<li>)" "\\1<ul>\\2")
-    ; change <figcaption><p> to <figcaption><span> to make the parser happy
-    (rr* #rx"(<figcaption[^>]*>)[ \t]*<p class=\"caption\">([^<]*)</p>" "\\1<span class=\"caption\">\\2</span>"))
-   html))
-(module+ test
-  (check-equal? (preprocess-html-wiki "<td class=\"va-navbox-column\" style=\"width: 33%\">\n<li>Hey</li>")
-                "<td class=\"va-navbox-column\" style=\"width: 33%\">\n<ul><li>Hey</li>")
-  (check-equal? (preprocess-html-wiki "<figure class=\"thumb tright\" style=\"width: 150px\"><a class=\"image\"><img></a><noscript><a><img></a></noscript><figcaption class=\"thumbcaption\"> 	<p class=\"caption\">Caption text.</p></figcaption></figure>")
-                "<figure class=\"thumb tright\" style=\"width: 150px\"><a class=\"image\"><img></a><noscript><a><img></a></noscript><figcaption class=\"thumbcaption\"><span class=\"caption\">Caption text.</span></figcaption></figure>"))
-
-(module+ test
-  (require rackunit
-           "html-parsing/main.rkt")
-  (define wiki-document
-    '(*TOP*
-      (div (@ (class "mw-parser-output"))
-           (aside (@ (role "region") (class "portable-infobox pi-theme-wikia pi-layout-default"))
-                  (h2 (@ (class "pi-item pi-title") (data-source "title"))
-                      "Infobox Title")
-                  (figure (@ (class "pi-item pi-image") (data-source "image"))
-                          (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image image-thumbnail") (title ""))
-                             (img (@ (src "https://static.wikia.nocookie.net/nice-image-thumbnail.png") (class "pi-image-thumbnail")))))
-                  (div (@ (class "pi-item pi-data") (data-source "description"))
-                       (h3 (@ (class "pi-data-label"))
-                           "Description")
-                       (div (@ (class "pi-data-value"))
-                            "Mystery infobox!")))
-           (div (@ (data-test-collapsesection) (class "collapsible collapsetoggle-inline collapsed"))
-                (i (b "This section is hidden for dramatic effect."))
-                (div (@ (class "collapsible-content"))
-                     (p "Another page link: "
-                        (a (@ (data-test-wikilink) (href "https://test.fandom.com/wiki/Another_Page") (title "Another Page"))
-                           "Another Page"))))
-           (figure (@ (class "thumb tnone"))
-                   (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image") (data-test-figure-a))
-                      (img (@ (src "data:image/gif;base64,R0lGODlhAQABAIABAAAAAP///yH5BAEAAAEALAAAAAABAAEAQAICTAEAOw%3D%3D")
-                              (data-src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
-                              (class "thumbimage lazyload"))))
-                   (noscript
-                    (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image"))
-                       (img (@ (src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
-                               (data-src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
-                               (class "thumbimage")))))
-                   (figcaption "Test figure!"))
-           (iframe (@ (src "https://example.com/iframe-src")))))))
-
-(define (updater wikiname #:strict-proxy? [strict-proxy? #f])
-  (define classlist-updater
-    (compose1
-     ; uncollapse all navbox items (bottom of page mass navigation)
-     (curry u
-            (λ (classlist) (and ; removed due to scoping, would improve peformance (eq? element-type 'table)
-                            (member "navbox" classlist)
-                            (member "collapsed" classlist)))
-            (λ (classlist) (filter (curry (negate equal?) "collapsed") classlist)))
-     ; uncollapse portable-infobox sections
-     (curry u
-            (λ (classlist) (and ; removed due to scoping, would improve performance (eq? element-type 'section)
-                            (member "pi-collapse" classlist)))
-            (λ (classlist) (filter (λ (v)
-                                     (and (not (equal? v "pi-collapse-closed"))
-                                          (not (equal? v "pi-collapse"))))
-                                   classlist)))
-     ; generic: includes article sections and tables, probably more
-     (curry u
-            (λ (classlist) (and (member "collapsible" classlist)
-                                (member "collapsed" classlist)))
-            (λ (classlist) (filter (curry (negate equal?) "collapsed") classlist)))))
-
-  (define ((string-replace-curried from to) str)
-    (string-replace str from to))
-
-  (define class-updater
-    (compose1
-     (string-replace-curried " collapsed" "")
-     (string-replace-curried "pi-collapse-closed" "")
-     (string-replace-curried "pi-collapse" "")))
-
-  (define (cardimage-class-updater c)
-    (string-append c " bw-updated-cardtable-cardimage"))
-
-  (define attributes-updater
-    (compose1
-     ; uncollapsing
-     #;(curry attribute-maybe-update 'class
-              (λ (class) (string-join (classlist-updater (string-split class " ")) " ")))
-     (curry attribute-maybe-update 'class class-updater)
-     ; change links to stay on the same wiki
-     (curry attribute-maybe-update 'href
-            (λ (href)
-              ((compose1
-                (λ (href) (regexp-replace #rx"^(/wiki/.*)" href (format "/~a\\1" wikiname)))
-                (λ (href) (regexp-replace (pregexp (format "^https://(~a)\\.fandom\\.com(/wiki/.*)" px-wikiname)) href "/\\1\\2")))
-               href)))
-     ; add noreferrer to a.image
-     (curry u
-            (λ (v) (and #;(eq? element-type 'a)
-                        (has-class? "image" v)))
-            (λ (v) (dict-update v 'rel (λ (s)
-                                         (list (string-append (car s) " noreferrer")))
-                                '(""))))
-     ; proxy images from inline styles, if strict_proxy is set
-     (curry u
-            (λ (v) strict-proxy?)
-            (λ (v) (attribute-maybe-update
-                    'style
-                    (λ (style)
-                      (regexp-replace #rx"url\\(['\"]?(.*?)['\"]?\\)" style
-                                      (λ (whole url)
-                                        (string-append
-                                         "url("
-                                         (u-proxy-url url)
-                                         ")")))) v)))
-     ; and also their links, if strict_proxy is set
-     (curry u
-            (λ (v)
-              (and strict-proxy?
-                   #;(eq? element-type 'a)
-                   (or (has-class? "image-thumbnail" v)
-                       (has-class? "image" v))))
-            (λ (v) (attribute-maybe-update 'href u-proxy-url v)))
-     ; proxy images from src attributes, if strict_proxy is set
-     (curry u
-            (λ (v) strict-proxy?)
-            (λ (v) (attribute-maybe-update 'src u-proxy-url v)))
-     ; don't lazyload images
-     (curry u
-            (λ (v) (dict-has-key? v 'data-src))
-            (λ (v) (attribute-maybe-update 'src (λ (_) (car (dict-ref v 'data-src))) v)))
-     ; don't use srcset - TODO: use srcset?
-     (λ (v) (dict-remove v 'srcset))))
-
-  (define (children-updater attributes children)
-    ; more uncollapsing - sample: bandori/wiki/BanG_Dream!_Wikia
-    ((λ (children)
-       (u
-        (λ (v) (has-class? "mw-collapsible-content" attributes))
-        (λ (v) (for/list ([element v])
-                 (u (λ (element) (pair? element))
-                    (λ (element)
-                      `(,(car element)
-                        (@ ,@(attribute-maybe-update 'style (λ (a) (regexp-replace #rx"display: *none" a "display:inline")) (bits->attributes element)))
-                        ,@(filter element-is-content? (cdr element))))
-                    element)))
-        children))
-     ; wrap blinking animated images in a slot so they can be animated with CSS
-     ((λ (children)
-        (u
-         (λ (v) (and (has-class? "animated" attributes)
-                     ((length v) . > . 1)))
-         (λ (v)
-           `((span (@ (class "animated-slot__outer") (style ,(format "--steps: ~a" (length v))))
-                   (span (@ (class "animated-slot__inner"))
-                         ,@v))))
-         children))
-      children)))
-
-  (define (updater element element-type attributes children)
-    ;; replace whole element?
-    (cond
-      ; wrap tables in a div.table-scroller
-      [(and (eq? element-type 'table)
-            (has-class? "wikitable" attributes)
-            (not (dict-has-key? attributes 'data-scrolling)))
-       `(div
-         ((class "table-scroller"))
-         ((,element-type (@ (data-scrolling) ,@attributes)
-                         ,@children)))]
-      ; HACK for /yugioh/wiki/Pot_of_Greed: move card images above tables
-      [(and (eq? element-type 'table)
-            (has-class? "cardtable" attributes)
-            (not (has-class? "bw-updated-cardtable-cardimage" attributes)))
-       (define (is-cardimage? t a c) (and (eq? t 'td)
-                                          (has-class? "cardtable-cardimage" a)))
-       (define cardimage ((query-selector is-cardimage? element)))
-       (if (not cardimage)
-           (list element-type attributes children)
-           (let ([new-cardtable (update-tree
-                                 (λ (e t a c)
-                                   (if (is-cardimage? t a c)
-                                       return-no-element
-                                       (list t a c)))
-                                 `(,element-type
-                                   (@ ,(attribute-maybe-update 'class cardimage-class-updater attributes))
-                                   ,@children))])
-             (list 'div null (list cardimage new-cardtable))))]
-      ; exclude empty figcaptions
-      [(and (eq? element-type 'figcaption)
-            (or (eq? (length (filter element-is-element? children)) 0)
-                ((query-selector (λ (element-type attributes children)
-                                   (eq? element-type 'use))
-                                 element))))
-       return-no-element]
-      ; exclude infobox items that are videos, and gallery items that are videos
-      [(and (or (has-class? "pi-item" attributes)
-                (has-class? "wikia-gallery-item" attributes))
-            ((query-selector (λ (element-type attributes children)
-                               (has-class? "video-thumbnail" attributes))
-                             element)))
-       return-no-element]
-      ; exclude the invisible brackets after headings
-      [(and (eq? element-type 'span)
-            (has-class? "mw-editsection" attributes))
-       return-no-element]
-      ; display a link instead of an iframe
-      [(eq? element-type 'iframe)
-       (define src (car (dict-ref attributes 'src null)))
-       `(a
-         ((class "iframe-alternative") (href ,src))
-         (,(format "Embedded media: ~a" src)))]
-      ; remove noscript versions of images because they are likely lower quality than the script versions
-      [(and (eq? element-type 'noscript)
-            (match children
-              ; either the noscript has a.image as a first child...
-              [(list (list 'a (list '@ a-att ...) _)) (has-class? "image" a-att)]
-              ; or the noscript has img as a first child
-              [(list (list 'img _)) #t]
-              [_ #f]))
-       return-no-element]
-      [#t
-       (list element-type
-             ;; attributes
-             (attributes-updater #; element-type attributes)
-             ;; children
-             (children-updater attributes children))]))
-
-  updater)
-
-(define (update-tree-wiki tree wikiname #:strict-proxy? [strict-proxy? #f])
-  (update-tree (updater wikiname #:strict-proxy? strict-proxy?) tree))
-
-(module+ test
-  (define transformed
-    (update-tree-wiki wiki-document "test" #:strict-proxy? #t))
-  ; check that wikilinks are changed to be local
-  (check-equal? (get-attribute 'href (bits->attributes
-                                      ((query-selector
-                                        (λ (t a c) (dict-has-key? a 'data-test-wikilink))
-                                        transformed))))
-                "/test/wiki/Another_Page")
-  ; check that a.image has noreferrer
-  (check-equal? (get-attribute 'rel (bits->attributes
-                                     ((query-selector
-                                       (λ (t a c) (and (eq? t 'a)
-                                                       (has-class? "image" a)))
-                                       transformed))))
-                " noreferrer")
-  ; check that article collapse sections become uncollapsed
-  (check-equal? (get-attribute 'class (bits->attributes
-                                       ((query-selector
-                                         (λ (t a c) (dict-has-key? a 'data-test-collapsesection))
-                                         transformed))))
-                "collapsible collapsetoggle-inline")
-  ; check that iframes are gone
-  (check-false ((query-selector (λ (t a c) (eq? t 'iframe)) transformed)))
-  (check-equal? (let* ([alternative ((query-selector (λ (t a c) (has-class? "iframe-alternative" a)) transformed))]
-                       [link ((query-selector (λ (t a c) (eq? t 'a)) alternative))])
-                  (get-attribute 'href (bits->attributes link)))
-                "https://example.com/iframe-src")
-  ; check that images are proxied
-  (check-equal? (get-attribute 'src (bits->attributes
-                                     ((query-selector
-                                       (λ (t a c) (eq? t 'img))
-                                       transformed))))
-                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image-thumbnail.png")
-  ; check that links to images are proxied
-  (check-equal? (get-attribute 'href (bits->attributes
-                                      ((query-selector
-                                        (λ (t a c) (and (eq? t 'a) (has-class? "image-thumbnail" a)))
-                                        transformed))))
-                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png")
-  (check-equal? (get-attribute 'href (bits->attributes
-                                      ((query-selector
-                                        (λ (t a c) (member '(data-test-figure-a) a))
-                                        transformed))))
-                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png")
-  ; check that noscript images are removed
-  (check-equal? ((query-selector (λ (t a c) (eq? t 'noscript)) transformed)) #f)
-  ; benchmark
-  (when (file-exists? "../storage/Frog.html")
-    (with-input-from-file "../storage/Frog.html"
-      (λ ()
-        (define tree (html->xexp (current-input-port)))
-        (time (length (update-tree-wiki tree "minecraft")))))))
diff --git a/misc/download-wiki-names.rkt b/misc/download-wiki-names.rkt
index 14e281f..96a8f9a 100644
--- a/misc/download-wiki-names.rkt
+++ b/misc/download-wiki-names.rkt
@@ -4,7 +4,7 @@
          racket/string
          json
          net/http-easy
-         "../lib/html-parsing/main.rkt"
+         html-parsing
          "../src/xexpr-utils.rkt"
          "../src/url-utils.rkt")
 
diff --git a/req.rktd b/req.rktd
deleted file mode 100644
index e2d2fc2..0000000
--- a/req.rktd
+++ /dev/null
@@ -1 +0,0 @@
-((local (".")))
diff --git a/src/application-globals.rkt b/src/application-globals.rkt
index b6777ef..a0ff8af 100644
--- a/src/application-globals.rkt
+++ b/src/application-globals.rkt
@@ -1,23 +1,17 @@
 #lang racket/base
-(require racket/file
-         racket/list
-         racket/runtime-path
+(require racket/list
          racket/string
          json
          (prefix-in easy: net/http-easy)
-         html-parsing
          html-writing
          web-server/http
-         web-server/http/bindings
          "config.rkt"
          "data.rkt"
-         "extwiki-data.rkt"
-         "extwiki-generic.rkt"
+         "niwa-data.rkt"
          "static-data.rkt"
-         "../lib/syntax.rkt"
-         "../lib/pure-utils.rkt"
-         "../lib/xexpr-utils.rkt"
-         "../lib/url-utils.rkt")
+         "pure-utils.rkt"
+         "xexpr-utils.rkt"
+         "url-utils.rkt")
 
 (provide
  ; headers to always send on all http responses
@@ -33,20 +27,13 @@
 
 (module+ test
   (require rackunit
-           html-writing
-           "test-utils.rkt"))
+           html-writing))
 
 (define always-headers
   (list (header #"Referrer-Policy" #"same-origin") ; header to not send referers to fandom
         (header #"Link" (string->bytes/latin-1 link-header))))
 (define timeouts (easy:make-timeout-config #:lease 5 #:connect 5))
 
-(define-runtime-path path-static "../static")
-(define theme-icons
-  (for/hasheq ([theme '(default light dark)])
-    (values theme
-            (html->xexp (file->string (build-path path-static (format "icon-theme-~a.svg" theme)) #:mode 'binary)))))
-
 (define (application-footer source-url #:license [license-in #f])
   (define license (or license-in license-default))
   `(footer (@ (class "custom-footer"))
@@ -61,7 +48,7 @@
                          "Documentation and more information"))
                      (p
                       (a (@ (href "https://lists.sr.ht/~cadence/breezewiki-discuss"))
-                         "Chat / Bug reports / Feature requests"))
+                         "Discussions / Bug reports / Feature requests"))
                      ,(if (config-true? 'instance_is_official)
                           `(p ,(format "This instance is run by the ~a developer, " (config-get 'application_name))
                               (a (@ (href "https://cadence.moe/contact"))
@@ -70,110 +57,66 @@
                             ,(format "This unofficial instance is based off the ~a source code, but is not controlled by the code developer." (config-get 'application_name)))))
                 ,(if source-url
                      `(div (p "This page displays proxied content from "
-                              (a (@ (href ,source-url) (rel "nofollow noreferrer")) ,source-url)
+                              (a (@ (href ,source-url) (rel "noreferrer")) ,source-url)
                               ,(format ". Text content is available under the ~a license, " (license^-text license))
-                              (a (@ (href ,(license^-url license)) (rel "nofollow")) "see license info.")
+                              (a (@ (href ,(license^-url license))) "see license info.")
                               " Media files may have different copying restrictions.")
                            (p ,(format "Fandom is a trademark of Fandom, Inc. ~a is not affiliated with Fandom." (config-get 'application_name))))
                      `(div (p "Text content on wikis run by Fandom is available under the Creative Commons Attribution-Share Alike License 3.0 (Unported), "
-                              (a (@ (href "https://www.fandom.com/licensing") (rel "nofollow")) "see license info.")
+                              (a (@ (href "https://www.fandom.com/licensing")) "see license info.")
                               " Media files and official Fandom documents have different copying restrictions.")
                            (p ,(format "Fandom is a trademark of Fandom, Inc. ~a is not affiliated with Fandom." (config-get 'application_name))))))))
 
 ;; generate a notice with a link if a fandom wiki has a replacement as part of NIWA or similar
 ;; if the wiki has no replacement, display nothing
-(define (extwiki-notice wikiname title)
-  (define xt (findf (λ (item) (member wikiname (extwiki^-wikinames item))) extwikis))
-  (cond/var
-   [xt
-    (let* ([group (hash-ref extwiki-groups (extwiki^-group xt))]
-           [search-page (format "/Special:Search?~a"
-                                (params->query `(("search" . ,title)
-                                                 ("go" . "Go"))))]
-           [go (if (string-suffix? (extwiki^-home xt) "/")
-                   (regexp-replace #rx"/$" (extwiki^-home xt) (λ (_) search-page))
-                   (let* ([joiner (second (regexp-match #rx"/(w[^./]*)/" (extwiki^-home xt)))])
-                     (regexp-replace #rx"/w[^./]*/.*$" (extwiki^-home xt) (λ (_) (format "/~a~a" joiner search-page)))))]
-           [props (extwiki-props^ go)])
-      (cond
-        [(eq? (extwiki^-banner xt) 'default)
-         `(aside (@ (class "niwa__notice"))
-                 (h1 (@ (class "niwa__header")) ,(extwiki^-name xt) " has its own website separate from Fandom.")
-                 (a (@ (class "niwa__go") (href ,go)) "Read " ,title " on " ,(extwiki^-name xt) " →")
-                 (div (@ (class "niwa__cols"))
-                      (div (@ (class "niwa__left"))
-                           (p ,((extwiki-group^-description group) props))
-                           (p ,((extwiki^-description xt) props))
-                           (p "This wiki's core community has wholly migrated away from Fandom. You should "
-                              (a (@ (href ,go)) "go to " ,(extwiki^-name xt) " now!"))
-                           (p (@ (class "niwa__feedback"))
-                              ,@(add-between
-                                 `(,@(for/list ([link (extwiki-group^-links group)])
-                                       `(a (@ (href ,(cdr link))) ,(car link)))
-                                   "This notice is from BreezeWiki"
-                                   (a (@ (href "https://docs.breezewiki.com/Reporting_Bugs.html")) "Feedback?"))
-                                 " / ")))
-                      (div (@ (class "niwa__right"))
-                           (img (@ (class "niwa__logo") (src ,(extwiki^-logo xt)))))))]
-        [(eq? (extwiki^-banner xt) 'parallel)
-         `(aside (@ (class "niwa__parallel"))
-                 (h1 (@ (class "niwa__header-mini"))
-                     "See also "
-                     (a (@ (href ,go)) ,(extwiki^-name xt)))
-                 (p "This topic has multiple communities of editors, some active on the Fandom wiki, others active on " ,(extwiki^-name xt) ".")
-                 (p "For thorough research, be sure to check both communities since they may have different information!")
-                 (p (@ (class "niwa__feedback"))
-                    ,@(add-between
-                       `(,@(for/list ([link (extwiki-group^-links group)])
-                             `(a (@ (href ,(cdr link))) ,(car link)))
-                         "This notice is from BreezeWiki"
-                         (a (@ (href "https://docs.breezewiki.com/Reporting_Bugs.html")) "Feedback?"))
-                       " / ")))]
-        [(eq? (extwiki^-banner xt) 'empty)
-         `(aside (@ (class "niwa__notice niwa__notice--alt"))
-                 (h1 (@ (class "niwa__header")) "You will be redirected to " ,(extwiki^-name xt) ".")
-                 (p (@ (style "position: relative; top: -12px;")) "This independent wiki community has its own site separate from Fandom.")
-                 (a (@ (class "niwa__go") (href ,go)) "Take me there! →")
-
-                 (p (@ (class "niwa__feedback") (style "text-align: left"))
-                    ,@(add-between
-                       `(,@(for/list ([link (extwiki-group^-links group)])
-                             `(a (@ (href ,(cdr link))) ,(car link)))
-                         "This notice is from BreezeWiki")
-                       " / ")))]))]
-   (var fetched-callback (get-redirect-content wikiname))
-   [fetched-callback
-    (fetched-callback title)]
-   [#t ""]))
+(define (niwa-notice wikiname title)
+  (define ind (findf (λ (item) (member wikiname (first item))) niwa-data))
+  (if ind
+      (let* ([search-page (format "/Special:Search?~a"
+                                  (params->query `(("search" . ,title)
+                                                   ("go" . "Go"))))]
+             [go (if (string-suffix? (third ind) "/")
+                     (regexp-replace #rx"/$" (third ind) (λ (_) search-page))
+                     (let* ([joiner (second (regexp-match #rx"/(w[^./]*)/" (third ind)))])
+                       (regexp-replace #rx"/w[^./]*/.*$" (third ind) (λ (_) (format "/~a~a" joiner search-page)))))])
+        `(aside (@ (class "niwa__notice"))
+                (h1 (@ (class "niwa__header")) ,(second ind) " has its own website separate from Fandom.")
+                (a (@ (class "niwa__go") (href ,go)) "Read " ,title " on " ,(second ind) " →")
+                (div (@ (class "niwa__cols"))
+                     (div (@ (class "niwa__left"))
+                          (p "Most major Nintendo wikis are part of the "
+                             (a (@ (href "https://www.niwanetwork.org/about/")) "Nintendo Independent Wiki Alliance")
+                             " and have their own wikis off Fandom. You can help this wiki by "
+                             (a (@ (href ,go)) "visiting it directly."))
+                          (p ,(fifth ind))
+                          (div (@ (class "niwa__divider")))
+                          (p "Why are you seeing this message? Fandom refuses to delete or archive their copy of this wiki, so that means their pages will appear high up in search results. Fandom hopes to get clicks from readers who don't know any better.")
+                          (p (@ (class "niwa__feedback")) (a (@ (href "https://www.kotaku.com.au/2022/10/massive-zelda-wiki-reclaims-independence-six-months-before-tears-of-the-kingdom/")) "More info") " / " (a (@ (href "https://docs.breezewiki.com/Reporting_Bugs.html")) "Feedback on this notice?")))
+                     (div (@ (class "niwa__right"))
+                          (img (@ (class "niwa__logo") (src ,(format "https://www.niwanetwork.org~a" (fourth ind)))))))))
+      ""))
 
 (define (generate-wiki-page
          content
-         #:req req
          #:source-url source-url
          #:wikiname wikiname
          #:title title
          #:head-data [head-data-in #f]
-         #:siteinfo [siteinfo-in #f]
-         #:user-cookies [user-cookies-in #f]
-         #:online-styles [online-styles #t])
+         #:siteinfo [siteinfo-in #f])
   (define siteinfo (or siteinfo-in siteinfo-default))
   (define head-data (or head-data-in ((head-data-getter wikiname))))
-  (define user-cookies (or user-cookies-in (user-cookies-getter req)))
-  (define origin (format "https://~a.fandom.com" wikiname))
-  (define required-styles
-    (cond
-      [online-styles
-       (define styles
-         (list
-          (format "~a/wikia.php?controller=ThemeApi&method=themeVariables&variant=~a" origin (user-cookies^-theme user-cookies))
-          (format "~a/load.php?lang=en&modules=site.styles%7Cskin.fandomdesktop.styles%7Cext.fandom.PortableInfoboxFandomDesktop.css%7Cext.fandom.GlobalComponents.CommunityHeaderBackground.css%7Cext.gadget.site-styles%2Csound-styles&only=styles&skin=fandomdesktop" origin)))
-       (if (config-true? 'strict_proxy)
-           (map u-proxy-url styles)
-           styles)]
-      [#t
-       (list
-        (format "/archive/~a/styles/themeVariables-~a.css" wikiname (user-cookies^-theme user-cookies))
-        (format "/archive/~a/styles/site.css" wikiname))]))
+  (define (required-styles origin)
+    (map (λ (dest-path)
+           (define url (format dest-path origin))
+           (if (config-true? 'strict_proxy)
+               (u-proxy-url url)
+               url))
+         '(#;"~a/load.php?lang=en&modules=skin.fandomdesktop.styles&only=styles&skin=fandomdesktop"
+           #;"~a/load.php?lang=en&modules=ext.gadget.dungeonsWiki%2CearthWiki%2Csite-styles%2Csound-styles&only=styles&skin=fandomdesktop"
+           #;"~a/load.php?lang=en&modules=site.styles&only=styles&skin=fandomdesktop"
+           ; combine the above entries into a single request for potentially extra speed - fandom.com doesn't even do this!
+           "~a/wikia.php?controller=ThemeApi&method=themeVariables"
+           "~a/load.php?lang=en&modules=skin.fandomdesktop.styles%7Cext.fandom.PortableInfoboxFandomDesktop.css%7Cext.fandom.GlobalComponents.CommunityHeaderBackground.css%7Cext.gadget.site-styles%2Csound-styles%7Csite.styles&only=styles&skin=fandomdesktop")))
   `(*TOP*
     (*DECL* DOCTYPE html)
     (html
@@ -185,7 +128,7 @@
                       (config-get 'application_name)))
       ,@(map (λ (url)
                `(link (@ (rel "stylesheet") (type "text/css") (href ,url))))
-             required-styles)
+             (required-styles (format "https://~a.fandom.com" wikiname)))
       (link (@ (rel "stylesheet") (type "text/css") (href ,(get-static-url "main.css"))))
       (script "const BWData = "
               ,(jsexpr->string (hasheq 'wikiname wikiname
@@ -193,31 +136,15 @@
       ,(if (config-true? 'feature_search_suggestions)
            `(script (@ (type "module") (src ,(get-static-url "search-suggestions.js"))))
            "")
-      (script (@ (type "module") (src ,(get-static-url "countdown.js"))))
       (link (@ (rel "icon") (href ,(u (λ (v) (config-true? 'strict_proxy))
                                       (λ (v) (u-proxy-url v))
                                       (head-data^-icon-url head-data))))))
      (body (@ (class ,(head-data^-body-class head-data)))
-           ,(let ([extension-eligible?
-                   (cond/var
-                    [(not req) #f]
-                    (var ua-pair (assq 'user-agent (request-headers req)))
-                    [(not ua-pair) #f]
-                    (var ua (string-downcase (cdr ua-pair)))
-                    ;; everyone pretends to be chrome, so we do it in reverse
-                    ;; this excludes common browsers that don't support the extension
-                    [#t (and (not (string-contains? ua "edge/"))
-                             (not (string-contains? ua "mobile")))])])
-              (if extension-eligible?
-                  `(div (@ (class "bw-top-banner"))
-                        (div (@ (class "bw-top-banner-rainbow"))
-                             "Try " (a (@ (href "https://getindie.wiki/") (target "_blank")) "our affiliated browser extension") " - redirect to BreezeWiki automatically!\n"))
-                  ""))
            (div (@ (class "main-container"))
                 (div (@ (class "fandom-community-header__background tileHorizontally header")))
                 (div (@ (class "page"))
                      (main (@ (class "page__main"))
-                           ,(extwiki-notice wikiname title)
+                           ,(niwa-notice wikiname title)
                            (div (@ (class "custom-top"))
                                 (h1 (@ (class "page-title")) ,title)
                                 (nav (@ (class "sitesearch"))
@@ -227,23 +154,7 @@
                                            (label (@ (for "bw-search-input")) "Search ")
                                            (div (@ (id "bw-pr-search-input"))
                                                 (input (@ (type "text") (name "q") (id "bw-search-input") (autocomplete "off"))))
-                                           (div (@ (class "bw-ss__container") (id "bw-pr-search-suggestions"))))
-                                     (div (@ (class "bw-theme__select"))
-                                          (span (@ (class "bw-theme__main-label")) "Page theme")
-                                          (div (@ (class "bw-theme__items"))
-                                               ,@(for/list ([theme '(default light dark)])
-                                                   (define class
-                                                     (if (equal? theme (user-cookies^-theme user-cookies))
-                                                         "bw-theme__item bw-theme__item--selected"
-                                                         "bw-theme__item"))
-                                                   `(a (@ (rel "nofollow")
-                                                          (href ,(user-cookies-setter-url
-                                                                  req
-                                                                  (struct-copy user-cookies^ user-cookies
-                                                                               [theme theme]))) (class ,class))
-                                                       (div (@ (class "bw-theme__icon-container"))
-                                                            ,(hash-ref theme-icons theme))
-                                                       ,(format "~a" theme)))))))
+                                           (div (@ (class "bw-ss__container") (id "bw-pr-search-suggestions"))))))
                            (div (@ (id "content") #;(class "page-content"))
                                 (div (@ (id "mw-content-text"))
                                      ,content))
@@ -253,7 +164,6 @@
     (parameterize ([(config-parameter 'strict_proxy) "true"])
       (generate-wiki-page
        '(template)
-       #:req test-req
        #:source-url ""
        #:title "test"
        #:wikiname "test")))
@@ -268,11 +178,11 @@
                                  page))))
                "/proxy?dest=https%3A%2F%2Ftest.fandom.com")))
 
-(define (generate-redirect dest #:headers [headers-in '()])
+(define (generate-redirect dest)
   (define dest-bytes (string->bytes/utf-8 dest))
   (response/output
    #:code 302
-   #:headers (append (list (header #"Location" dest-bytes)) headers-in)
+   #:headers (list (header #"Location" dest-bytes))
    (λ (out)
      (write-html
       `(html
diff --git a/src/config.rkt b/src/config.rkt
index 09407c4..bc0cf6c 100644
--- a/src/config.rkt
+++ b/src/config.rkt
@@ -2,8 +2,11 @@
 (require racket/function
          racket/pretty
          racket/runtime-path
-         racket/string
-         typed/ini)
+         racket/string)
+(require/typed ini
+  [#:opaque Ini ini?]
+  [read-ini (Input-Port -> Ini)]
+  [ini->hash (Ini -> (Immutable-HashTable Symbol (Immutable-HashTable Symbol String)))])
 
 (provide
  config-parameter
@@ -11,7 +14,7 @@
  config-get)
 
 (module+ test
-  (require "../lib/typed-rackunit.rkt"))
+  (require "typed-rackunit.rkt"))
 
 (define-runtime-path path-config "../config.ini")
 
@@ -29,67 +32,60 @@
 
 (define default-config
   '((application_name . "BreezeWiki")
-    (bind_host . "auto")
-    (port . "10416")
     (canonical_origin . "")
     (debug . "false")
     (feature_search_suggestions . "true")
     (instance_is_official . "false") ; please don't turn this on, or you will make me very upset
     (log_outgoing . "true")
-    (strict_proxy . "false")
-
-    (feature_offline::enabled . "false")
-    (feature_offline::format . "json.gz")
-    (feature_offline::only . "false")
-
-    (access_log::enabled . "false")))
+    (port . "10416")
+    (strict_proxy . "true")))
 
 (define loaded-alist
   (with-handlers
     ([exn:fail:filesystem:errno?
       (λ (exn)
-        (displayln "note: config file not detected, using defaults")
-        '())]
+        (begin0
+            '()
+          (displayln "note: config file not detected, using defaults")))]
      [exn:fail:contract?
       (λ (exn)
-        (displayln "note: config file empty or missing [] section, using defaults")
-        '())])
-    (define h (in-hash
-               (ini->hash
-                (call-with-input-file path-config
-                  (λ (in)
-                    (read-ini in))))))
+        (begin0
+            '()
+          (displayln "note: config file empty or missing [] section, using defaults")))])
     (define l
-      (for*/list : (Listof (Pairof Symbol String))
-                 ([(section-key section) h]
-                  [(key value) (in-hash section)])
-        (if (eq? section-key '||)
-            (cons key value)
-            (cons (string->symbol (string-append (symbol->string section-key)
-                                                 "::"
-                                                 (symbol->string key)))
-                  value))))
-    (printf "note: ~a items loaded from config file~n" (length l))
-    l))
+      (hash->list
+       (hash-ref
+        (ini->hash
+         (call-with-input-file path-config
+           (λ (in)
+             (read-ini in))))
+        '||)))
+    (begin0
+        l
+      (printf "note: ~a items loaded from config file~n" (length l)))))
 
 (define env-alist
-  (for/list : (Listof (Pairof Symbol String))
-            ([name (environment-variables-names (current-environment-variables))]
-             #:when (string-prefix? (string-downcase (bytes->string/latin-1 name)) "bw_"))
-    (cons
-     ;; key: convert to string, remove bw_ prefix, convert to symbol
-     (string->symbol (string-downcase (substring (bytes->string/latin-1 name) 3)))
-     ;; value: convert to string
-     (bytes->string/latin-1
-      (cast (environment-variables-ref (current-environment-variables) name) Bytes)))))
+  (let ([e-names (environment-variables-names (current-environment-variables))]
+        [e-ref (λ ([name : Bytes])
+                 (bytes->string/latin-1
+                  (cast (environment-variables-ref (current-environment-variables) name)
+                        Bytes)))])
+    (map (λ ([name : Bytes])
+           (cons (string->symbol (string-downcase (substring (bytes->string/latin-1 name) 3)))
+                 (e-ref name)))
+         (filter (λ ([name : Bytes]) (string-prefix? (string-downcase (bytes->string/latin-1 name))
+                                                     "bw_"))
+                 e-names))))
 (when (> (length env-alist) 0)
   (printf "note: ~a items loaded from environment variables~n" (length env-alist)))
 
 (define combined-alist (append default-config loaded-alist env-alist))
 
 (define config
-  (for/hasheq ([pair combined-alist]) : (Immutable-HashTable Symbol (Parameter String))
-    (values (car pair) (make-parameter (cdr pair)))))
+  (make-immutable-hasheq
+   (map (λ ([pair : (Pairof Symbol String)])
+          (cons (car pair) (make-parameter (cdr pair))))
+        combined-alist)))
 
 (when (config-true? 'debug)
   ; all values here are optimised for maximum prettiness
@@ -111,6 +107,4 @@
   (parameterize ([(config-parameter 'application_name) "JeffWiki"]
                  [(config-parameter 'strict_proxy) ""])
     (check-equal? (config-get 'application_name) "JeffWiki")
-    (check-false (config-true? 'strict_proxy))
-    (check-equal? (string? (config-get 'feature_offline::format)) #t)))
-
+    (check-false (config-true? 'strict_proxy))))
diff --git a/src/data.rkt b/src/data.rkt
index b22e8a0..f856710 100644
--- a/src/data.rkt
+++ b/src/data.rkt
@@ -1,74 +1,46 @@
 #lang racket/base
 (require racket/list
          racket/match
-         web-server/http/request-structs
-         net/url-string
-         (only-in net/cookies/server cookie-header->alist cookie->set-cookie-header make-cookie)
          (prefix-in easy: net/http-easy)
-         db
          memo
          "static-data.rkt"
-         "whole-utils.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt"
-         "../archiver/archiver-database.rkt"
-         "config.rkt")
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  (struct-out siteinfo^)
  (struct-out license^)
  (struct-out head-data^)
- (struct-out user-cookies^)
  siteinfo-fetch
  siteinfo-default
  license-default
  head-data-getter
- head-data-default
- user-cookies-getter
- user-cookies-default
- user-cookies-setter
- user-cookies-setter-url)
+ head-data-default)
 
 (struct siteinfo^ (sitename basepage license) #:transparent)
 (struct license^ (text url) #:transparent)
 (struct head-data^ (body-class icon-url) #:transparent)
 
 (define license-default (license^ "CC-BY-SA" "https://www.fandom.com/licensing"))
-(define siteinfo-default (siteinfo^ "Unknown Wiki" "Main_Page" license-default))
+(define siteinfo-default (siteinfo^ "Test Wiki" "Main_Page" license-default))
 (define head-data-default (head-data^ "skin-fandomdesktop" (get-static-url "breezewiki-favicon.svg")))
 
-(when (config-true? 'feature_offline::only)
-  (void (get-slc)))
-
 (define/memoize (siteinfo-fetch wikiname) #:hash hash
-  (cond
-    [(config-true? 'feature_offline::only)
-     (when (config-true? 'debug)
-       (printf "using offline mode for siteinfo ~a~n" wikiname))
-     (define row (query-maybe-row* "select sitename, basepage, license_text, license_url from wiki where wikiname = ?"
-                                   wikiname))
-     (if row
-         (siteinfo^ (vector-ref row 0)
-                    (vector-ref row 1)
-                    (license^ (vector-ref row 2)
-                              (vector-ref row 3)))
-         siteinfo-default)]
-    [else
-     (define dest-url
-       (format "https://~a.fandom.com/api.php?~a"
-               wikiname
-               (params->query '(("action" . "query")
-                                ("meta" . "siteinfo")
-                                ("siprop" . "general|rightsinfo")
-                                ("format" . "json")
-                                ("formatversion" . "2")))))
-     (log-outgoing dest-url)
-     (define res (easy:get dest-url))
-     (define data (easy:response-json res))
-     (siteinfo^ (jp "/query/general/sitename" data)
-                (second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data)))
-                (license^ (jp "/query/rightsinfo/text" data)
-                          (jp "/query/rightsinfo/url" data)))]))
+  (define dest-url
+    (format "https://~a.fandom.com/api.php?~a"
+            wikiname
+            (params->query '(("action" . "query")
+                             ("meta" . "siteinfo")
+                             ("siprop" . "general|rightsinfo")
+                             ("format" . "json")
+                             ("formatversion" . "2")))))
+  (log-outgoing dest-url)
+  (define res (easy:get dest-url))
+  (define data (easy:response-json res))
+  (siteinfo^ (jp "/query/general/sitename" data)
+             (second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data)))
+             (license^ (jp "/query/rightsinfo/text" data)
+                       (jp "/query/rightsinfo/url" data))))
 
 (define/memoize (head-data-getter wikiname) #:hash hash
   ;; data will be stored here, can be referenced by the memoized closure
@@ -89,27 +61,3 @@
       (set! this-data data))
     ;; then no matter what, return the best information we have so far
     this-data))
-
-(struct user-cookies^ (theme) #:prefab)
-(define user-cookies-default (user-cookies^ 'default))
-(define (user-cookies-getter req)
-  (define cookie-header (headers-assq* #"cookie" (request-headers/raw req)))
-  (define cookies-alist (if cookie-header (cookie-header->alist (header-value cookie-header) bytes->string/utf-8) null))
-  (define cookies-hash
-    (for/hasheq ([pair cookies-alist])
-      (match pair
-        [(cons "theme" (and theme (or "light" "dark" "default")))
-         (values 'theme (string->symbol theme))]
-        [_ (values #f #f)])))
-  (user-cookies^
-   (hash-ref cookies-hash 'theme (user-cookies^-theme user-cookies-default))))
-
-(define (user-cookies-setter user-cookies)
-  (map (λ (c) (header #"Set-Cookie" (cookie->set-cookie-header c)))
-       (list (make-cookie "theme" (symbol->string (user-cookies^-theme user-cookies))
-                          #:path "/"
-                          #:max-age (* 60 60 24 365 10)))))
-
-(define (user-cookies-setter-url req new-settings)
-  (format "/set-user-settings?~a"  (params->query `(("next_location" . ,(url->string (request-uri req)))
-                                                    ("new_settings" . ,(format "~a" new-settings))))))
diff --git a/src/dispatcher-tree.rkt b/src/dispatcher-tree.rkt
index 288634a..06709a6 100644
--- a/src/dispatcher-tree.rkt
+++ b/src/dispatcher-tree.rkt
@@ -1,17 +1,17 @@
 #lang racket/base
-(require "../lib/syntax.rkt"
+(require "syntax.rkt"
          (for-syntax racket/base)
          racket/string
          net/url
-         web-server/http
-         web-server/dispatchers/dispatch
          (prefix-in host: web-server/dispatchers/dispatch-host)
          (prefix-in pathprocedure: web-server/dispatchers/dispatch-pathprocedure)
          (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer)
          (prefix-in lift: web-server/dispatchers/dispatch-lift)
          (prefix-in filter: web-server/dispatchers/dispatch-filter)
+         web-server/private/connection-manager
          "config.rkt"
-         "../lib/url-utils.rkt")
+         "static-data.rkt"
+         "url-utils.rkt")
 
 (provide
  ; syntax to make the hashmap from names
@@ -33,25 +33,42 @@
   ; don't forget that I'm returning *code* - return a call to the function
   (datum->syntax stx `(make-dispatcher-tree ,ds)))
 
+(define (write-bytes* out . bs)
+  (for ([b bs]) (write-bytes b out)))
+
+;; HTTP 103 Early Hints https://datatracker.ietf.org/doc/html/rfc8297
+;; a dispatcher services a request or calls next-dispatcher
+(define ((early-hints:make original-dispatcher) conn req)
+  ;; normally this would call output-response/method to write output based on the method
+  ;; e.g. if it's HEAD then only output the headers
+  (define o (connection-o-port conn))
+  (write-bytes* o
+                #"HTTP/1.1 103 Early Hints\r\n"
+                #"Link: " (string->bytes/latin-1 link-header) #"\r\n"
+                #"\r\n")
+  (flush-output o)
+  ;; after doing early hints, I need to run the original dispatcher to generate the real response.
+  ;; dispatchers do not return anything.
+  (original-dispatcher conn req))
+
 (define (make-dispatcher-tree ds)
-  (define subdomain-dispatcher (hash-ref ds 'subdomain-dispatcher))
-  (sequencer:make
-   subdomain-dispatcher
-   (pathprocedure:make "/" (hash-ref ds 'page-home))
-   (pathprocedure:make "/proxy" (hash-ref ds 'page-proxy))
-   (pathprocedure:make "/search" (hash-ref ds 'page-global-search))
-   (pathprocedure:make "/set-user-settings" (hash-ref ds 'page-set-user-settings))
-   (pathprocedure:make "/buddyfight/wiki/It_Doesn't_Work!!" (hash-ref ds 'page-it-works))
-   (filter:make (pregexp (format "^/~a/wiki/Category:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-category)))
-   (filter:make (pregexp (format "^/~a/wiki/File:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-file)))
-   (if (config-true? 'feature_offline::enabled)
-       (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-wiki-offline)))
-       (λ (_conn _req) (next-dispatcher)))
-   (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-wiki)))
-   (filter:make (pregexp (format "^/~a/search$" px-wikiname)) (lift:make (hash-ref ds 'page-search)))
-   (filter:make (pregexp (format "^/~a(/(wiki(/)?)?)?$" px-wikiname)) (lift:make (hash-ref ds 'redirect-wiki-home)))
-   (if (config-true? 'feature_offline::enabled)
-       (filter:make (pregexp (format "^/archive/~a/(styles|images)/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-static-archive)))
-       (λ (_conn _req) (next-dispatcher)))
-   (hash-ref ds 'static-dispatcher)
-   (lift:make (hash-ref ds 'page-not-found))))
+  (host:make
+   (λ (host-sym)
+     (if/out (config-true? 'canonical_origin)
+             (let* ([host-header (symbol->string host-sym)]
+                    [splitter (string-append "." (url-host (string->url (config-get 'canonical_origin))))]
+                    [s (string-split host-header splitter #:trim? #f)])
+               (if/in (and (eq? 2 (length s)) (equal? "" (cadr s)))
+                      ((hash-ref ds 'subdomain-dispatcher) (car s))))
+             (sequencer:make
+              (pathprocedure:make "/" (hash-ref ds 'page-home))
+              (pathprocedure:make "/proxy" (hash-ref ds 'page-proxy))
+              (pathprocedure:make "/search" (hash-ref ds 'page-global-search))
+              (pathprocedure:make "/buddyfight/wiki/It_Doesn't_Work!!" (hash-ref ds 'page-it-works))
+              (filter:make (pregexp (format "^/~a/wiki/Category:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-category)))
+              (filter:make (pregexp (format "^/~a/wiki/File:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-file)))
+              (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (early-hints:make (lift:make (hash-ref ds 'page-wiki))))
+              (filter:make (pregexp (format "^/~a/search$" px-wikiname)) (lift:make (hash-ref ds 'page-search)))
+              (filter:make (pregexp (format "^/~a(/(wiki(/)?)?)?$" px-wikiname)) (lift:make (hash-ref ds 'redirect-wiki-home)))
+              (hash-ref ds 'static-dispatcher)
+              (lift:make (hash-ref ds 'page-not-found)))))))
diff --git a/src/extwiki-data.rkt b/src/extwiki-data.rkt
deleted file mode 100644
index 82978b1..0000000
--- a/src/extwiki-data.rkt
+++ /dev/null
@@ -1,458 +0,0 @@
-#lang racket/base
-
-(provide
- (struct-out extwiki-props^)
- (struct-out extwiki-group^)
- extwiki-groups
- (struct-out extwiki^)
- extwikis)
-
-(struct extwiki-props^ (go) #:transparent)
-
-(struct extwiki-group^ (name links description) #:transparent)
-(define extwiki-groups
-  (hasheq 'NIWA
-          (extwiki-group^
-           "NIWA"
-           '(("Why did editors leave Fandom?" . "https://www.kotaku.com.au/2022/10/massive-zelda-wiki-reclaims-independence-six-months-before-tears-of-the-kingdom/"))
-           (λ (props)
-             `(p "Most major Nintendo wikis are part of the "
-                 (a (@ (href "https://www.niwanetwork.org/about/")) "Nintendo Independent Wiki Alliance")
-                 " and have their own wikis off Fandom.")))
-
-          'SEIWA
-          (extwiki-group^
-           "SEIWA"
-           '(("SEIWA Website" . "https://seiwanetwork.org/"))
-           (λ (props)
-             `(p "The Square Enix Indpendent Wiki Alliance, or SEIWA, is a network of independent wikis established in 2011 and focused on providing high-quality coverage of Square Enix and its content. We work together, along with our affiliates and others, to co-operate and support one another while providing the best-quality content on the various Square Enix video games and media.")))
-
-          'Terraria
-          (extwiki-group^
-           "Terraria"
-           '(("Announcement: New Official Terraria Wiki!" . "https://forums.terraria.org/index.php?threads/new-official-terraria-wiki-launches-today.111239/") ("In the media" . "https://www.pcgamesn.com/terraria/wiki"))
-           (λ (props) '()))
-
-          'Calamity_Mod
-          (extwiki-group^
-           "Calamity Mod"
-           '(("Announcement: Moving to wiki.gg" . "https://www.reddit.com/r/CalamityMod/comments/ts0586/important_calamity_wiki_announcement/"))
-           (λ (props) '()))
-
-          'ARK
-          (extwiki-group^
-           "ARK"
-           '(("Announcement: Official Wiki Is Moving!" . "https://survivetheark.com/index.php?/forums/topic/657902-official-ark-wiki-feedback/")
-             ("Reasons" . "https://todo.sr.ht/~cadence/breezewiki-todo/4#event-216613")
-             ("Browser Extension" . "https://old.reddit.com/r/playark/comments/xe51sy/official_ark_wiki_launched_a_browser_extension_to/"))
-           (λ (props) '()))
-
-          'Astroneer
-          (extwiki-group^
-           "Astroneer"
-           '(("Migration discussion" . "https://old.reddit.com/r/Astroneer/comments/z905id/the_official_astroneer_wiki_has_moved_to_wikigg/") ("Migration info" . "https://astroneer.fandom.com/wiki/Talk:Astroneer_Wiki/Migration_to_Wiki.gg"))
-           (λ (props) '()))
-
-          'RuneScape
-          (extwiki-group^
-           "RuneScape"
-           '(("Leaving Wikia" . "https://runescape.wiki/w/Forum:Leaving_Wikia")
-             ("In the media" . "https://kotaku.com/video-game-wikis-abandon-their-platform-after-year-of-p-1829401866")
-             ("Browser Extension" . "https://runescape.wiki/w/RuneScape:Finding_the_wikis_with_ease#Extensions"))
-           (λ (props) '()))
-
-          'OSRS
-          (extwiki-group^
-           "OSRS"
-           '(("Leaving Wikia" . "https://runescape.wiki/w/Forum:Leaving_Wikia")
-             ("In the media" . "https://kotaku.com/video-game-wikis-abandon-their-platform-after-year-of-p-1829401866")
-             ("Browser Extension" . "https://oldschool.runescape.wiki/w/RuneScape:Finding_the_wikis_with_ease#Extensions"))
-           (λ (props) '()))
-
-          'empty
-          (extwiki-group^
-           "Misc"
-           '(("This wiki doesn't have a description yet. Add one?" . "https://docs.breezewiki.com/Reporting_Bugs.html"))
-           #f)))
-
-;; wikiname, niwa-name, url, logo-url
-(struct extwiki^ (wikinames banner group name home logo description) #:transparent)
-(define extwikis
-  (list
-   (extwiki^
-    '("arms" "armsgame") 'default
-    'NIWA
-    "ARMS Institute"
-    "https://armswiki.org/wiki/Home"
-    "https://niwanetwork.org/images/logos/armswiki.png"
-    (λ (props)
-      `((p "ARMS Institute is a comprehensive resource for information about the Nintendo Switch game, ARMS. Founded on May 1, 2017 and growing rapidly, the wiki strives to offer in-depth coverage of ARMS from both a competitive and casual perspective. Join us and ARM yourself with knowledge!"))))
-
-   (extwiki^
-    '("pokemon" "monster") 'default
-    'NIWA
-    "Bulbapedia"
-    "https://bulbapedia.bulbagarden.net/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/bulbapedia.png"
-    (λ (props)
-      `((p "A part of the Bulbagarden community, Bulbapedia was founded on December 21, 2004 by Liam Pomfret. Everything you need to know about Pokémon can be found at Bulbapedia, whether about the games, the anime, the manga, or something else entirely. With its Bulbanews section and the Bulbagarden forums, it's your one-stop online place for Pokémon."))))
-
-   (extwiki^
-    '("dragalialost") 'default
-    'NIWA
-    "Dragalia Lost Wiki"
-    "https://dragalialost.wiki/w/Dragalia_Lost_Wiki"
-    "https://niwanetwork.org/images/logos/dragalialost.png"
-    (λ (props)
-      `((p "The Dragalia Lost Wiki was originally founded in September 2018 on the Gamepedia platform but went independent in January 2021. The Wiki aims to document anything and everything Dragalia Lost, from in-game data to mechanics, story, guides, and more!"))))
-
-   (extwiki^
-    '("dragonquest") 'default
-    'NIWA
-    "Dragon Quest Wiki"
-    "https://dragon-quest.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/dragonquestwiki.png"
-    (λ (props)
-      `((p "Originally founded on Wikia, the Dragon Quest Wiki was largely inactive until FlyingRagnar became an admin in late 2009. The wiki went independent about a year later when it merged with the Dragon Quest Dictionary/Encyclopedia which was run by Zenithian and supported by the Dragon's Den.  The Dragon Quest Wiki aims to be the most complete resource for Dragon Quest information on the web. It continues to grow in the hope that one day the series will be as popular in the rest of the world as it is in Japan."))))
-
-   (extwiki^
-    '("fireemblem") 'default
-    'NIWA
-    "Fire Emblem Wiki"
-    "https://fireemblemwiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/fireemblemwiki.png"
-    (λ (props)
-      `((p "Growing since August 26, 2010, Fire Emblem Wiki is a project whose goal is to cover all information pertaining to the Fire Emblem series. It aspires to become the most complete and accurate independent source of information on this series."))))
-
-   (extwiki^
-    '("fzero" "f-zero") 'default
-    'NIWA
-    "F-Zero Wiki"
-    "https://mutecity.org/wiki/F-Zero_Wiki"
-    "https://niwanetwork.org/images/logos/fzerowiki.png"
-    (λ (props)
-      `((p "Founded on Wikia in November 2007, F-Zero Wiki became independent with NIWA's help in 2011. F-Zero Wiki is quickly growing into the Internet's definitive source for the world of 2200 km/h+, from pilots to machines, and is the founding part of MuteCity.org, the web's first major F-Zero community."))))
-
-   (extwiki^
-    '("goldensun") 'default
-    'NIWA
-    "Golden Sun Universe"
-    "https://www.goldensunwiki.net/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/goldensununiverse.png"
-    (λ (props)
-      `((p "Originally founded on Wikia in late 2006, Golden Sun Universe has always worked hard to meet one particular goal: to be the single most comprehensive yet accessible resource on the Internet for Nintendo's RPG series Golden Sun. It became an independent wiki four years later. Covering characters and plot, documenting all aspects of the gameplay, featuring walkthroughs both thorough and bare-bones, and packed with all manner of odd and fascinating minutiae, Golden Sun Universe leaves no stone unturned!"))))
-
-   (extwiki^
-    '("tetris") 'default
-    'NIWA
-    "Hard Drop - Tetris Wiki"
-    "https://harddrop.com/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/harddrop.png"
-    (λ (props)
-      `((p "The Tetris Wiki was founded by Tetris fans for Tetris fans on tetrisconcept.com in March 2006. The Tetris Wiki torch was passed to harddrop.com in July 2009. Hard Drop is a Tetris community for all Tetris players, regardless of skill or what version of Tetris you play."))))
-
-   (extwiki^
-    '("kidicarus") 'default
-    'NIWA
-    "Icaruspedia"
-    "https://www.kidicaruswiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/icaruspedia.png"
-    (λ (props)
-      `((p "Icaruspedia is the Kid Icarus wiki that keeps flying to new heights. After going independent on January 8, 2012, Icaruspedia has worked to become the largest and most trusted independent source of Kid Icarus information. Just like Pit, they'll keep on fighting until the job is done."))))
-
-   (extwiki^
-    '("splatoon" "uk-splatoon" "splatoon3" "splatoon2") 'default
-    'NIWA
-    "Inkipedia"
-    "https://splatoonwiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/inkipedia.png"
-    (λ (props)
-      `((p "Inkipedia is your ever-growing go-to source for all things Splatoon related. Though founded on Wikia on June 10, 2014, Inkipedia went independent on May 18, 2015, just days before Splatoon's release. Our aim is to cover all aspects of the series, both high and low. Come splat with us now!"))))
-
-   (extwiki^
-    '("starfox") 'default
-    'NIWA
-    "Lylat Wiki"
-    "https://starfoxwiki.info/wiki/Lylat_Wiki"
-    "https://niwanetwork.org/images/logos/lylatwiki.png"
-    (λ (props)
-      `((p "Out of seemingly nowhere, Lylat Wiki sprung up one day in early 2010. Led by creator, Justin Folvarcik, and project head, Tacopill, the wiki has reached stability since the move to its own domain. The staff of Lylat Wiki are glad to help out the NIWA wikis and are even prouder to join NIWA's ranks as the source for information on the Star Fox series."))))
-
-   (extwiki^
-    '("metroid" "themetroid") 'default
-    'NIWA
-    "Metroid Wiki"
-    "https://www.metroidwiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/metroidwiki.png"
-    (λ (props)
-      `((p "Metroid Wiki, founded on January 27, 2010 by Nathanial Rumphol-Janc and Zelda Informer, is a rapidly expanding wiki that covers everything Metroid, from the games, to every suit, vehicle and weapon."))))
-
-   (extwiki^
-    '("nintendo" "nintendoseries" "nintendogames") 'default
-    'NIWA
-    "Nintendo Wiki"
-    "http://niwanetwork.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/nintendowiki.png"
-    (λ (props)
-      `((p "Created on May 12, 2010, NintendoWiki (N-Wiki) is a collaborative project by the NIWA team to create an encyclopedia dedicated to Nintendo, being the company around which all other NIWA content is focused. It ranges from mainstream information such as the games and people who work for the company, to the most obscure info like patents and interesting trivia."))))
-
-   (extwiki^
-    '("animalcrossing" "animalcrossingcf" "acnh") 'default
-    'NIWA
-    "Nookipedia"
-    "https://nookipedia.com/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/nookipedia.png"
-    (λ (props)
-      `((p "Founded in August 2005 on Wikia, Nookipedia was originally known as Animal Crossing City. Shortly after its five-year anniversary, Animal Crossing City decided to merge with the independent Animal Crossing Wiki, which in January 2011 was renamed to Nookipedia. Covering everything from the series including characters, items, critters, and much more, Nookipedia is your number one resource for everything Animal Crossing!"))))
-
-   (extwiki^
-    '("pikmin") 'default
-    'NIWA
-    "Pikipedia"
-    "https://www.pikminwiki.com/"
-    "https://niwanetwork.org/images/logos/pikipedia.png"
-    (λ (props)
-      `((p "Pikipedia, also known as Pikmin Wiki, was founded by Dark Lord Revan on Wikia in December 2005. In September 2010, with NIWA's help, Pikipedia moved away from Wikia to become independent. Pikipedia is working towards their goal of being the foremost source for everything Pikmin."))))
-
-   (extwiki^
-    '("pikmin-fan" "pikpikpedia") 'default
-    'NIWA
-    "Pimkin Fanon"
-    "https://www.pikminfanon.com/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/pikifanon.png"
-    (λ (props)
-      `((p "Pikmin Fanon is a Pikmin wiki for fan stories (fanon). Founded back on November 1, 2008 by Rocky0718 as a part of Wikia, Pikmin Fanon has been independent since September 14, 2010. Check them out for fan created stories based around the Pikmin series."))))
-
-   (extwiki^
-    '("supersmashbros") 'default
-    'NIWA
-    "SmashWiki"
-    "https://www.ssbwiki.com/"
-    "https://niwanetwork.org/images/logos/smashwiki.png"
-    (λ (props)
-      `((p "Originally two separate wikis (one on SmashBoards, the other on Wikia), SmashWiki as we know it was formed out of a merge on February 29th, 2008, becoming independent on September 28th, 2010. SmashWiki is the premier source of Smash Bros. information, from simple tidbits to detailed mechanics, and also touches on the origins of its wealth of content from its sibling franchises."))))
-
-   (extwiki^
-    '("starfy") 'default
-    'NIWA
-    "Starfy Wiki"
-    "https://www.starfywiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/starfywiki.png"
-    (λ (props)
-      `((p "Founded on May 30, 2009, Starfy Wiki's one goal is to become the best source on Nintendo's elusive game series The Legendary Starfy. After gaining independence in 2011 with the help of Tappy and the wiki's original administrative team, the wiki still hopes to achieve its goal and be the best source of Starfy info for all present and future fans."))))
-
-   (extwiki^
-    '() 'default
-    'NIWA
-    "StrategyWiki"
-    "https://www.strategywiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/strategywiki.png"
-    (λ (props)
-      `((p "StrategyWiki was founded in December 2005 by former member Brandon Suit with the idea that the existing strategy guides on the Internet could be improved. Three years later, in December 2008, Scott Jacobi officially established Abxy LLC for the purpose of owning and operating StrategyWiki as a community. Their vision is to bring free, collaborative video game strategy guides to the masses, including Nintendo franchise strategy guides."))))
-
-   (extwiki^
-    '("mario" "themario" "imario" "supermarionintendo" "mariokart" "luigi-kart" "mario3") 'default
-    'NIWA
-    "Super Mario Wiki"
-    "https://www.mariowiki.com/"
-    "https://niwanetwork.org/images/logos/mariowiki.png"
-    (λ (props)
-      `((p "Online since August 12, 2005, when it was founded by Steve Shinn, Super Mario Wiki has you covered for anything Mario, Donkey Kong, Wario, Luigi, Yoshi—the whole gang, in fact. With its own large community in its accompanying forum, Super Mario Wiki is not only a great encyclopedia, but a fansite for you to talk anything Mario."))))
-
-   (extwiki^
-    '("mario64") 'default
-    'NIWA
-    "Ukikipedia"
-    "https://ukikipedia.net/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/ukikipedia.png"
-    (λ (props)
-      `((p "Founded in 2018, Ukikipedia is a wiki focused on expert level knowledge of Super Mario 64, including detailed coverage of game mechanics, glitches, speedrunning, and challenges."))))
-
-   (extwiki^
-    '("advancewars") 'default
-    'NIWA
-    "Wars Wiki"
-    "https://www.warswiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/warswiki.png"
-    (λ (props)
-      `((p "Created in February 2009, Wars Wiki is a small wiki community with a large heart. Founded by JoJo and Wars Central, Wars Wiki is going strong on one of Nintendo's lesser known franchises. Wars Wiki is keen to contribute to NIWA, and we're proud to be able to support them. With the Wars Central community, including forums, it's definitely worth checking out."))))
-
-   (extwiki^
-    '("earthbound") 'default
-    'NIWA
-    "WikiBound"
-    "https://www.wikibound.info/wiki/WikiBound"
-    "https://niwanetwork.org/images/logos/wikibound.png"
-    (λ (props)
-      `((p "Founded in early 2010 by Tacopill, WikiBound strives to create a detailed database on the Mother/EarthBound games, a quaint series only having two games officially released outside of Japan. Help spread the PK Love by editing WikiBound!"))))
-
-   (extwiki^
-    '("kirby") 'default
-    'NIWA
-    "WiKirby"
-    "https://wikirby.com/wiki/Kirby_Wiki"
-    "https://niwanetwork.org/images/logos/wikirby.png"
-    (λ (props)
-      `((p "WiKirby. It's a wiki. About Kirby! Amidst the excitement of NIWA being founded, Josh LeJeune decided to create a Kirby Wiki, due to lack of a strong independent one online. Coming online on January 24, 2010, WiKirby continues its strong launch with a dedicated community and a daily growing source of Kirby based knowledge."))))
-
-   (extwiki^
-    '("xenoblade" "xenoseries" "xenogears" "xenosaga") 'parallel
-    'NIWA
-    "Xeno Series Wiki"
-    "https://www.xenoserieswiki.org/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/xenoserieswiki.png"
-    (λ (props)
-      `((p "Xeno Series Wiki was created February 4, 2020 by Sir Teatei Moonlight. While founded by the desire to have an independent wiki for Xenoblade, there was an interest in including the Xenogears and Xenosaga games within its focus as well. This wide range of coverage means it's always in need of new editors to help bolster its many subjects."))))
-
-   (extwiki^
-    '("zelda" "zelda-archive") 'default
-    'NIWA
-    "Zeldapedia"
-    "https://zeldapedia.wiki/wiki/Main_Page"
-    "https://niwanetwork.org/images/logos/zeldapedia.png"
-    (λ (props)
-      `((p "Founded on April 23, 2005 as Zelda Wiki, today's Zeldapedia is your definitive source for encyclopedic information on The Legend of Zelda series, as well as all of the latest Zelda news. Zeldapedia went independent from Fandom in October 2022, citing Fandom's recent buyouts and staffing decisions among their reasons."))))
-
-   (extwiki^
-    '("chrono") 'default
-    'SEIWA
-    "Chrono Wiki"
-    "https://www.chronowiki.org/wiki/Chrono_Wiki"
-    "https://cdn.wikimg.net/en/chronowiki/images/5/59/Site-wiki.png"
-    (λ (props) '((p "A free encyclopedia dedicated to Chrono Trigger, Chrono Cross, Radical Dreamers, and everything else related to the series. A long, rich history and a friendly, encouraging userbase makes this the best Chrono in the entire time/space continuum!"))))
-
-   (extwiki^
-    '("finalfantasy" "finalfantasyxv" "ffxiclopedia") 'parallel
-    'SEIWA
-    "Final Fantasy Wiki"
-    "https://finalfantasywiki.com/wiki/Main_Page"
-    "https://cdn.finalfantasywiki.com/wiki.png"
-    (λ (props) '((p "A new wiki focused on covering Square Enix's flagship franchise, the critically-acclaimed Final Fantasy series. The Final Fantasy Wiki was founded on January 12, 2020 as part of SEIWA and covers all things Final Fantasy and related franchises."))))
-
-   (extwiki^
-    '("kingdomhearts") 'default
-    'SEIWA
-    "Kingdom Hearts Wiki"
-    "https://www.khwiki.com/"
-    "https://kh.wiki.gallery/images/b/bc/Wiki.png"
-    (λ (props) '((p "The Kingdom Hearts Wiki attempts to document all things related to the Kingdom Hearts series, from elements of storyline to gameplay. The site was originally founded on April 1, 2006 on Wikia and became independent on February 9, 2011. Since this time, the community of the KHWiki strives to be the most professional and comprehensive Kingdom Hearts resource in the world."))))
-
-   (extwiki^
-    '("squareenix") 'default
-    'SEIWA
-    "Square Enix Wiki"
-    "https://wiki.seiwanetwork.org/wiki/Main_Page"
-    "https://cdn.seiwanetwork.org/thumb/9/94/Square_Enix_Wiki_Logo.png/200px-Square_Enix_Wiki_Logo.png"
-    (λ (props) '((p "The Square Enix Wiki was founded on February 8, 2012, and is an up-and-coming wiki project created by SEIWA. It focuses on covering all things Square Enix, from its video game series to its physical publications to its most notable employees and work as a company."))))
-
-   (extwiki^
-    '("terraria") 'default
-    'Terraria
-    "Official Terraria Wiki"
-    "https://terraria.wiki.gg/wiki/Terraria_Wiki"
-    "https://terraria.wiki.gg/images/5/5a/App_icon_1.3_Update.png"
-    (λ (props)
-      `()))
-
-   (extwiki^
-    '("calamitymod" "calamity-mod") 'empty
-    'Calamity_Mod
-    "Official Calamity Mod Wiki"
-    "https://calamitymod.wiki.gg/wiki/Calamity_Mod_Wiki"
-    #f
-    #f)
-
-   (extwiki^
-    '("ark" "ark-survival-evolved-archive") 'default
-    'ARK
-    "ARK Community Wiki"
-    "https://ark.wiki.gg/wiki/ARK_Survival_Evolved_Wiki"
-    "https://ark.wiki.gg/images/e/e6/Site-logo.png"
-    (λ (props)
-      `((p "The official ARK: Survival Evolved Wiki launched in 2016. In April 2022 it moved to wiki.gg's hosting to improve creative control and the overall browsing experience."))))
-
-   (extwiki^
-    '("runescape") 'default
-    'RuneScape
-    "RuneScape Wiki"
-    "https://runescape.wiki/"
-    "https://runescape.wiki/images/Wiki.png"
-    (λ (props)
-      `((p "The RuneScape Wiki was founded on April 8, 2005. In October 2018, the wiki left Fandom (then Wikia), citing their apathy towards the wiki and excessive advertisements."))))
-
-   (extwiki^
-    '("oldschoolrunescape") 'default
-    'OSRS
-    "Old School RuneScape Wiki"
-    "https://oldschool.runescape.wiki/"
-    "https://oldschool.runescape.wiki/images/Wiki.png"
-    (λ (props)
-      `((p "The Old School RuneScape Wiki was founded on February 14, 2013. In October 2018, the RuneScape Wiki left Fandom (then Wikia), citing their apathy towards the wiki and excessive advertisements, with the Old School RuneScape Wiki following suit."))))
-
-   (extwiki^
-    '("astroneer") 'default
-    'Astroneer
-    "Astroneer Wiki"
-    "https://astroneer.wiki.gg/wiki/Astroneer_Wiki"
-    "https://astroneer.wiki.gg/images/7/74/Icon_Astroneer.png"
-    (λ (props)
-      `((p "“Fandom bought Gamepedia and forced a migration, with their restricted, ad-heavy appearance, and other annoying features that we could not remove, the wiki grew slow and annoying to use, especially for logged out users.")
-        (p "“We decided to move away from Fandom to Wiki.gg, which returns the wiki to how it used to be on gamepedia, without the ads spamming and forced videos.”"))))
-
-   ;; fandom wikinames * empty * empty * Name * Home Page
-   (extwiki^ '("aether") 'empty 'empty "Aether Wiki" "https://aether.wiki.gg/wiki/Aether_Wiki" #f #f)
-   (extwiki^ '("before-darkness-falls") 'empty 'empty "Before Darkness Falls Wiki" "https://beforedarknessfalls.wiki.gg/wiki/Before_Darkness_Falls_Wiki" #f #f)
-   (extwiki^ '("calamitymod") 'empty 'empty "Calamity Mod Wiki" "https://calamitymod.wiki.gg/wiki/Calamity_Mod_Wiki" #f #f)
-   (extwiki^ '("chivalry" "chivalry2") 'empty 'empty "Official Chivalry Wiki" "https://chivalry.wiki.gg/wiki/Chivalry_Wiki" #f #f)
-   (extwiki^ '("clockup") 'empty 'empty "CLOCKUP WIKI" "https://en.clockupwiki.org/wiki/CLOCKUP_WIKI:Plan" #f #f)
-   (extwiki^ '("half-life") 'empty 'empty "Combine OverWiki" "https://combineoverwiki.net/wiki/Main_Page" #f #f)
-   (extwiki^ '("coromon") 'empty 'empty "Coromon Wiki" "https://coromon.wiki.gg/wiki/Coromon_Wiki" #f #f)
-   (extwiki^ '("cosmoteer") 'empty 'empty "Cosmoteer Wiki" "https://cosmoteer.wiki.gg/wiki/Cosmoteer_Wiki" #f #f)
-   (extwiki^ '("criticalrole") 'empty 'empty "Encylopedia Exandria" "https://criticalrole.miraheze.org/wiki/Main_Page" #f #f)
-   (extwiki^ '("cuphead") 'empty 'empty "Cuphead Wiki" "https://cuphead.wiki.gg/wiki/Cuphead_Wiki" #f #f)
-   (extwiki^ '("darkdeity") 'empty 'empty "Dark Deity Wiki" "https://darkdeity.wiki.gg/wiki/Dark_Deity_Wiki" #f #f)
-   (extwiki^ '("deeprockgalactic") 'empty 'empty "Deep Rock Galactic Wiki" "https://deeprockgalactic.wiki.gg/wiki/Deep_Rock_Galactic_Wiki" #f #f)
-   (extwiki^ '("doom") 'empty 'empty "DoomWiki.org" "https://doomwiki.org/wiki/Entryway" #f #f)
-   (extwiki^ '("dreamscaper") 'empty 'empty "Official Dreamscaper Wiki" "https://dreamscaper.wiki.gg/wiki/Dreamscaper_Wiki" #f #f)
-   (extwiki^ '("elderscrolls") 'empty 'empty "UESP" "https://en.uesp.net/wiki/Main_Page" #f #f)
-   (extwiki^ '("fiend-folio") 'empty 'empty "Official Fiend Folio Wiki" "https://fiendfolio.wiki.gg/wiki/Fiend_Folio_Wiki" #f #f)
-   (extwiki^ '("foxhole") 'empty 'empty "Foxhole Wiki" "https://foxhole.wiki.gg/wiki/Foxhole_Wiki" #f #f)
-   (extwiki^ '("have-a-nice-death") 'empty 'empty "Have a Nice Death Wiki" "https://haveanicedeath.wiki.gg/wiki/Have_a_Nice_Death_Wiki" #f #f)
-   (extwiki^ '("jojo" "jojos") 'empty 'empty "JoJo's Bizarre Encyclopedia" "https://jojowiki.com/" #f #f)
-   (extwiki^ '("legiontd2") 'empty 'empty "Legion TD 2 Wiki" "https://legiontd2.wiki.gg/wiki/Legion_TD_2_Wiki" #f #f)
-   (extwiki^ '("noita") 'empty 'empty "Noita Wiki" "https://noita.wiki.gg/wiki/Noita_Wiki" #f #f)
-   (extwiki^ '("pathofexile") 'empty 'empty "Official Path of Exile Wiki" "https://www.poewiki.net/wiki/Path_of_Exile_Wiki" #f #f)
-   (extwiki^ '("projectarrhythmia") 'empty 'empty "Project Arrhythmia Wiki" "https://projectarrhythmia.wiki.gg/wiki/Project_Arrhythmia_Wiki" #f #f)
-   (extwiki^ '("sandsofaura") 'empty 'empty "Official Sands of Aura Wiki" "https://sandsofaura.wiki.gg/wiki/Sands_of_Aura_Wiki" #f #f)
-   (extwiki^ '("seaofthieves") 'empty 'empty "Official Sea of Thieves Wiki" "https://seaofthieves.wiki.gg/wiki/Sea_of_Thieves" #f #f)
-   (extwiki^ '("sonsoftheforest") 'empty 'empty "Sons of the Forest Wiki" "https://sonsoftheforest.wiki.gg/wiki/Sons_of_the_Forest_Wiki" #f #f)
-   (extwiki^ '("stardewvalley") 'empty 'empty "Official Stardew Valley Wiki" "https://www.stardewvalleywiki.com/Stardew_Valley_Wiki" #f #f)
-   (extwiki^ '("steamworld") 'empty 'empty "Official SteamWorld Wiki" "https://steamworld.wiki.gg/wiki/SteamWorld_Wiki" #f #f)
-   (extwiki^ '("teamfortress") 'empty 'empty "Official Team Fortress Wiki" "https://wiki.teamfortress.com/wiki/Main_Page" #f #f)
-   (extwiki^ '("temtem") 'empty 'empty "Official Temtem Wiki" "https://temtem.wiki.gg/wiki/Temtem_Wiki" #f #f)
-   (extwiki^ '("thoriummod") 'empty 'empty "Official Thorium Mod Wiki" "https://thoriummod.wiki.gg/wiki/Thorium_Mod_Wiki" #f #f)
-   (extwiki^ '("totherescue") 'empty 'empty "To The Rescue!" "https://totherescue.wiki.gg/wiki/To_The_Rescue%21_Wiki" #f #f)
-   (extwiki^ '("touhou") 'empty 'empty "Touhou Wiki" "https://en.touhouwiki.net/wiki/Touhou_Wiki" #f #f)
-   (extwiki^ '("undermine") 'empty 'empty "Official UnderMine Wiki" "https://undermine.wiki.gg/wiki/UnderMine_Wiki" #f #f)
-   (extwiki^ '("westofloathing" "loathing") 'empty 'empty "Wiki of Loathing" "https://loathing.wiki.gg/wiki/Wiki_of_Loathing" #f #f)
-   (extwiki^ '("willyousnail") 'empty 'empty "Official Will You Snail Wiki" "https://willyousnail.wiki.gg/wiki/Will_You_Snail_Wiki" #f #f)
-   (extwiki^ '("yumenikki" "yume-nikki-dream-diary") 'empty 'empty "Yume Wiki" "https://yume.wiki/Main_Page" #f #f)))
-
-;; get the current dataset so it can be stored above
-(module+ fetch
-  (require racket/generator
-           racket/list
-           net/http-easy
-           html-parsing
-           "../lib/xexpr-utils.rkt")
-  (define r (get "https://www.niwanetwork.org/members/"))
-  (define x (html->xexp (bytes->string/utf-8 (response-body r))))
-  (define english ((query-selector (λ (e a c) (equal? (get-attribute 'id a) "content1")) x)))
-  (define gen (query-selector (λ (e a c) (has-class? "member" a)) english))
-  (for/list ([item (in-producer gen #f)])
-    (define links (query-selector (λ (e a c) (eq? e 'a)) item))
-    (define url (get-attribute 'href (bits->attributes (links))))
-    (define title (third (links)))
-    (define icon (get-attribute 'src (bits->attributes ((query-selector (λ (e a c) (eq? e 'img)) item)))))
-    (define description (second ((query-selector (λ (e a c) (eq? e 'p)) item))))
-    (list '() title url icon description)))
diff --git a/src/extwiki-generic.rkt b/src/extwiki-generic.rkt
deleted file mode 100644
index fe30b14..0000000
--- a/src/extwiki-generic.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/match
-         racket/string
-         memo
-         net/http-easy
-         html-parsing
-         "../lib/pure-utils.rkt"
-         "../lib/syntax.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
-
-(provide
- get-redirect-content)
-
-(module+ test
-  (require rackunit))
-
-;; fandom wikinames * Title * Main Page * Search page override * API endpoint override
-(define wikis
-  '(((gallowmere) "MediEvil Wiki" "https://medievil.wiki/w/Main_Page" #f #f)
-    ((fallout) "Fallout Wiki" "https://fallout.wiki/wiki/Fallout_Wiki" #f "https://fallout.wiki/api.php")
-    ((drawntolife) "Wapopedia" "https://drawntolife.wiki/en/Main_Page" #f "https://drawntolife.wiki/w/api.php")
-    ))
-
-(define wikis-hash (make-hash))
-(for ([w wikis])
-  (for ([wikiname (car w)])
-    (hash-set! wikis-hash (symbol->string wikiname) w)))
-(module+ test
-  (check-equal? (cadr (hash-ref wikis-hash "gallowmere"))
-                "MediEvil Wiki"))
-
-(define (parse-table table)
-  (define rows (query-selector (λ (t a c) (eq? t 'tr)) table))
-  (define header-row (rows))
-  (define column-names
-    (for/list ([th (in-producer (query-selector (λ (t a c) (eq? t 'th)) header-row) #f)])
-      (string->symbol (string-downcase (string-trim (findf string? th))))))
-  (define data-row (rows))
-  (for/hasheq ([col-name column-names]
-               [col-value (in-producer (query-selector (λ (t a c) (eq? t 'td)) data-row) #f)])
-    (values col-name (filter element-is-content? (cdr col-value)))))
-(module+ test
-  (check-equal? (parse-table (html->xexp "<table> <tbody><tr> <th>Links</th></tr> <tr> <td><a target=\"_blank\" rel=\"nofollow noreferrer noopener\" class=\"external text\" href=\"https://sirdanielfortesque.proboards.com/\">Forum</a></td></tr></tbody></table>"))
-                '#hasheq((links . ((a (@ (target "_blank") (rel "nofollow noreferrer noopener") (class "external text") (href "https://sirdanielfortesque.proboards.com/")) "Forum"))))))
-
-(define (table->links table)
-  (define v (hash-ref table 'links #f))
-  (cond/var
-   [(not v) (values null '("Data table must have a \"Links\" column"))]
-   (var links (filter (λ (a) (and (pair? a) (eq? (car a) 'a))) v)) ; <a> elements
-   [(null? links) (values null '("Links column must have at least one link"))]
-   [#t (values links null)]))
-
-(define (table->logo table)
-  (define logo (hash-ref table 'logo #f))
-  (cond/var
-   [(not logo) (values #f '("Data table must have a \"Logo\" column"))]
-   [(null? logo) (values #f '("Logo table column must have a link"))]
-   (var href (get-attribute 'href (bits->attributes (car (hash-ref table 'logo)))))
-   (var src (get-attribute 'src (bits->attributes (car (hash-ref table 'logo)))))
-   (var true-src (or href src))
-   [(not true-src) (values #f '("Logo table column must have a link"))]
-   [#t (values true-src null)]))
-
-(define (get-api-endpoint wiki)
-  (define main-page (third wiki))
-  (define override (fifth wiki))
-  (or override
-      (match main-page
-        [(regexp #rx"/$") (string-append main-page "api.php")]
-        [(regexp #rx"^(.*)/wiki/" (list _ domain)) (string-append domain "/w/api.php")]
-        [(regexp #rx"^(.*)/w/" (list _ domain)) (string-append domain "/api.php")]
-        [_ (error 'get-api-endpoint "unknown url format: ~a" main-page)])))
-
-(define (get-search-page wiki)
-  (define main-page (third wiki))
-  (define override (fourth wiki))
-  (or override
-      (match main-page
-        [(regexp #rx"/$") (string-append main-page "Special:Search")]
-        [(regexp #rx"^(.*/(?:en|w[^./]*)/)" (list _ wiki-prefix)) (string-append wiki-prefix "Special:Search")]
-        [_ (error 'get-search-page "unknown url format: ~a" main-page)])))
-
-(define/memoize (get-redirect-content wikiname) #:hash hash
-  (define wiki (hash-ref wikis-hash wikiname #f))
-  (cond
-    [wiki
-     (define display-name (cadr wiki))
-     (define endpoint (string-append (get-api-endpoint wiki) "?action=parse&page=MediaWiki:BreezeWikiRedirect&prop=text&formatversion=2&format=json"))
-     (define res (get endpoint))
-     (define html (jp "/parse/text" (response-json res)))
-     (define content ((query-selector (λ (t a c) (has-class? "mw-parser-output" a))
-                                      (html->xexp html))))
-     (define body (for/list ([p (in-producer (query-selector (λ (t a c) (eq? t 'p)) content) #f)]) p))
-     (define table (parse-table ((query-selector (λ (t a c) (eq? t 'table)) content))))
-     (define-values (links links-errors) (table->links table))
-     (define-values (logo logo-errors) (table->logo table))
-     (define construct-errors (append links-errors logo-errors))
-     (λ (title)
-       (define go
-         (string-append (get-search-page wiki)
-                        "?"
-                        (params->query `(("search" . ,title)
-                                         ("go" . "Go")))))
-       `(aside (@ (class "niwa__notice"))
-               (h1 (@ (class "niwa__header")) ,display-name " has its own website separate from Fandom.")
-               (div (@ (class "niwa__cols"))
-                    (div (@ (class "niwa__left"))
-                         (a (@ (class "niwa__go") (href ,go)) "Read " ,title " on " ,display-name " →")
-                         ,@body
-                         (p "This wiki's core community has wholly migrated away from Fandom. You should "
-                            (a (@ (href ,go)) "go to " ,display-name " now!")))
-                    ,(if logo
-                         `(div (@ (class "niwa__right"))
-                               (img (@ (class "niwa__logo") (src ,logo))))
-                         ""))
-               ,(if (pair? links)
-                    `(p (@ (class "niwa__feedback"))
-                        ,@(add-between links " / "))
-                    "")
-               ,(if (pair? construct-errors)
-                    `(ul
-                      ,@(for/list ([error construct-errors])
-                          `(li ,error)))
-                    "")))]
-    [#t #f]))
-(module+ test
-  (check-not-false ((get-redirect-content "gallowmere") "MediEvil Wiki")))
diff --git a/src/log.rkt b/src/log.rkt
deleted file mode 100644
index 047c8aa..0000000
--- a/src/log.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang typed/racket/base
-(require racket/file
-         racket/path
-         racket/port
-         racket/string
-         typed/srfi/19
-         "config.rkt")
-
-(provide
- log-page-request
- log-styles-request
- log-set-settings-request)
-
-(define last-flush 0)
-(define flush-every-millis 60000)
-
-;; anytime-path macro expansion only works in an untyped submodule for reasons I cannot comprehend
-(module define-log-dir racket/base
-  (require racket/path
-           "../lib/syntax.rkt")
-  (provide log-dir)
-  (define log-dir (anytime-path ".." "storage/logs")))
-(require/typed (submod "." define-log-dir)
-               [log-dir Path])
-
-(define log-file (build-path log-dir "access-0.log"))
-(define log-port
-  (if (config-true? 'access_log::enabled)
-      (begin
-        (make-directory* log-dir)
-        (open-output-file log-file #:exists 'append))
-      (open-output-nowhere)))
-
-(: get-date-iso8601 (-> String))
-(define (get-date-iso8601)
-  (date->string (current-date 0) "~5"))
-
-(: offline-string (Boolean -> String))
-(define (offline-string offline?)
-  (if offline? "---" "ooo"))
-
-(: log (String * -> Void))
-(define (log . entry)
-  ;; create log entry string
-  (define full-entry (cons (get-date-iso8601) entry))
-  ;; write to output port
-  (displayln (string-join full-entry ";") log-port)
-  ;; flush output port to file (don't do this too frequently)
-  (when ((- (current-milliseconds) last-flush) . >= . flush-every-millis)
-    (flush-output log-port)
-    (set! last-flush (current-milliseconds))))
-
-(: log-page-request (Boolean String String (U 'light 'dark 'default) -> Void))
-(define (log-page-request offline? wikiname title theme)
-  (log "page" (offline-string offline?) wikiname title (symbol->string theme)))
-
-(: log-styles-request (Boolean String String -> Void))
-(define (log-styles-request offline? wikiname basename)
-  (log "style" (offline-string offline?) wikiname basename))
-
-(: log-set-settings-request (Symbol -> Void))
-(define (log-set-settings-request theme)
-  (log "settings" (symbol->string theme)))
diff --git a/src/niwa-data.rkt b/src/niwa-data.rkt
new file mode 100644
index 0000000..a1036af
--- /dev/null
+++ b/src/niwa-data.rkt
@@ -0,0 +1,156 @@
+#lang racket/base
+
+(provide
+ niwa-data)
+
+;; wikiname, niwa-name, url, logo-url
+(define niwa-data
+  '((("arms" "armsgame")
+     "ARMS Institute"
+     "https://armswiki.org/wiki/Home"
+     "/images/logos/armswiki.png"
+     "ARMS Institute is a comprehensive resource for information about the Nintendo Switch game, ARMS. Founded on May 1, 2017 and growing rapidly, the wiki strives to offer in-depth coverage of ARMS from both a competitive and casual perspective. Join us and ARM yourself with knowledge!")
+    (("pokemon" "monster")
+     "Bulbapedia"
+     "https://bulbapedia.bulbagarden.net/wiki/Main_Page"
+     "/images/logos/bulbapedia.png"
+     "A part of the Bulbagarden community, Bulbapedia was founded on December 21, 2004 by Liam Pomfret. Everything you need to know about Pokémon can be found at Bulbapedia, whether about the games, the anime, the manga, or something else entirely. With its Bulbanews section and the Bulbagarden forums, it's your one-stop online place for Pokémon.")
+    (("dragalialost")
+     "Dragalia Lost Wiki"
+     "https://dragalialost.wiki/w/Dragalia_Lost_Wiki"
+     "/images/logos/dragalialost.png"
+     "The Dragalia Lost Wiki was originally founded in September 2018 on the Gamepedia platform but went independent in January 2021. The Wiki aims to document anything and everything Dragalia Lost, from in-game data to mechanics, story, guides, and more!")
+    (("dragonquest")
+     "Dragon Quest Wiki"
+     "https://dragon-quest.org/wiki/Main_Page"
+     "/images/logos/dragonquestwiki.png"
+     "Originally founded on Wikia, the Dragon Quest Wiki was largely inactive until FlyingRagnar became an admin in late 2009. The wiki went independent about a year later when it merged with the Dragon Quest Dictionary/Encyclopedia which was run by Zenithian and supported by the Dragon's Den.  The Dragon Quest Wiki aims to be the most complete resource for Dragon Quest information on the web. It continues to grow in the hope that one day the series will be as popular in the rest of the world as it is in Japan.")
+    (("fireemblem")
+     "Fire Emblem Wiki"
+     "https://fireemblemwiki.org/wiki/Main_Page"
+     "/images/logos/fireemblemwiki.png"
+     "Growing since August 26, 2010, Fire Emblem Wiki is a project whose goal is to cover all information pertaining to the Fire Emblem series. It aspires to become the most complete and accurate independent source of information on this series.")
+    (("fzero" "f-zero")
+     "F-Zero Wiki"
+     "https://mutecity.org/wiki/F-Zero_Wiki"
+     "/images/logos/fzerowiki.png"
+     "Founded on Wikia in November 2007, F-Zero Wiki became independent with NIWA's help in 2011. F-Zero Wiki is quickly growing into the Internet's definitive source for the world of 2200 km/h+, from pilots to machines, and is the founding part of MuteCity.org, the web's first major F-Zero community.")
+    (("goldensun")
+     "Golden Sun Universe"
+     "https://www.goldensunwiki.net/wiki/Main_Page"
+     "/images/logos/goldensununiverse.png"
+     "Originally founded on Wikia in late 2006, Golden Sun Universe has always worked hard to meet one particular goal: to be the single most comprehensive yet accessible resource on the Internet for Nintendo's RPG series Golden Sun. It became an independent wiki four years later. Covering characters and plot, documenting all aspects of the gameplay, featuring walkthroughs both thorough and bare-bones, and packed with all manner of odd and fascinating minutiae, Golden Sun Universe leaves no stone unturned!")
+    (("tetris")
+     "Hard Drop - Tetris Wiki"
+     "https://harddrop.com/wiki/Main_Page"
+     "/images/logos/harddrop.png"
+     "The Tetris Wiki was founded by Tetris fans for Tetris fans on tetrisconcept.com in March 2006. The Tetris Wiki torch was passed to harddrop.com in July 2009. Hard Drop is a Tetris community for all Tetris players, regardless of skill or what version of Tetris you play.")
+    (("kidicarus")
+     "Icaruspedia"
+     "https://www.kidicaruswiki.org/wiki/Main_Page"
+     "/images/logos/icaruspedia.png"
+     "Icaruspedia is the Kid Icarus wiki that keeps flying to new heights. After going independent on January 8, 2012, Icaruspedia has worked to become the largest and most trusted independent source of Kid Icarus information. Just like Pit, they'll keep on fighting until the job is done.")
+    (("splatoon" "uk-splatoon" "splatoon3" "splatoon2")
+     "Inkipedia"
+     "https://splatoonwiki.org/wiki/Main_Page"
+     "/images/logos/inkipedia.png"
+     "Inkipedia is your ever-growing go-to source for all things Splatoon related. Though founded on Wikia on June 10, 2014, Inkipedia went independent on May 18, 2015, just days before Splatoon's release. Our aim is to cover all aspects of the series, both high and low. Come splat with us now!")
+    (("starfox")
+     "Lylat Wiki"
+     "https://starfoxwiki.info/wiki/Lylat_Wiki"
+     "/images/logos/lylatwiki.png"
+     "Out of seemingly nowhere, Lylat Wiki sprung up one day in early 2010. Led by creator, Justin Folvarcik, and project head, Tacopill, the wiki has reached stability since the move to its own domain. The staff of Lylat Wiki are glad to help out the NIWA wikis and are even prouder to join NIWA's ranks as the source for information on the Star Fox series.")
+    (("metroid" "themetroid")
+     "Metroid Wiki"
+     "https://www.metroidwiki.org/wiki/Main_Page"
+     "/images/logos/metroidwiki.png"
+     "Metroid Wiki, founded on January 27, 2010 by Nathanial Rumphol-Janc and Zelda Informer, is a rapidly expanding wiki that covers everything Metroid, from the games, to every suit, vehicle and weapon.")
+    (("nintendo" "nintendoseries" "nintendogames")
+     "Nintendo Wiki"
+     "http://niwanetwork.org/wiki/Main_Page"
+     "/images/logos/nintendowiki.png"
+     "Created on May 12, 2010, NintendoWiki (N-Wiki) is a collaborative project by the NIWA team to create an encyclopedia dedicated to Nintendo, being the company around which all other NIWA content is focused. It ranges from mainstream information such as the games and people who work for the company, to the most obscure info like patents and interesting trivia.")
+    (("animalcrossing" "animalcrossingcf" "acnh")
+     "Nookipedia"
+     "https://nookipedia.com/wiki/Main_Page"
+     "/images/logos/nookipedia.png"
+     "Founded in August 2005 on Wikia, Nookipedia was originally known as Animal Crossing City. Shortly after its five-year anniversary, Animal Crossing City decided to merge with the independent Animal Crossing Wiki, which in January 2011 was renamed to Nookipedia. Covering everything from the series including characters, items, critters, and much more, Nookipedia is your number one resource for everything Animal Crossing!")
+    (("pikmin")
+     "Pikipedia"
+     "https://www.pikminwiki.com/"
+     "/images/logos/pikipedia.png"
+     "Pikipedia, also known as Pikmin Wiki, was founded by Dark Lord Revan on Wikia in December 2005. In September 2010, with NIWA's help, Pikipedia moved away from Wikia to become independent. Pikipedia is working towards their goal of being the foremost source for everything Pikmin.")
+    (("pikmin-fan" "pikpikpedia")
+     "Pimkin Fanon"
+     "https://www.pikminfanon.com/wiki/Main_Page"
+     "/images/logos/pikifanon.png"
+     "Pikmin Fanon is a Pikmin wiki for fan stories (fanon). Founded back on November 1, 2008 by Rocky0718 as a part of Wikia, Pikmin Fanon has been independent since September 14, 2010. Check them out for fan created stories based around the Pikmin series.")
+    (("supersmashbros")
+     "SmashWiki"
+     "https://www.ssbwiki.com/"
+     "/images/logos/smashwiki.png"
+     "Originally two separate wikis (one on SmashBoards, the other on Wikia), SmashWiki as we know it was formed out of a merge on February 29th, 2008, becoming independent on September 28th, 2010. SmashWiki is the premier source of Smash Bros. information, from simple tidbits to detailed mechanics, and also touches on the origins of its wealth of content from its sibling franchises.")
+    (("starfy")
+     "Starfy Wiki"
+     "https://www.starfywiki.org/wiki/Main_Page"
+     "/images/logos/starfywiki.png"
+     "Founded on May 30, 2009, Starfy Wiki's one goal is to become the best source on Nintendo's elusive game series The Legendary Starfy. After gaining independence in 2011 with the help of Tappy and the wiki's original administrative team, the wiki still hopes to achieve its goal and be the best source of Starfy info for all present and future fans.")
+    (()
+     "StrategyWiki"
+     "https://www.strategywiki.org/wiki/Main_Page"
+     "/images/logos/strategywiki.png"
+     "StrategyWiki was founded in December 2005 by former member Brandon Suit with the idea that the existing strategy guides on the Internet could be improved. Three years later, in December 2008, Scott Jacobi officially established Abxy LLC for the purpose of owning and operating StrategyWiki as a community. Their vision is to bring free, collaborative video game strategy guides to the masses, including Nintendo franchise strategy guides.")
+    (("mario" "themario" "imario" "supermarionintendo" "mariokart" "luigi-kart" "mario3")
+     "Super Mario Wiki"
+     "https://www.mariowiki.com/"
+     "/images/logos/mariowiki.png"
+     "Online since August 12, 2005, when it was founded by Steve Shinn, Super Mario Wiki has you covered for anything Mario, Donkey Kong, Wario, Luigi, Yoshi—the whole gang, in fact. With its own large community in its accompanying forum, Super Mario Wiki is not only a great encyclopedia, but a fansite for you to talk anything Mario.")
+    (("mario64")
+     "Ukikipedia"
+     "https://ukikipedia.net/wiki/Main_Page"
+     "/images/logos/ukikipedia.png"
+     "Founded in 2018, Ukikipedia is a wiki focused on expert level knowledge of Super Mario 64, including detailed coverage of game mechanics, glitches, speedrunning, and challenges.")
+    (("advancewars")
+     "Wars Wiki"
+     "https://www.warswiki.org/wiki/Main_Page"
+     "/images/logos/warswiki.png"
+     "Created in February 2009, Wars Wiki is a small wiki community with a large heart. Founded by JoJo and Wars Central, Wars Wiki is going strong on one of Nintendo's lesser known franchises. Wars Wiki is keen to contribute to NIWA, and we're proud to be able to support them. With the Wars Central community, including forums, it's definitely worth checking out.")
+    (("earthbound")
+     "WikiBound"
+     "https://www.wikibound.info/wiki/WikiBound"
+     "/images/logos/wikibound.png"
+     "Founded in early 2010 by Tacopill, WikiBound strives to create a detailed database on the Mother/EarthBound games, a quaint series only having two games officially released outside of Japan. Help spread the PK Love by editing WikiBound!")
+    (("kirby")
+     "WiKirby"
+     "https://wikirby.com/wiki/Kirby_Wiki"
+     "/images/logos/wikirby.png"
+     "WiKirby. It's a wiki. About Kirby! Amidst the excitement of NIWA being founded, Josh LeJeune decided to create a Kirby Wiki, due to lack of a strong independent one online. Coming online on January 24, 2010, WiKirby continues its strong launch with a dedicated community and a daily growing source of Kirby based knowledge.")
+    (("xenoblade" "xenoseries" "xenogears" "xenosaga")
+     "Xeno Series Wiki"
+     "https://www.xenoserieswiki.org/wiki/Main_Page"
+     "/images/logos/xenoserieswiki.png"
+     "Xeno Series Wiki was created February 4, 2020 by Sir Teatei Moonlight. While founded by the desire to have an independent wiki for Xenoblade, there was an interest in including the Xenogears and Xenosaga games within its focus as well. This wide range of coverage means it's always in need of new editors to help bolster its many subjects.")
+    (("zelda" "zelda-archive")
+     "Zeldapedia"
+     "https://zeldapedia.wiki/wiki/Main_Page"
+     "/images/logos/zeldapedia.png"
+     "Founded on April 23, 2005 as Zelda Wiki, today's Zeldapedia is your definitive source for encyclopedic information on The Legend of Zelda series, as well as all of the latest Zelda news.")))
+
+;; get the current dataset so it can be stored above
+(module+ fetch
+  (require racket/generator
+           racket/list
+           net/http-easy
+           html-parsing
+           "xexpr-utils.rkt")
+  (define r (get "https://www.niwanetwork.org/members/"))
+  (define x (html->xexp (bytes->string/utf-8 (response-body r))))
+  (define english ((query-selector (λ (e a c) (equal? (get-attribute 'id a) "content1")) x)))
+  (define gen (query-selector (λ (e a c) (has-class? "member" a)) english))
+  (for/list ([item (in-producer gen #f)])
+    (define links (query-selector (λ (e a c) (eq? e 'a)) item))
+    (define url (get-attribute 'href (bits->attributes (links))))
+    (define title (third (links)))
+    (define icon (get-attribute 'src (bits->attributes ((query-selector (λ (e a c) (eq? e 'img)) item)))))
+    (define description (second ((query-selector (λ (e a c) (eq? e 'p)) item))))
+    (list '() title url icon description)))
diff --git a/src/page-category.rkt b/src/page-category.rkt
index 29b541c..89bc45a 100644
--- a/src/page-category.rkt
+++ b/src/page-category.rkt
@@ -16,23 +16,19 @@
          "config.rkt"
          "data.rkt"
          "page-wiki.rkt"
-         "../lib/syntax.rkt"
-         "../lib/thread-utils.rkt"
-         "../lib/url-utils.rkt"
-         "whole-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "syntax.rkt"
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  page-category)
 
 (module+ test
-  (require rackunit
-           "test-utils.rkt")
+  (require rackunit)
   (define category-json-data
     '#hasheq((batchcomplete . #t) (continue . #hasheq((cmcontinue . "page|4150504c45|41473") (continue . "-||"))) (query . #hasheq((categorymembers . (#hasheq((ns . 0) (pageid . 25049) (title . "Item (entity)")) #hasheq((ns . 0) (pageid . 128911) (title . "3D")) #hasheq((ns . 0) (pageid . 124018) (title . "A Very Fine Item")) #hasheq((ns . 0) (pageid . 142208) (title . "Amethyst Shard")) #hasheq((ns . 0) (pageid . 121612) (title . "Ankle Monitor")))))))))
 
 (define (generate-results-page
-         #:req req
          #:source-url source-url
          #:wikiname wikiname
          #:title title
@@ -42,7 +38,6 @@
          #:siteinfo [siteinfo #f])
   (define members (jp "/query/categorymembers" members-data))
   (generate-wiki-page
-   #:req req
    #:source-url source-url
    #:wikiname wikiname
    #:title title
@@ -57,7 +52,7 @@
               ,@(map
                  (λ (result)
                    (define title (jp "/title" result))
-                   (define page-path (page-title->path title))
+                   (define page-path (regexp-replace* #rx" " title "_"))
                    `(li
                      (a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
                         ,title)))
@@ -70,63 +65,57 @@
    (define origin (format "https://~a.fandom.com" wikiname))
    (define source-url (format "~a/wiki/~a" origin prefixed-category))
 
-   (define-values (members-data page-data siteinfo)
-     (thread-values
-      (λ ()
-        (define dest-url
-          (format "~a/api.php?~a"
-                  origin
-                  (params->query `(("action" . "query")
-                                   ("list" . "categorymembers")
-                                   ("cmtitle" . ,prefixed-category)
-                                   ("cmlimit" . "max")
-                                   ("formatversion" . "2")
-                                   ("format" . "json")))))
-        (log-outgoing dest-url)
-        (define dest-res (easy:get dest-url #:timeouts timeouts))
-        (easy:response-json dest-res))
-      (λ ()
-        (define dest-url
-          (format "~a/api.php?~a"
-                  origin
-                  (params->query `(("action" . "parse")
-                                   ("page" . ,prefixed-category)
-                                   ("prop" . "text|headhtml|langlinks")
-                                   ("formatversion" . "2")
-                                   ("format" . "json")))))
-        (log-outgoing dest-url)
-        (define dest-res (easy:get dest-url #:timeouts timeouts))
-        (easy:response-json dest-res))
-      (λ ()
-        (siteinfo-fetch wikiname))))
+   (thread-let
+    ([members-data (define dest-url
+                     (format "~a/api.php?~a"
+                             origin
+                             (params->query `(("action" . "query")
+                                              ("list" . "categorymembers")
+                                              ("cmtitle" . ,prefixed-category)
+                                              ("cmlimit" . "max")
+                                              ("formatversion" . "2")
+                                              ("format" . "json")))))
+                   (log-outgoing dest-url)
+                   (define dest-res (easy:get dest-url #:timeouts timeouts))
+                   (easy:response-json dest-res)]
+     [page-data (define dest-url
+                  (format "~a/api.php?~a"
+                          origin
+                          (params->query `(("action" . "parse")
+                                           ("page" . ,prefixed-category)
+                                           ("prop" . "text|headhtml|langlinks")
+                                           ("formatversion" . "2")
+                                           ("format" . "json")))))
+                (log-outgoing dest-url)
+                (define dest-res (easy:get dest-url #:timeouts timeouts))
+                (easy:response-json dest-res)]
+     [siteinfo (siteinfo-fetch wikiname)])
 
-   (define title (preprocess-html-wiki (jp "/parse/title" page-data prefixed-category)))
-   (define page-html (preprocess-html-wiki (jp "/parse/text" page-data "")))
-   (define page (html->xexp page-html))
-   (define head-data ((head-data-getter wikiname) page-data))
-   (define body (generate-results-page
-                 #:req req
-                 #:source-url source-url
-                 #:wikiname wikiname
-                 #:title title
-                 #:members-data members-data
-                 #:page page
-                 #:head-data head-data
-                 #:siteinfo siteinfo))
+    (define title (preprocess-html-wiki (jp "/parse/title" page-data prefixed-category)))
+    (define page-html (preprocess-html-wiki (jp "/parse/text" page-data "")))
+    (define page (html->xexp page-html))
+    (define head-data ((head-data-getter wikiname) page-data))
+    (define body (generate-results-page
+                  #:source-url source-url
+                  #:wikiname wikiname
+                  #:title title
+                  #:members-data members-data
+                  #:page page
+                  #:head-data head-data
+                  #:siteinfo siteinfo))
 
-   (when (config-true? 'debug)
-     ; used for its side effects
-     ; convert to string with error checking, error will be raised if xexp is invalid
-     (xexp->html body))
-   (response/output
-    #:code 200
-    #:headers (build-headers always-headers)
-    (λ (out)
-      (write-html body out)))))
+    (when (config-true? 'debug)
+      ; used for its side effects
+      ; convert to string with error checking, error will be raised if xexp is invalid
+      (xexp->html body))
+    (response/output
+     #:code 200
+     #:headers (build-headers always-headers)
+     (λ (out)
+       (write-html body out))))))
 (module+ test
   (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Ankle_Monitor")
                                     (generate-results-page
-                                     #:req test-req
                                      #:source-url ""
                                      #:wikiname "test"
                                      #:title "Category:Items"
diff --git a/src/page-file.rkt b/src/page-file.rkt
index 2a7332c..1802568 100644
--- a/src/page-file.rkt
+++ b/src/page-file.rkt
@@ -16,17 +16,14 @@
          "config.rkt"
          "data.rkt"
          "page-wiki.rkt"
-         "../lib/syntax.rkt"
-         "../lib/thread-utils.rkt"
-         "../lib/url-utils.rkt"
-         "whole-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "syntax.rkt"
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide page-file)
 
 (module+ test
-  (require rackunit
-           "test-utils.rkt")
+  (require rackunit)
   (define test-media-detail
     '#hasheq((fileTitle . "Example file")
              (videoEmbedCode . "")
@@ -54,8 +51,7 @@
     [(regexp-match? #rx"(?i:^video/)" content-type) `(video (@ (src ,maybe-proxied-url) (controls)))]
     [else `""]))
 
-(define (generate-results-page #:req req
-                               #:source-url source-url
+(define (generate-results-page #:source-url source-url
                                #:wikiname wikiname
                                #:title title
                                #:media-detail media-detail
@@ -72,7 +68,6 @@
   (define maybe-proxied-raw-image-url
     (if (config-true? 'strict_proxy) (u-proxy-url raw-image-url) raw-image-url))
   (generate-wiki-page
-   #:req req
    #:source-url source-url
    #:wikiname wikiname
    #:title title
@@ -103,51 +98,46 @@
               `""))))
 
 (define (page-file req)
-  (response-handler
-   (define wikiname (path/param-path (first (url-path (request-uri req)))))
-   (define prefixed-title (path/param-path (caddr (url-path (request-uri req)))))
-   (define origin (format "https://~a.fandom.com" wikiname))
-   (define source-url (format "~a/wiki/~a" origin prefixed-title))
+  (define wikiname (path/param-path (first (url-path (request-uri req)))))
+  (define prefixed-title (path/param-path (caddr (url-path (request-uri req)))))
+  (define origin (format "https://~a.fandom.com" wikiname))
+  (define source-url (format "~a/wiki/~a" origin prefixed-title))
 
-   (define-values (media-detail siteinfo)
-     (thread-values
-      (λ ()
-        (define dest-url
-          (format "~a/wikia.php?~a"
-                  origin
-                  (params->query `(("format" . "json") ("controller" . "Lightbox")
-                                                       ("method" . "getMediaDetail")
-                                                       ("fileTitle" . ,prefixed-title)))))
-        (log-outgoing dest-url)
-        (define dest-res (easy:get dest-url #:timeouts timeouts))
-        (easy:response-json dest-res))
-      (λ ()
-        (siteinfo-fetch wikiname))))
-   (if (not (jp "/exists" media-detail #f))
-       (next-dispatcher)
-       (response-handler
-        (define file-title (jp "/fileTitle" media-detail ""))
-        (define title
-          (if (non-empty-string? file-title) (format "File:~a" file-title) prefixed-title))
-        (define image-content-type
-          (if (non-empty-string? (jp "/videoEmbedCode" media-detail ""))
-              #f
-              (url-content-type (jp "/imageUrl" media-detail))))
-        (define body
-          (generate-results-page #:req req
-                                 #:source-url source-url
-                                 #:wikiname wikiname
-                                 #:title title
-                                 #:media-detail media-detail
-                                 #:image-content-type image-content-type
-                                 #:siteinfo siteinfo))
-        (when (config-true? 'debug)
-          ; used for its side effects
-          ; convert to string with error checking, error will be raised if xexp is invalid
-          (xexp->html body))
-        (response/output #:code 200
-                         #:headers (build-headers always-headers)
-                         (λ (out) (write-html body out)))))))
+  (thread-let ([media-detail
+                (define dest-url
+                  (format "~a/wikia.php?~a"
+                          origin
+                          (params->query `(("format" . "json") ("controller" . "Lightbox")
+                                                               ("method" . "getMediaDetail")
+                                                               ("fileTitle" . ,prefixed-title)))))
+                (log-outgoing dest-url)
+                (define dest-res (easy:get dest-url #:timeouts timeouts))
+                (easy:response-json dest-res)]
+               [siteinfo (siteinfo-fetch wikiname)])
+              (if (not (jp "/exists" media-detail #f))
+                  (next-dispatcher)
+                  (response-handler
+                   (define file-title (jp "/fileTitle" media-detail ""))
+                   (define title
+                     (if (non-empty-string? file-title) (format "File:~a" file-title) prefixed-title))
+                   (define image-content-type
+                     (if (non-empty-string? (jp "/videoEmbedCode" media-detail ""))
+                         #f
+                         (url-content-type (jp "/imageUrl" media-detail))))
+                   (define body
+                     (generate-results-page #:source-url source-url
+                                            #:wikiname wikiname
+                                            #:title title
+                                            #:media-detail media-detail
+                                            #:image-content-type image-content-type
+                                            #:siteinfo siteinfo))
+                   (when (config-true? 'debug)
+                     ; used for its side effects
+                     ; convert to string with error checking, error will be raised if xexp is invalid
+                     (xexp->html body))
+                   (response/output #:code 200
+                                    #:headers (build-headers always-headers)
+                                    (λ (out) (write-html body out)))))))
 (module+ test
   (parameterize ([(config-parameter 'strict_proxy) "true"])
     (check-equal? (get-media-html "https://static.wikia.nocookie.net/a" "image/jpeg")
@@ -169,8 +159,7 @@
     (check-not-false
      ((query-selector
        (attribute-selector 'src "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fexamplefile")
-       (generate-results-page #:req test-req
-                              #:source-url ""
+       (generate-results-page #:source-url ""
                               #:wikiname "test"
                               #:title "File:Example file"
                               #:media-detail test-media-detail
diff --git a/src/page-global-search.rkt b/src/page-global-search.rkt
index a7748d5..a9c79bb 100644
--- a/src/page-global-search.rkt
+++ b/src/page-global-search.rkt
@@ -5,8 +5,8 @@
          web-server/http
          "application-globals.rkt"
          "data.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  page-global-search)
diff --git a/src/page-home.rkt b/src/page-home.rkt
index 95793d3..6037d9a 100644
--- a/src/page-home.rkt
+++ b/src/page-home.rkt
@@ -6,8 +6,8 @@
          "application-globals.rkt"
          "data.rkt"
          "static-data.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt"
+         "url-utils.rkt"
+         "xexpr-utils.rkt"
          "config.rkt")
 
 (provide
@@ -18,24 +18,21 @@
 
 (define examples
   '(("minecraft" "Bricks")
-    ("crosscode" "CrossCode Wiki")
-    ("undertale" "Hot Dog...?")
-    ("tardis" "Eleanor Blake")
+    ("crosscode" "CrossCode_Wiki")
+    ("undertale" "Hot_Dog...%3F")
+    ("tardis" "Eleanor_Blake")
     ("zelda" "Boomerang")))
 
 (define content
   `((h2 "BreezeWiki makes wiki pages on Fandom readable")
     (p "It removes ads, videos, and suggested content, leaving you with a clean page that doesn't slow down your device or use up your data.")
+    (p "BreezeWiki can also be called an \"alternative frontend for Fandom\".")
     (p ,(format "To use BreezeWiki, just replace \"fandom.com\" with \"~a\", and you'll instantly be teleported to a better world."
                 (if (config-true? 'canonical_origin)
                     (url-host (string->url (config-get 'canonical_origin)))
                     "breezewiki.com")))
     (p "If you'd like to be automatically sent to BreezeWiki every time in the future, "
-       (a (@ (href "https://getindie.wiki")) "get our affiliated browser extension (NEW!)")
-       " or "
        (a (@ (href "https://docs.breezewiki.com/Automatic_Redirection.html")) "check out the tutorial in the manual."))
-    (p "BreezeWiki is available on several different websites called " (a (@ (href "https://en.wikipedia.org/wiki/Mirror_site")) "mirrors") ". Each is independently run. If one mirror is offline, the others still work. "
-       (a (@ (href "https://docs.breezewiki.com/Links.html#%28part._.Mirrors%29")) "See the list."))
     (h2 "Find a page")
     (form (@ (action "/search"))
           (label (@ (class "paired__label"))
@@ -48,12 +45,12 @@
     (h2 "Example pages")
     (ul
      ,@(map (λ (x)
-              `(li (a (@ (href ,(format "/~a/wiki/~a" (car x) (page-title->path (cadr x)))))
+              `(li (a (@ (href ,(apply format "/~a/wiki/~a" x)))
                       ,(apply format "~a: ~a" x))))
             examples))
     (h2 "Testimonials")
     (p (@ (class "testimonial")) ">so glad someone introduced me to a F*ndom alternative (BreezeWiki) because that x-factorized spillway of an ad-infested radioactive dumpsite can go die in a fire —RB")
-    (p (@ (class "testimonial")) ">apparently there are thousands of people essentially running our company " (em "for free") " right now, creating tons of content, and we just put ads on top of it and they're not even employees. thousands of people we can't lay off. thousands! —" (a (@ (href "https://hard-drive.net/fandom-ceo-frustrated-its-impossible-to-lay-off-unpaid-users-who-update-wikias-for-fun/?utm_source=breezewiki") (target "_blank")) "Perkins Miller, Fandom CEO"))
+    (p (@ (class "testimonial")) ">you are so right that fandom still sucks even with adblock somehow. even zapping all the stupid padding it still sucks —Minimus")
     (p (@ (class "testimonial")) ">attempting to go to a wiki's forum page with breezewiki doesn't work, which is based honestly —Tom Skeleton")
     (p (@ (class "testimonial")) ">Fandom pages crashing and closing, taking forever to load and locking up as they load the ads on the site... they are causing the site to crash because they are trying to load video ads both at the top and bottom of the site as well as two or three banner ads, then a massive top of site ad and eventually my anti-virus shuts the whole site down because it's literally pulling more resources than WoW in ultra settings... —Anonymous")
     (p (@ (class "testimonial")) ">reblogs EXTREMELY appreciated I want that twink* (*fandom wiki) obliterated —footlong")
diff --git a/src/page-proxy.rkt b/src/page-proxy.rkt
index cd94603..3c22e1e 100644
--- a/src/page-proxy.rkt
+++ b/src/page-proxy.rkt
@@ -9,8 +9,8 @@
          web-server/http
          (only-in web-server/dispatchers/dispatch next-dispatcher)
          "application-globals.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  page-proxy)
diff --git a/src/page-redirect-wiki-home.rkt b/src/page-redirect-wiki-home.rkt
index 255f625..c8e6dde 100644
--- a/src/page-redirect-wiki-home.rkt
+++ b/src/page-redirect-wiki-home.rkt
@@ -3,8 +3,8 @@
          web-server/http
          "application-globals.rkt"
          "data.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  redirect-wiki-home)
diff --git a/src/page-search.rkt b/src/page-search.rkt
index ce527c0..f4d1ce3 100644
--- a/src/page-search.rkt
+++ b/src/page-search.rkt
@@ -13,25 +13,21 @@
          "application-globals.rkt"
          "config.rkt"
          "data.rkt"
-         "../lib/syntax.rkt"
-         "../lib/thread-utils.rkt"
-         "../lib/url-utils.rkt"
-         "whole-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "syntax.rkt"
+         "url-utils.rkt"
+         "xexpr-utils.rkt")
 
 (provide
  page-search)
 
 (module+ test
-  (require rackunit
-           "test-utils.rkt")
+  (require rackunit)
   (define search-json-data
     '#hasheq((batchcomplete . #t) (query . #hasheq((search . (#hasheq((ns . 0) (pageid . 219) (size . 1482) (snippet . "") (timestamp . "2022-08-21T08:54:23Z") (title . "Gacha Capsule") (wordcount . 214)) #hasheq((ns . 0) (pageid . 201) (size . 1198) (snippet . "") (timestamp . "2022-07-11T17:52:47Z") (title . "Badges") (wordcount . 181)))))))))
 
-(define (generate-results-page req dest-url wikiname query data #:siteinfo [siteinfo #f])
+(define (generate-results-page dest-url wikiname query data #:siteinfo [siteinfo #f])
   (define search-results (jp "/query/search" data))
   (generate-wiki-page
-   #:req req
    #:source-url dest-url
    #:wikiname wikiname
    #:title query
@@ -42,7 +38,7 @@
          (ul ,@(map
                 (λ (result)
                   (let* ([title (jp "/title" result)]
-                         [page-path (page-title->path title)]
+                         [page-path (regexp-replace* #rx" " title "_")]
                          [timestamp (jp "/timestamp" result)]
                          [wordcount (jp "/wordcount" result)]
                          [size (jp "/size" result)])
@@ -62,8 +58,6 @@
    (define wikiname (path/param-path (first (url-path (request-uri req)))))
    (define query (dict-ref (url-query (request-uri req)) 'q #f))
    (define origin (format "https://~a.fandom.com" wikiname))
-   (when (config-true? 'feature_offline::only)
-     (raise-user-error "Full search is currently not available on breezewiki.com - for now, please use the pop-up search suggestions or wait for me to fix it! Thanks <3"))
    (define dest-url
      (format "~a/api.php?~a"
              origin
@@ -73,27 +67,23 @@
                               ("formatversion" . "2")
                               ("format" . "json")))))
 
-   (define-values (dest-res siteinfo)
-     (thread-values
-      (λ ()
-        (log-outgoing dest-url)
-        (easy:get dest-url #:timeouts timeouts))
-      (λ ()
-        (siteinfo-fetch wikiname))))
+   (thread-let
+    ([dest-res (log-outgoing dest-url)
+               (easy:get dest-url #:timeouts timeouts)]
+     [siteinfo (siteinfo-fetch wikiname)])
 
-   (define data (easy:response-json dest-res))
+    (define data (easy:response-json dest-res))
 
-   (define body (generate-results-page req dest-url wikiname query data #:siteinfo siteinfo))
-   (when (config-true? 'debug)
-     ; used for its side effects
-     ; convert to string with error checking, error will be raised if xexp is invalid
-     (xexp->html body))
-   (response/output
-    #:code 200
-    #:headers (build-headers always-headers)
-    (λ (out)
-      (write-html body out)))))
+    (define body (generate-results-page dest-url wikiname query data #:siteinfo siteinfo))
+    (when (config-true? 'debug)
+      ; used for its side effects
+      ; convert to string with error checking, error will be raised if xexp is invalid
+      (xexp->html body))
+    (response/output
+     #:code 200
+     #:headers (build-headers always-headers)
+     (λ (out)
+       (write-html body out))))))
 (module+ test
-  (parameterize ([(config-parameter 'feature_offline::only) "false"])
-    (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Gacha_Capsule")
-                                      (generate-results-page test-req "" "test" "Gacha" search-json-data))))))
+  (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Gacha_Capsule")
+                                    (generate-results-page "" "test" "Gacha" search-json-data)))))
diff --git a/src/page-set-user-settings.rkt b/src/page-set-user-settings.rkt
deleted file mode 100644
index b949142..0000000
--- a/src/page-set-user-settings.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require racket/dict
-         net/url
-         web-server/http
-         "application-globals.rkt"
-         "data.rkt"
-         "log.rkt"
-         "../lib/url-utils.rkt"
-         "../lib/xexpr-utils.rkt")
-
-(provide
- page-set-user-settings)
-
-(define (page-set-user-settings req)
-  (response-handler
-   (define next-location (dict-ref (url-query (request-uri req)) 'next_location))
-   (define new-settings (read (open-input-string (dict-ref (url-query (request-uri req)) 'new_settings))))
-   (log-set-settings-request (user-cookies^-theme new-settings))
-   (define headers (user-cookies-setter new-settings))
-   (generate-redirect next-location #:headers headers)))
diff --git a/src/page-static-archive.rkt b/src/page-static-archive.rkt
deleted file mode 100644
index c0c2e09..0000000
--- a/src/page-static-archive.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/path
-         racket/port
-         racket/string
-         net/url
-         web-server/http
-         web-server/servlet-dispatch
-         web-server/dispatchers/filesystem-map
-         (only-in web-server/dispatchers/dispatch next-dispatcher)
-         "../archiver/archiver.rkt"
-         "../lib/mime-types.rkt"
-         "../lib/syntax.rkt"
-         "../lib/xexpr-utils.rkt"
-         "config.rkt"
-         "log.rkt")
-
-(provide
- page-static-archive)
-
-(define path-archive (anytime-path ".." "storage/archive"))
-
-(define ((replacer wikiname) whole url)
-  (format
-   "url(~a)"
-   (if (or (equal? url "")
-           (equal? url "'")
-           (string-contains? url "/resources-ucp/")
-           (string-contains? url "/fonts/")
-           (string-contains? url "/drm_fonts/")
-           (string-contains? url "//db.onlinewebfonts.com/")
-           (string-contains? url "//bits.wikimedia.org/")
-           (string-contains? url "dropbox")
-           (string-contains? url "only=styles")
-           (string-contains? url "https://https://")
-           (regexp-match? #rx"^%20|^'" url)
-           (regexp-match? #rx"^\"?data:" url))
-       url
-       (let* ([norm-url
-               (cond
-                 [(string-prefix? url "https://") url]
-                 [(string-prefix? url "http://") (regexp-replace #rx"http:" url "https:")]
-                 [(string-prefix? url "//") (string-append "https:" url)]
-                 [(string-prefix? url "/") (format "https://~a.fandom.com~a" wikiname url)]
-                 [else (error 'replace-style-for-images "unknown URL format: ~a" url)])])
-         (define p (image-url->values norm-url))
-         ;; (printf "hashed: ~a~n     -> ~a~n    #-> ~a~n" url (car p) (cdr p))
-         (format "/archive/~a/images/~a" wikiname (cdr p))))))
-
-(define (replace-style-for-images wikiname path)
-  (define content (file->string path))
-  (regexp-replace* #rx"url\\(\"?'?([^)]*)'?\"?\\)" content (replacer wikiname)))
-
-(define (handle-style wikiname dest)
-  (when (config-true? 'debug)
-    (printf "using offline mode for style ~a ~a~n" wikiname dest))
-  (log-styles-request #t wikiname dest)
-  (define fs-path (build-path path-archive wikiname "styles" dest))
-  (unless (file-exists? fs-path)
-    (next-dispatcher))
-  (response-handler
-   (define new-content (replace-style-for-images wikiname fs-path))
-   (response/output
-    #:code 200
-    #:headers (list (header #"Content-Type" #"text/css")
-                    (header #"Referrer-Policy" #"same-origin"))
-    (λ (out) (displayln new-content out)))))
-
-(define (handle-image wikiname dest) ;; dest is the hash with no extension
-  (unless ((string-length dest) . >= . 40) (next-dispatcher))
-  (response-handler
-   (define dir (build-path path-archive wikiname "images" (substring dest 0 1) (substring dest 0 2)))
-   (unless (directory-exists? dir) (next-dispatcher))
-   (define candidates (directory-list dir))
-   (define target (path->string (findf (λ (f) (string-prefix? (path->string f) dest)) candidates)))
-   (unless target (next-dispatcher))
-   (define ext (substring target 41))
-   (response/output
-    #:code 200
-    #:headers (list (header #"Content-Type" (ext->mime-type (string->bytes/latin-1 ext))))
-    (λ (out)
-      (call-with-input-file (build-path dir target)
-        (λ (in)
-          (copy-port in out)))))))
-
-(define (page-static-archive req)
-  (define path (url-path (request-uri req)))
-  (define-values (_ wikiname kind dest) (apply values (map path/param-path path)))
-  (cond [(equal? kind "styles") (handle-style wikiname dest)]
-        [(equal? kind "images") (handle-image wikiname dest)]
-        [else (response-handler (raise-user-error "page-static-archive: how did we get here?" kind))]))
diff --git a/src/page-static.rkt b/src/page-static.rkt
index 0311229..2bf684c 100644
--- a/src/page-static.rkt
+++ b/src/page-static.rkt
@@ -7,8 +7,6 @@
          web-server/dispatchers/filesystem-map
          (only-in web-server/dispatchers/dispatch next-dispatcher)
          (prefix-in files: web-server/dispatchers/dispatch-files)
-         "../lib/mime-types.rkt"
-         "../lib/syntax.rkt"
          "config.rkt")
 
 (provide
@@ -18,7 +16,6 @@
   (require rackunit))
 
 (define-runtime-path path-static "../static")
-(define path-archive (anytime-path ".." "storage/archive"))
 
 (define hash-ext-mime-type
   (hash #".css" #"text/css"
@@ -28,49 +25,45 @@
         #".woff2" #"font/woff2"
         #".txt" #"text/plain"))
 
+(define (ext->mime-type ext)
+  (hash-ref hash-ext-mime-type ext))
+(module+ test
+  (check-equal? (ext->mime-type #".png") #"image/png"))
+
 (define (make-path segments)
   (map (λ (seg) (path/param seg '())) segments))
 (module+ test
   (check-equal? (make-path '("static" "main.css"))
                 (list (path/param "static" '()) (path/param "main.css" '()))))
 
-;; given a request path, return a rewritten request path and the source directory on the filesystem to serve based on
 (define (path-rewriter p)
   (cond
     ; url is ^/static/... ?
     [(equal? (path/param-path (car p)) "static")
      ; rewrite to ^/... which will be treated as relative to static/ on the filesystem
-     (values (cdr p) path-static)]
-    ; url is ^/archive/... ?
-    [(equal? (path/param-path (car p)) "archive")
-     ; rewrite req to ^/<wikiname> and dir to /storage/archive
-     (values (cdr p) path-archive)]
+     (cdr p)]
     ; url is literally ^/robots.txt
     [(equal? p (make-path '("robots.txt")))
      ; rewrite to ^/... -- it already is!
-     (values p path-static)]
+     p]
     ; not going to use the static file dispatcher
     [#t (next-dispatcher)]))
 (module+ test
-  (check-equal? (call-with-values (λ () (path-rewriter (make-path '("static" "main.css")))) cons)
-                (cons (make-path '("main.css")) path-static))
-  (check-equal? (call-with-values (λ () (path-rewriter (make-path '("static" "robots.txt")))) cons)
-                (cons (make-path '("robots.txt")) path-static))
-  (check-equal? (call-with-values (λ () (path-rewriter (make-path '("robots.txt")))) cons)
-                (cons (make-path '("robots.txt")) path-static))
-  (check-equal? (call-with-values (λ () (path-rewriter (make-path '("archive" "minecraft" "styles" "main.css")))) cons)
-                (cons (make-path '("minecraft" "styles" "main.css")) path-archive)))
+  (check-equal? (path-rewriter (make-path '("static" "main.css")))
+                (make-path '("main.css")))
+  (check-equal? (path-rewriter (make-path '("static" "robots.txt")))
+                (make-path '("robots.txt")))
+  (check-equal? (path-rewriter (make-path '("robots.txt")))
+                (make-path '("robots.txt"))))
 
 (define (static-dispatcher conn old-req)
   (define old-uri (request-uri old-req))
   (define old-path (url-path old-uri))
-  (define-values (new-path source-dir) (path-rewriter old-path))
+  (define new-path (path-rewriter old-path))
   (define new-uri (struct-copy url old-uri [path new-path]))
   (define new-req (struct-copy request old-req [uri new-uri]))
   ((files:make
-    #:url->path (lambda (u) ((make-url->path source-dir) u))
-    #:path->headers (lambda (p) (list (header #"Access-Control-Allow-Origin" #"*")
-                                      (header #"Referrer-Policy" #"same-origin")))
+    #:url->path (lambda (u) ((make-url->path path-static) u))
     #:path->mime-type (lambda (u) (ext->mime-type (path-get-extension u)))
     #:cache-no-cache (config-true? 'debug)
     #:cache-immutable (not (config-true? 'debug))
diff --git a/src/page-subdomain.rkt b/src/page-subdomain.rkt
index 024ea79..dededfb 100644
--- a/src/page-subdomain.rkt
+++ b/src/page-subdomain.rkt
@@ -1,65 +1,22 @@
 #lang racket/base
-(require racket/match
-         racket/path
+(require racket/path
          racket/string
          net/url
          web-server/http
-         web-server/dispatchers/dispatch
-         (only-in racket/promise delay)
          (prefix-in lift: web-server/dispatchers/dispatch-lift)
          "application-globals.rkt"
          "config.rkt"
-         "../lib/syntax.rkt"
-         "../lib/xexpr-utils.rkt")
+         "xexpr-utils.rkt")
 
 (provide
  subdomain-dispatcher)
 
-(module+ test
-  (require rackunit))
-
-(define (do-redirect:make subdomain canonical-origin)
+(define (subdomain-dispatcher subdomain)
   (lift:make
    (λ (req)
      (response-handler
       (define uri (request-uri req))
       (define path (url-path uri))
       (define path-string (string-join (map (λ (p) (path/param-path p)) path) "/"))
-      (define dest (format "~a/~a/~a" canonical-origin subdomain path-string))
+      (define dest (format "~a/~a/~a" (config-get 'canonical_origin) subdomain path-string))
       (generate-redirect dest)))))
-
-(define (router req)
-  (define host (bytes->string/utf-8 (header-value (headers-assq* #"host" (request-headers/raw req)))))
-  (define x-canonical-origin (headers-assq* #"x-canonical-origin" (request-headers/raw req)))
-  (define canonical-origin
-    (cond
-      [x-canonical-origin (bytes->string/utf-8 (header-value x-canonical-origin))]
-      [(config-true? 'canonical_origin) (config-get 'canonical_origin)]
-      [#t #f]))
-  (if/out canonical-origin
-          (let* ([canonical-origin-host (url-host (string->url canonical-origin))])
-            (if/in canonical-origin-host
-                   (let* ([splitter (string-append "." (url-host (string->url canonical-origin)))]
-                          [s (string-split host splitter #:trim? #f)])
-                     (if/in (and (eq? 2 (length s)) (equal? "" (cadr s)))
-                            (list 'redirect (car s) canonical-origin)))))
-          'next-dispatcher))
-(module+ test
-  (define (qr url headers)
-    (request #"GET" (string->url url) (map (λ (h) (header (car h) (cadr h))) headers) (delay '()) #f "127.0.0.1" 10416 "127.0.0.1"))
-  (parameterize ([(config-parameter 'canonical_origin) "https://breezewiki.com"])
-    (check-equal? (router (qr "/" '((#"Host" #"breezewiki.com"))))
-                  'next-dispatcher)
-    (check-equal? (router (qr "/wiki/Spell" '((#"Host" #"magic.breezewiki.com"))))
-                  '(redirect "magic" "https://breezewiki.com"))
-    (check-equal? (router (qr "/" '((#"Host" #"magic.bw.breezewiki.com")
-                                    (#"X-Canonical-Origin" #"https://bw.breezewiki.com"))))
-                  '(redirect "magic" "https://bw.breezewiki.com"))
-    (check-equal? (router (qr "/" '((#"Host" #"magic.bwxxxxx.onion")
-                                    (#"X-Canonical-Origin" #"http://bwxxxxx.onion"))))
-                  '(redirect "magic" "http://bwxxxxx.onion"))))
-
-(define (subdomain-dispatcher conn req)
-  (match (router req)
-    [(list 'redirect subdomain canonical-origin) ((do-redirect:make subdomain canonical-origin) conn req)]
-    [_ (next-dispatcher)]))
diff --git a/src/page-wiki-offline.rkt b/src/page-wiki-offline.rkt
deleted file mode 100644
index 3783271..0000000
--- a/src/page-wiki-offline.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang racket/base
-(require racket/dict
-         racket/file
-         racket/function
-         racket/list
-         racket/match
-         racket/path
-         racket/string
-         ; libs
-         (prefix-in easy: net/http-easy)
-         file/sha1
-         file/gunzip
-         json
-         ; html libs
-         "../lib/html-parsing/main.rkt"
-         html-writing
-         ; web server libs
-         net/url
-         web-server/http
-         web-server/dispatchers/dispatch
-         ; my libs
-         "application-globals.rkt"
-         "config.rkt"
-         "data.rkt"
-         "log.rkt"
-         "page-wiki.rkt"
-         "../lib/archive-file-mappings.rkt"
-         "../lib/pure-utils.rkt"
-         "../lib/syntax.rkt"
-         "../lib/tree-updater.rkt"
-         "../lib/xexpr-utils.rkt"
-         "../lib/url-utils.rkt")
-
-(provide
- ; used by the web server
- page-wiki-offline)
-
-(module+ test
-  (require rackunit))
-
-(define path-archive (anytime-path ".." "storage/archive"))
-
-(define (page-wiki-offline req)
-  (response-handler
-   (define wikiname (path/param-path (first (url-path (request-uri req)))))
-   (define segments (map path/param-path (cdr (url-path (request-uri req)))))
-   (define basename (url-segments->basename segments))
-   (define maybe-hashed-basename (if ((string-length basename) . > . 240)
-                                     (sha1 (string->bytes/latin-1 basename))
-                                     basename))
-
-   (define user-cookies (user-cookies-getter req))
-   (define theme (user-cookies^-theme user-cookies))
-
-   (log-page-request #t wikiname maybe-hashed-basename theme)
-
-   (define archive-format
-     (case (config-get 'feature_offline::format)
-       [(".json" "json") (cons "~a.json" (λ () (read-json)))]
-       [(".json.gz" "json.gz") (cons "~a.json.gz" (λ ()
-                                                    (define-values (in out) (make-pipe))
-                                                    (gunzip-through-ports (current-input-port) out)
-                                                    (read-json in)))]
-       [else (error 'archive-format "unknown archive format configured")]))
-   (define fs-path (build-path path-archive wikiname (format (car archive-format) maybe-hashed-basename)))
-   (define source-url (format "https://~a.fandom.com/wiki/~a" wikiname (basename->name-for-query basename)))
-   (cond
-     [(not (file-exists? fs-path))
-      (unless (config-true? 'feature_offline::only)
-        (next-dispatcher))
-      (define mirror-path (url->string (request-uri req)))
-      (define body
-        (generate-wiki-page
-         `(div (@ (class "unsaved-page"))
-               (style ".unsaved-page a { text-decoration: underline !important }")
-               (p "breezewiki.com doesn't have this page saved.")
-               (p "You can see this page by visiting a BreezeWiki mirror:")
-               (ul
-                (li (a (@ (href ,(format "https://antifandom.com~a" mirror-path))) "View on antifandom.com"))
-                (li (a (@ (href ,(format "https://bw.artemislena.eu~a" mirror-path))) "View on artemislena.eu"))
-                (li (a (@ (href ,source-url)) "or, you can see the original page on Fandom (ugh)")))
-               (p "If you'd like " ,wikiname ".fandom.com to be added to breezewiki.com, " (a (@ (href "https://lists.sr.ht/~cadence/breezewiki-requests")) "let me know about it!")))
-         #:req req
-         #:source-url source-url
-         #:wikiname wikiname
-         #:title (url-segments->guess-title segments)
-         #:online-styles #f
-         #:siteinfo (siteinfo-fetch wikiname)
-         ))
-      (when (config-true? 'debug)
-        ; used for its side effects
-        ; convert to string with error checking, error will be raised if xexp is invalid
-        (xexp->html body))
-      (response/output
-       #:code 200
-       #:headers always-headers
-       (λ (out)
-         (write-html body out)))]
-     [#t
-      (when (config-true? 'debug)
-        (printf "using offline mode for ~v~n" fs-path))
-      (response-handler
-       (define data (with-input-from-file fs-path (cdr archive-format)))
-       (define article-title (jp "/parse/title" data))
-       (define original-page (html->xexp (preprocess-html-wiki (jp "/parse/text" data))))
-       (define page ((query-selector (λ (t a c) (has-class? "mw-parser-output" a)) original-page)))
-       (define initial-head-data ((head-data-getter wikiname) data))
-       (define head-data
-         (case theme
-           [(light dark)
-            (struct-copy head-data^ initial-head-data
-                         [body-class (regexp-replace #rx"(theme-fandomdesktop-)(light|dark)"
-                                                     (head-data^-body-class initial-head-data)
-                                                     (format "\\1~a" theme))])]
-           [else initial-head-data]))
-       (define body
-         (generate-wiki-page
-          (update-tree-wiki page wikiname)
-          #:req req
-          #:source-url source-url
-          #:wikiname wikiname
-          #:title article-title
-          #:online-styles #f
-          #:head-data head-data
-          #:siteinfo (siteinfo-fetch wikiname)
-          ))
-       (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
-       (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
-       (define headers
-         (build-headers
-          always-headers
-          ; redirect-query-parameter: only the string "no" is significant:
-          ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-          (when (and redirect-msg
-                     (not (equal? redirect-query-parameter "no")))
-            (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
-                   [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
-              (header #"Refresh" value)))))
-       (when (config-true? 'debug)
-         ; used for its side effects
-         ; convert to string with error checking, error will be raised if xexp is invalid
-         (xexp->html body))
-       (response/output
-        #:code 200
-        #:headers headers
-        (λ (out)
-          (write-html body out))))])))
diff --git a/src/page-wiki.rkt b/src/page-wiki.rkt
index 8df701c..a0a2944 100644
--- a/src/page-wiki.rkt
+++ b/src/page-wiki.rkt
@@ -7,7 +7,7 @@
          ; libs
          (prefix-in easy: net/http-easy)
          ; html libs
-         "../lib/html-parsing/main.rkt"
+         html-parsing
          html-writing
          ; web server libs
          net/url
@@ -17,13 +17,10 @@
          "application-globals.rkt"
          "config.rkt"
          "data.rkt"
-         "../lib/pure-utils.rkt"
-         "../lib/syntax.rkt"
-         "../lib/thread-utils.rkt"
-         "../lib/tree-updater.rkt"
-         "../lib/url-utils.rkt"
-         "whole-utils.rkt"
-         "../lib/xexpr-utils.rkt")
+         "pure-utils.rkt"
+         "syntax.rkt"
+         "xexpr-utils.rkt"
+         "url-utils.rkt")
 
 (provide
  ; used by the web server
@@ -33,71 +30,292 @@
  preprocess-html-wiki)
 
 (module+ test
-  (require rackunit))
+  (require rackunit)
+  (define wiki-document
+    '(*TOP*
+      (div (@ (class "mw-parser-output"))
+           (aside (@ (role "region") (class "portable-infobox pi-theme-wikia pi-layout-default"))
+                  (h2 (@ (class "pi-item pi-title") (data-source "title"))
+                      "Infobox Title")
+                  (figure (@ (class "pi-item pi-image") (data-source "image"))
+                          (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image image-thumbnail") (title ""))
+                             (img (@ (src "https://static.wikia.nocookie.net/nice-image-thumbnail.png") (class "pi-image-thumbnail")))))
+                  (div (@ (class "pi-item pi-data") (data-source "description"))
+                       (h3 (@ (class "pi-data-label"))
+                           "Description")
+                       (div (@ (class "pi-data-value"))
+                            "Mystery infobox!")))
+           (div (@ (data-test-collapsesection) (class "collapsible collapsetoggle-inline collapsed"))
+                (i (b "This section is hidden for dramatic effect."))
+                (div (@ (class "collapsible-content"))
+                     (p "Another page link: "
+                        (a (@ (data-test-wikilink) (href "https://test.fandom.com/wiki/Another_Page") (title "Another Page"))
+                           "Another Page"))))
+           (figure (@ (class "thumb tnone"))
+                   (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image") (data-test-figure-a))
+                      (img (@ (src "data:image/gif;base64,R0lGODlhAQABAIABAAAAAP///yH5BAEAAAEALAAAAAABAAEAQAICTAEAOw%3D%3D")
+                              (data-src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
+                              (class "thumbimage lazyload"))))
+                   (noscript
+                    (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image"))
+                       (img (@ (src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
+                               (data-src "https://static.wikia.nocookie.net/nice-image-thumbnail.png")
+                               (class "thumbimage")))))
+                   (figcaption "Test figure!"))
+           (iframe (@ (src "https://example.com/iframe-src")))))))
+
+(define (preprocess-html-wiki html)
+  (define (rr* find replace contents)
+    (regexp-replace* find contents replace))
+  ((compose1
+    ; fix navbox list nesting
+    ; navbox on right of page has incorrect html "<td ...><li>" and the xexpr parser puts the <li> much further up the tree
+    ; add a <ul> to make the parser happy
+    ; usage: /fallout/wiki/Fallout:_New_Vegas_achievements_and_trophies
+    (curry rr* #rx"(<td[^>]*>\n?)(<li>)" "\\1<ul>\\2")
+    ; change <figcaption><p> to <figcaption><span> to make the parser happy
+    (curry rr* #rx"(<figcaption[^>]*>)[ \t]*<p class=\"caption\">([^<]*)</p>" "\\1<span class=\"caption\">\\2</span>"))
+   html))
+(module+ test
+  (check-equal? (preprocess-html-wiki "<td class=\"va-navbox-column\" style=\"width: 33%\">\n<li>Hey</li>")
+                "<td class=\"va-navbox-column\" style=\"width: 33%\">\n<ul><li>Hey</li>")
+  (check-equal? (preprocess-html-wiki "<figure class=\"thumb tright\" style=\"width: 150px\"><a class=\"image\"><img></a><noscript><a><img></a></noscript><figcaption class=\"thumbcaption\"> 	<p class=\"caption\">Caption text.</p></figcaption></figure>")
+                "<figure class=\"thumb tright\" style=\"width: 150px\"><a class=\"image\"><img></a><noscript><a><img></a></noscript><figcaption class=\"thumbcaption\"><span class=\"caption\">Caption text.</span></figcaption></figure>"))
+
+(define (update-tree-wiki tree wikiname)
+  (update-tree
+   (λ (element element-type attributes children)
+     ;; replace whole element?
+     (cond
+       ; wrap tables in a div.table-scroller
+       [(and (eq? element-type 'table)
+             (has-class? "wikitable" attributes)
+             (not (dict-has-key? attributes 'data-scrolling)))
+        `(div
+          ((class "table-scroller"))
+          ((,element-type (@ (data-scrolling) ,@attributes)
+                          ,@children)))]
+       ; exclude empty figcaptions
+       [(and (eq? element-type 'figcaption)
+             (or (eq? (length (filter element-is-element? children)) 0)
+                 ((query-selector (λ (element-type attributes children)
+                                    (eq? element-type 'use))
+                                  element))))
+        return-no-element]
+       ; exclude infobox items that are videos, and gallery items that are videos
+       [(and (or (has-class? "pi-item" attributes)
+                 (has-class? "wikia-gallery-item" attributes))
+             ((query-selector (λ (element-type attributes children)
+                                (has-class? "video-thumbnail" attributes))
+                              element)))
+        return-no-element]
+       ; exclude the invisible brackets after headings
+       [(and (eq? element-type 'span)
+             (has-class? "mw-editsection" attributes))
+        return-no-element]
+       ; display a link instead of an iframe
+       [(eq? element-type 'iframe)
+        (define src (car (dict-ref attributes 'src null)))
+        `(a
+          ((class "iframe-alternative") (href ,src))
+          (,(format "Embedded media: ~a" src)))]
+       ; remove noscript versions of images because they are likely lower quality than the script versions
+       [(and (eq? element-type 'noscript)
+             (match children
+               ; either the noscript has a.image as a first child...
+               [(list (list 'a (list '@ a-att ...) _)) (has-class? "image" a-att)]
+               ; or the noscript has img as a first child
+               [(list (list 'img _)) #t]
+               [_ #f]))
+        return-no-element]
+       [#t
+        (list element-type
+              ;; attributes
+              ((compose1
+                ; uncollapsing
+                (curry attribute-maybe-update 'class
+                       (λ (class)
+                         (string-join
+                          ((compose1
+                            ; uncollapse all navbox items (bottom of page mass navigation)
+                            (curry u
+                                   (λ (classlist) (and (eq? element-type 'table)
+                                                       (member "navbox" classlist)
+                                                       (member "collapsed" classlist)))
+                                   (λ (classlist) (filter (curry (negate equal?) "collapsed") classlist)))
+                            ; uncollapse portable-infobox sections
+                            (curry u
+                                   (λ (classlist) (and (eq? element-type 'section)
+                                                       (member "pi-collapse" classlist)))
+                                   (λ (classlist) (filter (λ (v)
+                                                            (and (not (equal? v "pi-collapse-closed"))
+                                                                 (not (equal? v "pi-collapse"))))
+                                                          classlist)))
+                            ; generic: includes article sections and tables, probably more
+                            (curry u
+                                   (λ (classlist) (and (member "collapsible" classlist)
+                                                       (member "collapsed" classlist)))
+                                   (λ (classlist) (filter (curry (negate equal?) "collapsed") classlist))))
+                           (string-split class " "))
+                          " ")))
+                ; change links to stay on the same wiki
+                (curry attribute-maybe-update 'href
+                       (λ (href)
+                         ((compose1
+                           (λ (href) (regexp-replace #rx"^(/wiki/.*)" href (format "/~a\\1" wikiname)))
+                           (λ (href) (regexp-replace (pregexp (format "^https://(~a)\\.fandom\\.com(/wiki/.*)" px-wikiname)) href "/\\1\\2")))
+                          href)))
+                ; add noreferrer to a.image
+                (curry u
+                       (λ (v) (and (eq? element-type 'a)
+                                   (has-class? "image" v)))
+                       (λ (v) (dict-update v 'rel (λ (s)
+                                                    (list (string-append (car s) " noreferrer")))
+                                           '(""))))
+                ; proxy images from inline styles, if strict_proxy is set
+                (curry u
+                       (λ (v) (config-true? 'strict_proxy))
+                       (λ (v) (attribute-maybe-update
+                               'style
+                               (λ (style)
+                                 (regexp-replace #rx"url\\(['\"]?(.*?)['\"]?\\)" style
+                                                 (λ (whole url)
+                                                   (string-append
+                                                    "url("
+                                                    (u-proxy-url url)
+                                                    ")")))) v)))
+                ; and also their links, if strict_proxy is set
+                (curry u
+                       (λ (v)
+                         (and (config-true? 'strict_proxy)
+                              (eq? element-type 'a)
+                              (or (has-class? "image-thumbnail" v)
+                                  (has-class? "image" v))))
+                       (λ (v) (attribute-maybe-update 'href u-proxy-url v)))
+                ; proxy images from src attributes, if strict_proxy is set
+                (curry u
+                       (λ (v) (config-true? 'strict_proxy))
+                       (λ (v) (attribute-maybe-update 'src u-proxy-url v)))
+                ; don't lazyload images
+                (curry u
+                       (λ (v) (dict-has-key? v 'data-src))
+                       (λ (v) (attribute-maybe-update 'src (λ (_) (car (dict-ref v 'data-src))) v)))
+                ; don't use srcset - TODO: use srcset?
+                (λ (v) (dict-remove v 'srcset)))
+               attributes)
+              ;; children
+              ((compose1
+                ; wrap blinking animated images in a slot so they can be animated with CSS
+                (curry u
+                       (λ (v) (and (has-class? "animated" attributes)
+                                   ((length v) . > . 1)))
+                       (λ (v)
+                         `((span (@ (class "animated-slot__outer") (style ,(format "--steps: ~a" (length v))))
+                                 (span (@ (class "animated-slot__inner"))
+                                       ,@v))))))
+               children))]))
+   tree))
+(module+ test
+  (define transformed
+    (parameterize ([(config-parameter 'strict_proxy) "true"])
+      (update-tree-wiki wiki-document "test")))
+  ; check that wikilinks are changed to be local
+  (check-equal? (get-attribute 'href (bits->attributes
+                                      ((query-selector
+                                        (λ (t a c) (dict-has-key? a 'data-test-wikilink))
+                                        transformed))))
+                "/test/wiki/Another_Page")
+  ; check that a.image has noreferrer
+  (check-equal? (get-attribute 'rel (bits->attributes
+                                     ((query-selector
+                                       (λ (t a c) (and (eq? t 'a)
+                                                       (has-class? "image" a)))
+                                       transformed))))
+                " noreferrer")
+  ; check that article collapse sections become uncollapsed
+  (check-equal? (get-attribute 'class (bits->attributes
+                                       ((query-selector
+                                         (λ (t a c) (dict-has-key? a 'data-test-collapsesection))
+                                         transformed))))
+                "collapsible collapsetoggle-inline")
+  ; check that iframes are gone
+  (check-false ((query-selector (λ (t a c) (eq? t 'iframe)) transformed)))
+  (check-equal? (let* ([alternative ((query-selector (λ (t a c) (has-class? "iframe-alternative" a)) transformed))]
+                       [link ((query-selector (λ (t a c) (eq? t 'a)) alternative))])
+                  (get-attribute 'href (bits->attributes link)))
+                "https://example.com/iframe-src")
+  ; check that images are proxied
+  (check-equal? (get-attribute 'src (bits->attributes
+                                     ((query-selector
+                                       (λ (t a c) (eq? t 'img))
+                                       transformed))))
+                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image-thumbnail.png")
+  ; check that links to images are proxied
+  (check-equal? (get-attribute 'href (bits->attributes
+                                      ((query-selector
+                                        (λ (t a c) (and (eq? t 'a) (has-class? "image-thumbnail" a)))
+                                        transformed))))
+                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png")
+  (check-equal? (get-attribute 'href (bits->attributes
+                                      ((query-selector
+                                        (λ (t a c) (member '(data-test-figure-a) a))
+                                        transformed))))
+                "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png")
+  ; check that noscript images are removed
+  (check-equal? ((query-selector (λ (t a c) (eq? t 'noscript)) transformed)) #f))
 
 (define (page-wiki req)
   (define wikiname (path/param-path (first (url-path (request-uri req)))))
-  (define user-cookies (user-cookies-getter req))
   (define origin (format "https://~a.fandom.com" wikiname))
   (define path (string-join (map path/param-path (cddr (url-path (request-uri req)))) "/"))
   (define source-url (format "https://~a.fandom.com/wiki/~a" wikiname path))
 
-  (define-values (dest-res siteinfo)
-    (thread-values
-     (λ ()
-       (define dest-url
-         (format "~a/api.php?~a"
-                 origin
-                 (params->query `(("action" . "parse")
-                                  ("page" . ,path)
-                                  ("prop" . "text|headhtml|langlinks")
-                                  ("formatversion" . "2")
-                                  ("format" . "json")))))
-       (log-outgoing dest-url)
-       (easy:get dest-url
-                 #:timeouts timeouts
-                 #:headers `#hasheq((cookie . ,(format "theme=~a" (user-cookies^-theme user-cookies))))))
-     (λ ()
-       (siteinfo-fetch wikiname))))
+  (thread-let
+   ([dest-res (define dest-url
+                (format "~a/api.php?~a"
+                        origin
+                        (params->query `(("action" . "parse")
+                                         ("page" . ,path)
+                                         ("prop" . "text|headhtml|langlinks")
+                                         ("formatversion" . "2")
+                                         ("format" . "json")))))
+              (log-outgoing dest-url)
+              (easy:get dest-url #:timeouts timeouts)]
+    [siteinfo (siteinfo-fetch wikiname)])
 
-  (cond
-    [(eq? 200 (easy:response-status-code dest-res))
-     (let* ([data (easy:response-json dest-res)]
-            [title (jp "/parse/title" data "")]
-            [page-html (jp "/parse/text" data "")]
-            [page-html (preprocess-html-wiki page-html)]
-            [page (html->xexp page-html)]
-            [head-data ((head-data-getter wikiname) data)])
-       (if (equal? "missingtitle" (jp "/error/code" data #f))
-           (next-dispatcher)
-           (response-handler
-            (define body
-              (generate-wiki-page
-               (update-tree-wiki page wikiname)
-               #:req req
-               #:source-url source-url
-               #:wikiname wikiname
-               #:title title
-               #:head-data head-data
-               #:siteinfo siteinfo))
-            (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
-            (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
-            (define headers
-              (build-headers
-               always-headers
-               ; redirect-query-parameter: only the string "no" is significant:
-               ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-               (when (and redirect-msg
-                          (not (equal? redirect-query-parameter "no")))
-                 (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
-                        [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
-                   (header #"Refresh" value)))))
-            (when (config-true? 'debug)
-              ; used for its side effects
-              ; convert to string with error checking, error will be raised if xexp is invalid
-              (xexp->html body))
-            (response/output
-             #:code 200
-             #:headers headers
-             (λ (out)
-               (write-html body out))))))]))
+   (cond
+     [(eq? 200 (easy:response-status-code dest-res))
+      (let* ([data (easy:response-json dest-res)]
+             [title (jp "/parse/title" data "")]
+             [page-html (jp "/parse/text" data "")]
+             [page-html (preprocess-html-wiki page-html)]
+             [page (html->xexp page-html)]
+             [head-data ((head-data-getter wikiname) data)])
+        (if (equal? "missingtitle" (jp "/error/code" data #f))
+            (next-dispatcher)
+            (response-handler
+             (define body
+               (generate-wiki-page
+                (update-tree-wiki page wikiname)
+                #:source-url source-url
+                #:wikiname wikiname
+                #:title title
+                #:head-data head-data
+                #:siteinfo siteinfo))
+             (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
+             (define headers
+               (build-headers
+                always-headers
+                (when redirect-msg
+                    (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
+                           [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
+                      (header #"Refresh" value)))))
+             (when (config-true? 'debug)
+               ; used for its side effects
+               ; convert to string with error checking, error will be raised if xexp is invalid
+               (xexp->html body))
+             (response/output
+              #:code 200
+              #:headers headers
+              (λ (out)
+                (write-html body out))))))])))
diff --git a/lib/pure-utils.rkt b/src/pure-utils.rkt
similarity index 69%
rename from lib/pure-utils.rkt
rename to src/pure-utils.rkt
index ff8b933..eb730ec 100644
--- a/lib/pure-utils.rkt
+++ b/src/pure-utils.rkt
@@ -4,19 +4,13 @@
  ; call the updater on the dictionary key only if it has that key
  alist-maybe-update
  ; update a value only if a condition succeeds on it
- u
- ; like string-join, but for lists
- list-join
- u-counter)
+ u)
 
 (module+ test
   (require "typed-rackunit.rkt"))
 
-(define u-counter (box 0))
-
 (: alist-maybe-update (∀ (A B) ((Listof (Pairof A B)) A (B -> B) -> (Listof (Pairof A B)))))
 (define (alist-maybe-update alist key updater)
-  (set-box! u-counter (add1 (unbox u-counter)))
   (map (λ ([p : (Pairof A B)])
          (if (eq? (car p) key)
              (cons (car p) (updater (cdr p)))
@@ -30,16 +24,7 @@
 
 (: u (∀ (A) ((A -> Any) (A -> A) A -> A)))
 (define (u condition updater value)
-  (set-box! u-counter (add1 (unbox u-counter)))
   (if (condition value) (updater value) value))
 (module+ test
   (check-equal? (u (λ ([x : Integer]) (< x 5)) (λ ([x : Integer]) (* x -1)) 4) -4)
   (check-equal? (u (λ ([x : Integer]) (< x 5)) (λ ([x : Integer]) (* x -1)) 8) 8))
-
-(: list-join (∀ (A B) (A (Listof B) -> (Listof (U A B)))))
-(define (list-join element ls)
-  (if (pair? (cdr ls))
-      (list* (car ls) element (list-join element (cdr ls)))
-      (list (car ls))))
-(module+ test
-  (check-equal? (list-join "h" '(2 3 4 5)) '(2 "h" 3 "h" 4 "h" 5)))
diff --git a/src/reloadable.rkt b/src/reloadable.rkt
index 3cac00b..1939a8b 100644
--- a/src/reloadable.rkt
+++ b/src/reloadable.rkt
@@ -3,7 +3,6 @@
 ;;; Source: https://github.com/tonyg/racket-reloadable/blob/master/reloadable/main.rkt
 ;;; Source commit: cae2a14 from 24 May 2015
 ;;; Source license: LGPL 3 or later
-;;; Further modifications by Cadence as seen in this repo's git history.
 
 (provide (struct-out reloadable-entry-point)
          reload-poll-interval
@@ -20,8 +19,8 @@
 (require racket/match)
 (require racket/rerequire)
 
-(define reload-poll-interval 0.5) ; seconds
-(define reload-failure-retry-delay (make-parameter 5)) ; seconds
+(define reload-poll-interval 0.5) ;; seconds
+(define reload-failure-retry-delay (make-parameter 5)) ;; seconds
 
 (struct reloadable-entry-point (name
                                 module-path
diff --git a/src/syntax.rkt b/src/syntax.rkt
new file mode 100644
index 0000000..8205326
--- /dev/null
+++ b/src/syntax.rkt
@@ -0,0 +1,108 @@
+#lang racket/base
+(require (for-syntax racket/base))
+
+(provide
+ ; help make a nested if. if/in will gain the same false form of its containing if/out.
+ if/out
+ ; let, but the value for each variable is evaluated within a thread
+ thread-let)
+
+(module+ test
+  (require rackunit)
+  (define (check-syntax-equal? s1 s2)
+    (check-equal? (syntax->datum s1)
+                  (syntax->datum s2))))
+
+;; actual transforming goes on in here.
+;; it's in a submodule so that it can be required in both levels, for testing
+
+(module transform racket/base
+  (provide
+   transform-if/out
+   transform-thread-let)
+
+  (define (transform-if/out stx)
+    (define tree (cdr (syntax->datum stx))) ; condition true false
+    (define else (cddr tree)) ; the else branch cons cell
+    (define result
+      (let walk ([node tree])
+        (cond
+          ; normally, node should be a full cons cell (a pair) but it might be something else.
+          ; situation: reached the end of a list, empty cons cell
+          [(null? node) node]
+          ; situation: reached the end of a list, cons cdr was non-list
+          [(symbol? node) node]
+          ; normal situation, full cons cell
+          ; -- don't go replacing through nested if/out
+          [(and (pair? node) (eq? 'if/out (car node))) node]
+          ; -- replace if/in
+          [(and (pair? node) (eq? 'if/in (car node)))
+           (append '(if) (cdr node) else)]
+          ; recurse down pair head and tail
+          [(pair? node) (cons (walk (car node)) (walk (cdr node)))]
+          ; something else that can't be recursed into, so pass it through
+          [#t node])))
+    (datum->syntax stx (cons 'if result)))
+
+  (define (transform-thread-let stx)
+    (define tree (cdr (syntax->datum stx)))
+    (define defs (car tree))
+    (define forms (cdr tree))
+    (when (eq? (length forms) 0)
+      (error (format "thread-let: bad syntax (need some forms to execute after the threads)~n  forms: ~a" forms)))
+    (define counter (build-list (length defs) values))
+    (datum->syntax
+     stx
+     `(let ([chv (build-vector ,(length defs) (λ (_) (make-channel)))])
+        ,@(map (λ (n)
+                 (define def (list-ref defs n))
+                 `(thread (λ () (channel-put (vector-ref chv ,n) (let _ () ,@(cdr def))))))
+               counter)
+        (let ,(map (λ (n)
+                     (define def (list-ref defs n))
+                     `(,(car def) (channel-get (vector-ref chv ,n))))
+                   counter)
+            ,@forms)))))
+
+;; the syntax definitions and their tests go below here
+
+(require 'transform (for-syntax 'transform))
+
+(define-syntax (if/out stx)
+  (transform-if/out stx))
+(module+ test
+  (check-syntax-equal? (transform-if/out #'(if/out (condition 1) (if/in (condition 2) (do-yes)) (do-no)))
+                       #'(if (condition 1) (if (condition 2) (do-yes) (do-no)) (do-no)))
+  (check-equal? (if/out #t (if/in #t 'yes) 'no) 'yes)
+  (check-equal? (if/out #f (if/in #t 'yes) 'no) 'no)
+  (check-equal? (if/out #t (if/in #f 'yes) 'no) 'no)
+  (check-equal? (if/out #f (if/in #f 'yes) 'no) 'no))
+
+(define-syntax (thread-let stx)
+  (transform-thread-let stx))
+(module+ test
+  ; check that it is transformed as expected
+  (check-syntax-equal?
+   (transform-thread-let
+    #'(thread-let ([a (hey "this is a")]
+                   [b (hey "this is b")])
+                  (list a b)))
+   #'(let ([chv (build-vector 2 (λ (_) (make-channel)))])
+       (thread (λ () (channel-put (vector-ref chv 0) (let _ () (hey "this is a")))))
+       (thread (λ () (channel-put (vector-ref chv 1) (let _ () (hey "this is b")))))
+       (let ([a (channel-get (vector-ref chv 0))]
+             [b (channel-get (vector-ref chv 1))])
+         (list a b))))
+  ; check that they actually execute concurrently
+  (define ch (make-channel))
+  (check-equal? (thread-let ([a (begin
+                                  (channel-put ch 'a)
+                                  (channel-get ch))]
+                             [b (begin0
+                                    (channel-get ch)
+                                  (channel-put ch 'b))])
+                            (list a b))
+                '(b a))
+  ; check that it assigns the correct value to the correct variable
+  (check-equal? (thread-let ([a (sleep 0) 'a] [b 'b]) (list a b))
+                '(a b)))
diff --git a/src/test-utils.rkt b/src/test-utils.rkt
deleted file mode 100644
index 1c9860d..0000000
--- a/src/test-utils.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require web-server/http/request-structs
-         net/url-structs
-         (only-in racket/promise delay))
-(provide
- test-req)
-
-(define test-req (request #"GET" (url "https" #f "breezewiki.com" #f #t (list (path/param "" '())) '() #f) '() (delay '()) #f "127.0.0.1" 0 "127.0.0.1"))
diff --git a/lib/typed-rackunit.rkt b/src/typed-rackunit.rkt
similarity index 100%
rename from lib/typed-rackunit.rkt
rename to src/typed-rackunit.rkt
diff --git a/lib/url-utils.rkt b/src/url-utils.rkt
similarity index 71%
rename from lib/url-utils.rkt
rename to src/url-utils.rkt
index 4722d49..b70b245 100644
--- a/lib/url-utils.rkt
+++ b/src/url-utils.rkt
@@ -1,5 +1,6 @@
 #lang typed/racket/base
 (require racket/string
+         "config.rkt"
          "pure-utils.rkt")
 (require/typed web-server/http/request-structs
                [#:opaque Header header?])
@@ -9,18 +10,14 @@
  px-wikiname
  ; make a query string from an association list of strings
  params->query
- ; custom percent encoding (you probably want params->query instead)
- percent-encode
- ; sets for custom percent encoding
- path-set urlencoded-set filename-set
  ; make a proxied version of a fandom url
  u-proxy-url
  ; check whether a url is on a domain controlled by fandom
  is-fandom-url?
+  ; prints "out: <url>"
+ log-outgoing
  ; pass in a header, headers, or something useless. they'll all combine into a list
- build-headers
- ; try to follow wikimedia's format for which characters should be encoded/replaced in page titles for the url
- page-title->path)
+ build-headers)
 
 (module+ test
   (require "typed-rackunit.rkt"))
@@ -29,20 +26,14 @@
 
 ;; https://url.spec.whatwg.org/#urlencoded-serializing
 
-(define path-set '(#\; ; semicolon is part of the userinfo set in the URL standard, but I'm putting it here
-                   #\? #\` #\{ #\} ; path set
-                   #\  #\" #\# #\< #\> ; query set
-                   ; c0 controls included elsewhere
-                   ; higher ranges included elsewhere
-                   ))
-(define urlencoded-set (append
-                        '(#\! #\' #\( #\) #\~ ; urlencoded set
-                          #\$ #\% #\& #\+ #\, ; component set
-                          #\/ #\: #\= #\@ #\[ #\\ #\] #\^ #\| ; userinfo set
-                          )
-                        path-set))
-
-(define filename-set '(#\< #\> #\: #\" #\/ #\\ #\| #\? #\* #\# #\~ #\&))
+(define urlencoded-set '(#\! #\' #\( #\) #\~ ; urlencoded set
+                         #\$ #\% #\& #\+ #\, ; component set
+                         #\/ #\: #\; #\= #\@ #\[ #\\ #\] #\^ #\| ; userinfo set
+                         #\? #\` #\{ #\} ; path set
+                         #\  #\" #\# #\< #\> ; query set
+                         ; c0 controls included elsewhere
+                         ; higher ranges included elsewhere
+                         ))
 
 (: percent-encode (String (Listof Char) Boolean -> Bytes))
 (define (percent-encode value set space-as-plus)
@@ -90,6 +81,11 @@
    (λ ([v : String]) (string-append "/proxy?" (params->query `(("dest" . ,url)))))
    url))
 
+(: log-outgoing (String -> Void))
+(define (log-outgoing url-string)
+  (when (config-true? 'log_outgoing)
+    (printf "out: ~a~n" url-string)))
+
 (: build-headers ((U Header (Listof Header) False Void) * -> (Listof Header)))
 (define (build-headers . fs)
   (apply
@@ -102,7 +98,3 @@
            [(header? f) (list f)]
            [(pair? f) f]))
        fs)))
-
-(: page-title->path (String -> Bytes))
-(define (page-title->path title)
-  (percent-encode (regexp-replace* " " title "_") path-set #f))
diff --git a/src/whole-utils.rkt b/src/whole-utils.rkt
deleted file mode 100644
index 7118866..0000000
--- a/src/whole-utils.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket/base
-(require "config.rkt")
-
-(provide
- ; prints "out: <url>"
- log-outgoing)
-
-(: log-outgoing (String -> Void))
-(define (log-outgoing url-string)
-  (when (config-true? 'log_outgoing)
-    (printf "out: ~a~n" url-string)))
diff --git a/lib/xexpr-utils.rkt b/src/xexpr-utils.rkt
similarity index 96%
rename from lib/xexpr-utils.rkt
rename to src/xexpr-utils.rkt
index 018d8c3..f5ef3cf 100644
--- a/lib/xexpr-utils.rkt
+++ b/src/xexpr-utils.rkt
@@ -129,7 +129,7 @@
   (λ (element-type attributes children)
     (equal? (get-attribute name attributes) value)))
 
-(define (query-selector selector element #:include-text? [include-text? #f])
+(define (query-selector selector element)
   (generator
    ()
    (let loop ([element element])
@@ -140,9 +140,7 @@
        [(equal? element-type '*DECL*) #f]
        [(equal? element-type '@) #f]
        [#t
-        (when (if include-text?
-                   (selector element-type attributes children (filter string? (cdr element)))
-                   (selector element-type attributes children))
+        (when (selector element-type attributes children)
           (yield element))
         (for ([child children]) (loop child))]))
   #f))
diff --git a/static/breezewiki-color.svg b/static/breezewiki-color.svg
deleted file mode 100644
index f273dd3..0000000
--- a/static/breezewiki-color.svg
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg:svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="36.41787"
-   width="224.9014"
-   version="1.1"
-   id="svg912"
-   sodipodi:docname="breezewiki-color.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <svg:metadata
-     id="metadata918">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </svg:metadata>
-  <svg:defs
-     id="defs916" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1882"
-     inkscape:window-height="1059"
-     id="namedview914"
-     showgrid="false"
-     showguides="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="123.17581"
-     inkscape:cy="7.7496502"
-     inkscape:window-x="38"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg912"
-     showborder="true"
-     inkscape:pagecheckerboard="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <div
-     id="saka-gui-root">
-    <div>
-      <div>
-        <style />
-      </div>
-    </div>
-  </div>
-  <svg:g
-     aria-label="wiki"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;line-height:2.67644334px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-     id="text926"
-     transform="translate(97.9947,1.1875002)">
-    <svg:path
-       d="m 81.588122,13.020001 q 0,0.08533 0,0.298666 -0.04267,0.256001 -0.04267,0.384001 0,0.128 -0.341333,0.213333 -0.810667,0.170667 -0.981334,0.256 -0.341333,0.170667 -0.725333,0.725333 -0.512,0.725334 -1.237333,2.517334 l -4.480001,11.008 q -0.128,0.298667 -0.725333,0.298667 -0.554667,0 -0.682667,-0.298667 l -3.584,-8.874667 -3.626667,8.874667 q -0.128,0.298667 -0.725333,0.298667 -0.554667,0 -0.682667,-0.298667 L 58.846788,16.561334 q -0.554667,-1.322666 -1.066667,-1.92 -0.469333,-0.64 -1.706667,-0.896 -0.341333,-0.08533 -0.341333,-0.256 v -0.725333 q 0,-0.298667 0.298667,-0.298667 0.896,0 2.474666,0.08533 1.749334,0.08533 2.432,0.08533 0,0 4.821334,0 1.152,0 3.456,-0.08533 2.304,-0.08533 3.456,-0.08533 0.341333,0 0.341333,0.469333 0,0.08533 0,0.298667 -0.04267,0.170667 -0.04267,0.256 0,0.256 -0.981334,0.384 -0.981333,0.128 -0.981333,0.682667 0,0.256 0.128,0.597333 l 3.157333,8.064 2.986667,-7.552 q 0.213333,-0.554666 0.213333,-0.938666 0,-0.554667 -0.810666,-0.682667 -0.810667,-0.128 -0.810667,-0.384 v -0.725334 q 0,-0.298666 0.469333,-0.298666 0.384,0 1.194667,0.128 0.810667,0.08533 1.194667,0.08533 0.426667,0 1.194667,-0.08533 0.768,-0.128 1.024,-0.128 0.64,0 0.64,0.384 z m -13.525334,4.693333 -0.853333,-2.133333 q -0.554667,-1.408 -2.517334,-1.408 h -1.536 q -0.810667,0 -0.810667,0.64 0,0.256 0.128,0.597333 l 3.242667,8.149334 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path842"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 91.700066,5.6813339 q 0,1.1093334 -0.768,1.8773334 -0.768,0.768 -1.877333,0.768 -1.109333,0 -1.877333,-0.768 -0.768,-0.768 -0.768,-1.8773334 0,-1.1093333 0.768,-1.8773334 0.768,-0.768 1.877333,-0.768 1.109333,0 1.877333,0.768 0.768,0.7680001 0.768,1.8773334 z m 1.706667,22.3573341 q 0,0.298667 -0.298667,0.298667 -0.298666,0 -0.298666,0 -1.962667,-0.170667 -3.669334,-0.170667 -1.621333,0 -3.584,0.170667 0,0 -0.170666,0 -0.469334,0 -0.469334,-0.426667 0,-0.08533 0.04267,-0.298667 0,-0.213333 0,-0.298666 0,-0.256 0.853333,-0.384 0.853334,-0.128 1.066667,-0.554667 0.256,-0.469333 0.256,-1.834667 v -6.528 q 0,-1.322667 -0.256,-1.749333 -0.170667,-0.298667 -1.109333,-0.682667 -0.896,-0.384 -0.896,-0.768 0,-0.256 0.128,-0.469333 0.04267,-0.08533 2.858666,-1.194667 2.816,-1.152 3.029334,-1.152 0.341333,0 0.341333,0.341333 v 11.904 q 0,1.749334 0.170667,2.090667 0.256,0.469334 1.109333,0.597334 0.896,0.128 0.896,0.384 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path844"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 114.52672,27.526668 q 0,0.810667 -0.29867,0.810667 -0.59733,0 -1.87733,-0.08533 -1.23733,-0.08533 -1.87733,-0.08533 -0.59734,0 -1.83467,0.08533 -1.19467,0.08533 -1.792,0.08533 -0.384,0 -0.384,-0.469334 0,-0.08533 0.0427,-0.298666 0,-0.170667 0,-0.256 0,-0.256 0.55466,-0.341334 0.59734,-0.128 0.59734,-0.512 0,-0.298666 -0.512,-1.152 l -3.24267,-5.418667 -1.87733,1.408 v 3.2 q 0,1.408001 0.21333,1.877334 0.21333,0.426667 1.152,0.554667 0.81067,0.128 0.81067,0.384 v 0.725333 q 0,0.298667 -0.59734,0.298667 -0.59733,0 -1.83466,-0.08533 -1.19467,-0.08533 -1.792004,-0.08533 -0.597333,0 -1.834667,0.08533 -1.194666,0.08533 -1.792,0.08533 -0.597333,0 -0.597333,-0.426667 v -0.597333 q 0,-0.256 0.853333,-0.384 0.853334,-0.128 1.066667,-0.554667 0.256,-0.469333 0.256,-1.834667 V 6.4920006 q 0,-1.3226667 -0.256,-1.7493334 -0.170667,-0.2986666 -1.109333,-0.6826666 -0.896001,-0.3840001 -0.896001,-0.7680001 0,-0.256 0.128,-0.4693333 0.04267,-0.085333 2.858667,-1.1946667 2.816001,-1.15200005 3.029331,-1.15200005 0.34134,0 0.34134,0.34133334 V 19.718668 q 5.71733,-4.309334 5.71733,-5.290667 0,-0.682667 -1.792,-0.682667 -0.46933,0 -0.46933,-0.512 0,-0.768 0.42666,-0.768 0.55467,0 1.70667,0.08533 1.19467,0.08533 1.74933,0.08533 0.55467,0 1.70667,-0.08533 1.152,-0.08533 1.70667,-0.08533 0.42666,0 0.42666,0.469333 0,0.08533 0,0.298667 -0.0427,0.170667 -0.0427,0.298667 0,0.128 -0.384,0.213333 -0.64,0.08533 -1.83467,0.426667 -0.512,0.213333 -2.048,1.578667 -1.024,0.896 -2.09067,1.834666 l 4.224,6.656 q 1.57867,2.474667 2.60267,2.688001 0.29867,0.04267 0.59733,0.128 0.29867,0.08533 0.29867,0.469333 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path846"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 123.69999,5.6813339 q 0,1.1093334 -0.768,1.8773334 -0.768,0.768 -1.87734,0.768 -1.10933,0 -1.87733,-0.768 -0.768,-0.768 -0.768,-1.8773334 0,-1.1093333 0.768,-1.8773334 0.768,-0.768 1.87733,-0.768 1.10934,0 1.87734,0.768 0.768,0.7680001 0.768,1.8773334 z m 1.70666,22.3573341 q 0,0.298667 -0.29866,0.298667 -0.29867,0 -0.29867,0 -1.96267,-0.170667 -3.66933,-0.170667 -1.62134,0 -3.584,0.170667 0,0 -0.17067,0 -0.46933,0 -0.46933,-0.426667 0,-0.08533 0.0427,-0.298667 0,-0.213333 0,-0.298666 0,-0.256 0.85334,-0.384 0.85333,-0.128 1.06666,-0.554667 0.256,-0.469333 0.256,-1.834667 v -6.528 q 0,-1.322667 -0.256,-1.749333 -0.17066,-0.298667 -1.10933,-0.682667 -0.896,-0.384 -0.896,-0.768 0,-0.256 0.128,-0.469333 0.0427,-0.08533 2.85867,-1.194667 2.816,-1.152 3.02933,-1.152 0.34133,0 0.34133,0.341333 v 11.904 q 0,1.749334 0.17067,2.090667 0.256,0.469334 1.10933,0.597334 0.896,0.128 0.896,0.384 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path848"
-       inkscape:connector-curvature="0" />
-  </svg:g>
-  <svg:g
-     aria-label="breeze"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;line-height:2.57638931px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#252525;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-     id="text930"
-     transform="translate(-69.005304,1.5000002)">
-    <svg:path
-       d="m 162.59026,13.697235 q 0,0.782126 -0.48131,1.363707 -0.46126,0.581581 -1.22333,0.581581 -0.46125,0 -0.92251,-0.421145 -0.44119,-0.421144 -0.80218,-0.421144 -0.16043,0 -0.9225,0.80218 -1.28349,1.323598 -2.68731,3.690031 -1.34365,2.266161 -2.00545,4.111176 -0.48131,1.504089 -1.52414,4.452103 -0.28077,0.701908 -0.80219,0.701908 -0.50136,0 -0.98267,-0.240654 -0.58158,-0.280763 -0.58158,-0.721962 0,-0.180491 0.10028,-0.461254 l 2.52686,-7.259736 q 0.8824,-2.526869 0.8824,-4.111176 0,-1.383761 -0.80218,-1.383761 -1.103,0 -2.08567,1.263434 -0.96261,1.263435 -0.98267,1.263435 -0.14038,0 -0.46125,-0.2206 -0.32087,-0.240654 -0.32087,-0.381036 0,-0.140381 0.0802,-0.280763 0.80218,-1.383762 1.88513,-2.607087 1.50409,-1.664525 2.52687,-1.664525 2.12578,0 2.12578,3.10845 0,1.443925 -0.42115,3.288941 3.9708,-6.4375 6.05647,-6.4375 0.76207,0 1.28348,0.601635 0.54148,0.601636 0.54148,1.383762 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path853"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 148.05073,15.502142 q 0,4.672702 -5.71554,9.485786 -4.25155,3.569704 -7.74104,3.569704 -1.38376,0 -2.24611,-0.661799 -0.96261,-0.721962 -0.96261,-2.065615 0,-0.561526 0.20054,-1.24338 l 5.85592,-20.1748444 q 0.12033,-0.4211449 0.12033,-0.7420171 0,-0.8823988 -1.12305,-1.1832166 -1.12306,-0.3008177 -1.12306,-0.5013629 0,-0.7821262 0.62169,-1.04283489 0.30082,-0.0200545 0.78213,-0.0601636 0.56153,-0.0601635 2.28621,-0.4612539 Q 140.73083,-2.0861626e-7 140.791,-2.0861626e-7 q 0.42114,0 0.42114,0.38103582861626 0,0.18049066 -1.20327,4.33177578 L 136.09824,18.06912 q 5.03368,-6.357282 9.06464,-6.357282 1.34365,0 2.16589,1.263434 0.72196,1.102999 0.72196,2.52687 z m -2.92796,0.200545 q 0,-1.764798 -1.48403,-1.764798 -2.54693,0 -6.05647,4.331776 -3.42932,4.211449 -3.42932,6.83859 0,1.965343 1.36371,1.965343 2.78758,0 6.25701,-4.311721 3.3491,-4.17134 3.3491,-7.05919 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path851"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 175.36498,14.760125 q 0,3.028232 -3.66997,4.572429 -2.18595,0.902454 -6.29712,1.403817 -0.16044,1.123053 -0.16044,2.145833 0,3.54965 3.46943,3.54965 1.12306,0 2.4266,-1.183217 1.30354,-1.183216 1.22332,-1.183216 0.14039,0 0.46126,0.320872 0.32087,0.300818 0.32087,0.441199 0,0.140382 -0.12033,0.300818 -2.54692,3.429322 -5.89602,3.429322 -2.18595,0 -3.5296,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82769,-8.12208 2.84774,-3.50954 6.61799,-3.50954 1.50409,0 2.50681,0.762072 1.103,0.842289 1.103,2.286215 z m -2.54692,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84502,0 -3.54965,2.205997 -1.3236,1.704634 -2.04556,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path855"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 188.96195,14.760125 q 0,3.028232 -3.66998,4.572429 -2.18594,0.902454 -6.29712,1.403817 -0.16043,1.123053 -0.16043,2.145833 0,3.54965 3.46943,3.54965 1.12305,0 2.4266,-1.183217 1.30354,-1.183216 1.22332,-1.183216 0.14038,0 0.46125,0.320872 0.32088,0.300818 0.32088,0.441199 0,0.140382 -0.12033,0.300818 -2.54692,3.429322 -5.89603,3.429322 -2.18594,0 -3.52959,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82768,-8.12208 2.84775,-3.50954 6.618,-3.50954 1.50408,0 2.50681,0.762072 1.103,0.842289 1.103,2.286215 z m -2.54693,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84501,0 -3.54964,2.205997 -1.3236,1.704634 -2.04557,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path857"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 204.80502,12.514019 q 0,0.721962 -0.92251,1.704634 -0.36098,0.40109 -6.39739,6.477609 -1.34366,1.283489 -3.7502,3.850467 l 0.36098,0.180491 q 2.72742,1.363707 4.17134,4.411993 0.80218,1.68458 1.48404,1.68458 0.58158,0 1.103,-1.042835 0.54147,-1.042835 1.22332,-1.042835 0.94256,0 0.94256,0.942562 0,1.102999 -1.40381,1.865071 -1.20327,0.641744 -2.4266,0.641744 -1.58431,0 -3.16861,-1.363707 -0.42115,-0.381036 -2.36644,-2.546924 -1.22332,-1.363707 -1.96534,-1.363707 -0.48131,0 -1.12305,0.742017 -0.62169,0.742017 -1.103,0.742017 -0.68185,0 -0.68185,-0.561526 0,-0.4412 1.90518,-2.226052 0.0802,-0.08022 3.32905,-3.369159 1.8049,-1.764797 5.27433,-5.394665 -0.84229,-0.160436 -1.60436,-0.421145 -0.40109,-0.140381 -1.98539,-1.123052 -1.34366,-0.822236 -1.90518,-0.822236 -0.56153,0 -0.94257,0.461254 -0.38103,0.4412 -0.38103,1.002726 0,0.340927 0.34092,0.862344 0.34093,0.501363 0.34093,0.762072 0,0.481308 -0.58158,0.481308 -0.64174,0 -1.103,-0.982671 -0.38103,-0.802181 -0.38103,-1.544198 0,-1.504089 1.12305,-2.647196 1.12305,-1.163162 2.60709,-1.163162 1.20327,0 3.40926,1.24338 2.206,1.223326 3.38922,1.223326 0.70191,0 1.28349,-1.203272 0.58158,-1.203271 1.24338,-1.203271 0.6618,0 0.6618,0.742018 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path859"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 217.6399,14.760125 q 0,3.028232 -3.66997,4.572429 -2.18595,0.902454 -6.29712,1.403817 -0.16044,1.123053 -0.16044,2.145833 0,3.54965 3.46943,3.54965 1.12306,0 2.4266,-1.183217 1.30354,-1.183216 1.22333,-1.183216 0.14038,0 0.46125,0.320872 0.32087,0.300818 0.32087,0.441199 0,0.140382 -0.12032,0.300818 -2.54693,3.429322 -5.89603,3.429322 -2.18595,0 -3.5296,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82769,-8.12208 2.84774,-3.50954 6.61799,-3.50954 1.50409,0 2.50682,0.762072 1.10299,0.842289 1.10299,2.286215 z m -2.54692,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84502,0 -3.54965,2.205997 -1.3236,1.704634 -2.04556,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path861"
-       inkscape:connector-curvature="0" />
-  </svg:g>
-  <svg:path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fa005a;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 16.886254,1.9938812 c -3.910133,-0.022008 -6.9535917,2.245681 -9.0800783,4.662109 -2.0973298,2.383295 -3.833062,5.3337288 -5.6621092,8.9804688 -2.05699735,4.100418 1.0356001,9.111984 5.6230472,9.111328 H 22.208519 c 1.140931,2.016544 2.30672,3.900631 3.666016,5.457031 2.103842,2.40891 5.109808,4.690926 9.011718,4.712891 3.908789,0.02201 6.953047,-2.243435 9.080078,-4.660157 2.097507,-2.383176 3.833076,-5.333755 5.66211,-8.980468 C 51.685439,17.176666 48.59284,12.1651 44.005394,12.165756 H 29.563988 C 28.422971,10.14915 27.258741,8.2650182 25.899925,6.7087242 23.796753,4.2998952 20.789506,2.0158522 16.886254,1.9938812 Z m -0.02344,4.4375 c 2.180149,0.012272 4.038227,1.299637 5.693359,3.1953118 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 a 2.2186407,2.2186407 0 0 0 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 C 27.969301,25.86123 26.721297,23.841706 25.429222,21.46849 A 2.2186407,2.2186407 0 0 0 23.480003,20.310287 H 7.7671137 C 6.2946566,20.310498 5.448665,18.940873 6.1089102,17.62474 7.8599547,14.133521 9.4461247,11.50847 11.138206,9.585677 12.801131,7.6960182 14.689541,6.4191492 16.862816,6.4313812 Z"
-     id="path819"
-     inkscape:connector-curvature="0" />
-  <svg:path
-     inkscape:connector-curvature="0"
-     id="path837"
-     d="m 43.966331,30.257552 c -29.310887,4.106878 -14.655444,2.053439 0,0 z M 16.862814,6.4313812 c 2.180149,0.012272 4.038227,1.299637 5.693359,3.1953118 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 0.388515,0.713988 1.136369,1.158355 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 -1.245075,-1.425619 -2.493079,-3.445143 -3.785154,-5.818359 -0.388515,-0.713988 -1.13637,-1.158355 -1.949219,-1.158203 H 7.7671137 C 6.2946566,20.310498 5.448665,18.940873 6.1089102,17.62474 7.8599547,14.133521 9.4461247,11.50847 11.138206,9.585677 12.801131,7.6960182 14.689541,6.4191492 16.862816,6.4313812 Z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffc500;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     sodipodi:nodetypes="cccsccccscsccccscc" />
-</svg:svg>
diff --git a/static/breezewiki-icon-color.svg b/static/breezewiki-icon-color.svg
deleted file mode 100644
index 5249b75..0000000
--- a/static/breezewiki-icon-color.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg:svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="68.119537"
-   width="68.119537"
-   version="1.1"
-   id="svg912"
-   sodipodi:docname="breezewiki-icon.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   inkscape:export-filename="/tmp/breezewiki-icon.png"
-   inkscape:export-xdpi="721.55511"
-   inkscape:export-ydpi="721.55511">
-  <svg:metadata
-     id="metadata918">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </svg:metadata>
-  <svg:defs
-     id="defs916" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1882"
-     inkscape:window-height="1059"
-     id="namedview914"
-     showgrid="false"
-     showguides="false"
-     inkscape:zoom="8"
-     inkscape:cx="40.321257"
-     inkscape:cy="38.370751"
-     inkscape:window-x="38"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg912"
-     showborder="true"
-     inkscape:pagecheckerboard="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <svg:circle
-     style="opacity:1;fill:#520044;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.75294118;paint-order:stroke fill markers"
-     id="path835"
-     cx="34.059769"
-     cy="34.059769"
-     r="34.059769" />
-  <div
-     id="saka-gui-root">
-    <div>
-      <div>
-        <style />
-      </div>
-    </div>
-  </div>
-  <svg:path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fa005a;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 25.016194,17.638372 c -3.910133,-0.02201 -6.953592,2.245681 -9.080078,4.662109 -2.09733,2.383295 -3.833062,5.333729 -5.662109,8.980469 -2.0569978,4.100418 1.0356,9.111984 5.623047,9.111328 h 14.441405 c 1.140931,2.016544 2.30672,3.900631 3.666016,5.457031 2.103842,2.40891 5.109808,4.690926 9.011718,4.712891 3.908789,0.02201 6.953047,-2.243435 9.080078,-4.660157 2.097507,-2.383176 3.833076,-5.333755 5.66211,-8.980468 2.056998,-4.100418 -1.035601,-9.111984 -5.623047,-9.111328 H 37.693928 c -1.141017,-2.016606 -2.305247,-3.900738 -3.664063,-5.457032 -2.103172,-2.408829 -5.110419,-4.692872 -9.013671,-4.714843 z m -0.02344,4.4375 c 2.180149,0.01227 4.038227,1.299637 5.693359,3.195312 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 a 2.2186407,2.2186407 0 0 0 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 -1.245075,-1.425619 -2.493079,-3.445143 -3.785154,-5.818359 A 2.2186407,2.2186407 0 0 0 31.609943,35.954778 H 15.897054 c -1.472457,2.11e-4 -2.318449,-1.369414 -1.658204,-2.685547 1.751045,-3.491219 3.337215,-6.11627 5.029296,-8.039063 1.662925,-1.889659 3.551335,-3.166528 5.72461,-3.154296 z"
-     id="path819"
-     inkscape:connector-curvature="0" />
-  <svg:path
-     inkscape:connector-curvature="0"
-     id="path837"
-     d="m 52.096271,45.902043 c -29.310887,4.106878 -14.655444,2.053439 0,0 z M 24.992754,22.075872 c 2.180149,0.01227 4.038227,1.299637 5.693359,3.195312 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 0.388515,0.713988 1.136369,1.158355 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 -1.245075,-1.425619 -2.493079,-3.445143 -3.785154,-5.818359 -0.388515,-0.713988 -1.13637,-1.158355 -1.949219,-1.158203 H 15.897054 c -1.472457,2.11e-4 -2.318449,-1.369414 -1.658204,-2.685547 1.751045,-3.491219 3.337215,-6.11627 5.029296,-8.039063 1.662925,-1.889659 3.551335,-3.166528 5.72461,-3.154296 z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffc500;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     sodipodi:nodetypes="cccsccccscsccccscc" />
-</svg:svg>
diff --git a/static/breezewiki-master.svg b/static/breezewiki-master.svg
deleted file mode 100644
index 1119dce..0000000
--- a/static/breezewiki-master.svg
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg:svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="36.41787"
-   width="224.9014"
-   version="1.1"
-   id="svg912"
-   sodipodi:docname="breezewiki-master.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <svg:metadata
-     id="metadata918">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </svg:metadata>
-  <svg:defs
-     id="defs916" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1882"
-     inkscape:window-height="1059"
-     id="namedview914"
-     showgrid="false"
-     showguides="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="123.17581"
-     inkscape:cy="7.7496502"
-     inkscape:window-x="38"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg912"
-     showborder="true"
-     inkscape:pagecheckerboard="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-smooth-nodes="true" />
-  <svg:circle
-     style="opacity:1;fill:#520044;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.75294118;paint-order:stroke fill markers"
-     id="path835"
-     cx="25.929829"
-     cy="18.415277"
-     r="34.059769" />
-  <div
-     id="saka-gui-root">
-    <div>
-      <div>
-        <style />
-      </div>
-    </div>
-  </div>
-  <svg:g
-     aria-label="wiki"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;line-height:2.67644334px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-     id="text926"
-     transform="translate(97.9947,1.1875002)">
-    <svg:path
-       d="m 81.588122,13.020001 q 0,0.08533 0,0.298666 -0.04267,0.256001 -0.04267,0.384001 0,0.128 -0.341333,0.213333 -0.810667,0.170667 -0.981334,0.256 -0.341333,0.170667 -0.725333,0.725333 -0.512,0.725334 -1.237333,2.517334 l -4.480001,11.008 q -0.128,0.298667 -0.725333,0.298667 -0.554667,0 -0.682667,-0.298667 l -3.584,-8.874667 -3.626667,8.874667 q -0.128,0.298667 -0.725333,0.298667 -0.554667,0 -0.682667,-0.298667 L 58.846788,16.561334 q -0.554667,-1.322666 -1.066667,-1.92 -0.469333,-0.64 -1.706667,-0.896 -0.341333,-0.08533 -0.341333,-0.256 v -0.725333 q 0,-0.298667 0.298667,-0.298667 0.896,0 2.474666,0.08533 1.749334,0.08533 2.432,0.08533 0,0 4.821334,0 1.152,0 3.456,-0.08533 2.304,-0.08533 3.456,-0.08533 0.341333,0 0.341333,0.469333 0,0.08533 0,0.298667 -0.04267,0.170667 -0.04267,0.256 0,0.256 -0.981334,0.384 -0.981333,0.128 -0.981333,0.682667 0,0.256 0.128,0.597333 l 3.157333,8.064 2.986667,-7.552 q 0.213333,-0.554666 0.213333,-0.938666 0,-0.554667 -0.810666,-0.682667 -0.810667,-0.128 -0.810667,-0.384 v -0.725334 q 0,-0.298666 0.469333,-0.298666 0.384,0 1.194667,0.128 0.810667,0.08533 1.194667,0.08533 0.426667,0 1.194667,-0.08533 0.768,-0.128 1.024,-0.128 0.64,0 0.64,0.384 z m -13.525334,4.693333 -0.853333,-2.133333 q -0.554667,-1.408 -2.517334,-1.408 h -1.536 q -0.810667,0 -0.810667,0.64 0,0.256 0.128,0.597333 l 3.242667,8.149334 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path842"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 91.700066,5.6813339 q 0,1.1093334 -0.768,1.8773334 -0.768,0.768 -1.877333,0.768 -1.109333,0 -1.877333,-0.768 -0.768,-0.768 -0.768,-1.8773334 0,-1.1093333 0.768,-1.8773334 0.768,-0.768 1.877333,-0.768 1.109333,0 1.877333,0.768 0.768,0.7680001 0.768,1.8773334 z m 1.706667,22.3573341 q 0,0.298667 -0.298667,0.298667 -0.298666,0 -0.298666,0 -1.962667,-0.170667 -3.669334,-0.170667 -1.621333,0 -3.584,0.170667 0,0 -0.170666,0 -0.469334,0 -0.469334,-0.426667 0,-0.08533 0.04267,-0.298667 0,-0.213333 0,-0.298666 0,-0.256 0.853333,-0.384 0.853334,-0.128 1.066667,-0.554667 0.256,-0.469333 0.256,-1.834667 v -6.528 q 0,-1.322667 -0.256,-1.749333 -0.170667,-0.298667 -1.109333,-0.682667 -0.896,-0.384 -0.896,-0.768 0,-0.256 0.128,-0.469333 0.04267,-0.08533 2.858666,-1.194667 2.816,-1.152 3.029334,-1.152 0.341333,0 0.341333,0.341333 v 11.904 q 0,1.749334 0.170667,2.090667 0.256,0.469334 1.109333,0.597334 0.896,0.128 0.896,0.384 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path844"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 114.52672,27.526668 q 0,0.810667 -0.29867,0.810667 -0.59733,0 -1.87733,-0.08533 -1.23733,-0.08533 -1.87733,-0.08533 -0.59734,0 -1.83467,0.08533 -1.19467,0.08533 -1.792,0.08533 -0.384,0 -0.384,-0.469334 0,-0.08533 0.0427,-0.298666 0,-0.170667 0,-0.256 0,-0.256 0.55466,-0.341334 0.59734,-0.128 0.59734,-0.512 0,-0.298666 -0.512,-1.152 l -3.24267,-5.418667 -1.87733,1.408 v 3.2 q 0,1.408001 0.21333,1.877334 0.21333,0.426667 1.152,0.554667 0.81067,0.128 0.81067,0.384 v 0.725333 q 0,0.298667 -0.59734,0.298667 -0.59733,0 -1.83466,-0.08533 -1.19467,-0.08533 -1.792004,-0.08533 -0.597333,0 -1.834667,0.08533 -1.194666,0.08533 -1.792,0.08533 -0.597333,0 -0.597333,-0.426667 v -0.597333 q 0,-0.256 0.853333,-0.384 0.853334,-0.128 1.066667,-0.554667 0.256,-0.469333 0.256,-1.834667 V 6.4920006 q 0,-1.3226667 -0.256,-1.7493334 -0.170667,-0.2986666 -1.109333,-0.6826666 -0.896001,-0.3840001 -0.896001,-0.7680001 0,-0.256 0.128,-0.4693333 0.04267,-0.085333 2.858667,-1.1946667 2.816001,-1.15200005 3.029331,-1.15200005 0.34134,0 0.34134,0.34133334 V 19.718668 q 5.71733,-4.309334 5.71733,-5.290667 0,-0.682667 -1.792,-0.682667 -0.46933,0 -0.46933,-0.512 0,-0.768 0.42666,-0.768 0.55467,0 1.70667,0.08533 1.19467,0.08533 1.74933,0.08533 0.55467,0 1.70667,-0.08533 1.152,-0.08533 1.70667,-0.08533 0.42666,0 0.42666,0.469333 0,0.08533 0,0.298667 -0.0427,0.170667 -0.0427,0.298667 0,0.128 -0.384,0.213333 -0.64,0.08533 -1.83467,0.426667 -0.512,0.213333 -2.048,1.578667 -1.024,0.896 -2.09067,1.834666 l 4.224,6.656 q 1.57867,2.474667 2.60267,2.688001 0.29867,0.04267 0.59733,0.128 0.29867,0.08533 0.29867,0.469333 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path846"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 123.69999,5.6813339 q 0,1.1093334 -0.768,1.8773334 -0.768,0.768 -1.87734,0.768 -1.10933,0 -1.87733,-0.768 -0.768,-0.768 -0.768,-1.8773334 0,-1.1093333 0.768,-1.8773334 0.768,-0.768 1.87733,-0.768 1.10934,0 1.87734,0.768 0.768,0.7680001 0.768,1.8773334 z m 1.70666,22.3573341 q 0,0.298667 -0.29866,0.298667 -0.29867,0 -0.29867,0 -1.96267,-0.170667 -3.66933,-0.170667 -1.62134,0 -3.584,0.170667 0,0 -0.17067,0 -0.46933,0 -0.46933,-0.426667 0,-0.08533 0.0427,-0.298667 0,-0.213333 0,-0.298666 0,-0.256 0.85334,-0.384 0.85333,-0.128 1.06666,-0.554667 0.256,-0.469333 0.256,-1.834667 v -6.528 q 0,-1.322667 -0.256,-1.749333 -0.17066,-0.298667 -1.10933,-0.682667 -0.896,-0.384 -0.896,-0.768 0,-0.256 0.128,-0.469333 0.0427,-0.08533 2.85867,-1.194667 2.816,-1.152 3.02933,-1.152 0.34133,0 0.34133,0.341333 v 11.904 q 0,1.749334 0.17067,2.090667 0.256,0.469334 1.10933,0.597334 0.896,0.128 0.896,0.384 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Alfios;-inkscape-font-specification:'Alfios Bold';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-       id="path848"
-       inkscape:connector-curvature="0" />
-  </svg:g>
-  <svg:g
-     aria-label="breeze"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;line-height:2.57638931px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#252525;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72772277;paint-order:stroke fill markers"
-     id="text930"
-     transform="translate(-69.005304,1.5000002)">
-    <svg:path
-       d="m 162.59026,13.697235 q 0,0.782126 -0.48131,1.363707 -0.46126,0.581581 -1.22333,0.581581 -0.46125,0 -0.92251,-0.421145 -0.44119,-0.421144 -0.80218,-0.421144 -0.16043,0 -0.9225,0.80218 -1.28349,1.323598 -2.68731,3.690031 -1.34365,2.266161 -2.00545,4.111176 -0.48131,1.504089 -1.52414,4.452103 -0.28077,0.701908 -0.80219,0.701908 -0.50136,0 -0.98267,-0.240654 -0.58158,-0.280763 -0.58158,-0.721962 0,-0.180491 0.10028,-0.461254 l 2.52686,-7.259736 q 0.8824,-2.526869 0.8824,-4.111176 0,-1.383761 -0.80218,-1.383761 -1.103,0 -2.08567,1.263434 -0.96261,1.263435 -0.98267,1.263435 -0.14038,0 -0.46125,-0.2206 -0.32087,-0.240654 -0.32087,-0.381036 0,-0.140381 0.0802,-0.280763 0.80218,-1.383762 1.88513,-2.607087 1.50409,-1.664525 2.52687,-1.664525 2.12578,0 2.12578,3.10845 0,1.443925 -0.42115,3.288941 3.9708,-6.4375 6.05647,-6.4375 0.76207,0 1.28348,0.601635 0.54148,0.601636 0.54148,1.383762 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path853"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 148.05073,15.502142 q 0,4.672702 -5.71554,9.485786 -4.25155,3.569704 -7.74104,3.569704 -1.38376,0 -2.24611,-0.661799 -0.96261,-0.721962 -0.96261,-2.065615 0,-0.561526 0.20054,-1.24338 l 5.85592,-20.1748444 q 0.12033,-0.4211449 0.12033,-0.7420171 0,-0.8823988 -1.12305,-1.1832166 -1.12306,-0.3008177 -1.12306,-0.5013629 0,-0.7821262 0.62169,-1.04283489 0.30082,-0.0200545 0.78213,-0.0601636 0.56153,-0.0601635 2.28621,-0.4612539 Q 140.73083,-2.0861626e-7 140.791,-2.0861626e-7 q 0.42114,0 0.42114,0.38103582861626 0,0.18049066 -1.20327,4.33177578 L 136.09824,18.06912 q 5.03368,-6.357282 9.06464,-6.357282 1.34365,0 2.16589,1.263434 0.72196,1.102999 0.72196,2.52687 z m -2.92796,0.200545 q 0,-1.764798 -1.48403,-1.764798 -2.54693,0 -6.05647,4.331776 -3.42932,4.211449 -3.42932,6.83859 0,1.965343 1.36371,1.965343 2.78758,0 6.25701,-4.311721 3.3491,-4.17134 3.3491,-7.05919 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path851"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 175.36498,14.760125 q 0,3.028232 -3.66997,4.572429 -2.18595,0.902454 -6.29712,1.403817 -0.16044,1.123053 -0.16044,2.145833 0,3.54965 3.46943,3.54965 1.12306,0 2.4266,-1.183217 1.30354,-1.183216 1.22332,-1.183216 0.14039,0 0.46126,0.320872 0.32087,0.300818 0.32087,0.441199 0,0.140382 -0.12033,0.300818 -2.54692,3.429322 -5.89602,3.429322 -2.18595,0 -3.5296,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82769,-8.12208 2.84774,-3.50954 6.61799,-3.50954 1.50409,0 2.50681,0.762072 1.103,0.842289 1.103,2.286215 z m -2.54692,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84502,0 -3.54965,2.205997 -1.3236,1.704634 -2.04556,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path855"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 188.96195,14.760125 q 0,3.028232 -3.66998,4.572429 -2.18594,0.902454 -6.29712,1.403817 -0.16043,1.123053 -0.16043,2.145833 0,3.54965 3.46943,3.54965 1.12305,0 2.4266,-1.183217 1.30354,-1.183216 1.22332,-1.183216 0.14038,0 0.46125,0.320872 0.32088,0.300818 0.32088,0.441199 0,0.140382 -0.12033,0.300818 -2.54692,3.429322 -5.89603,3.429322 -2.18594,0 -3.52959,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82768,-8.12208 2.84775,-3.50954 6.618,-3.50954 1.50408,0 2.50681,0.762072 1.103,0.842289 1.103,2.286215 z m -2.54693,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84501,0 -3.54964,2.205997 -1.3236,1.704634 -2.04557,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path857"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 204.80502,12.514019 q 0,0.721962 -0.92251,1.704634 -0.36098,0.40109 -6.39739,6.477609 -1.34366,1.283489 -3.7502,3.850467 l 0.36098,0.180491 q 2.72742,1.363707 4.17134,4.411993 0.80218,1.68458 1.48404,1.68458 0.58158,0 1.103,-1.042835 0.54147,-1.042835 1.22332,-1.042835 0.94256,0 0.94256,0.942562 0,1.102999 -1.40381,1.865071 -1.20327,0.641744 -2.4266,0.641744 -1.58431,0 -3.16861,-1.363707 -0.42115,-0.381036 -2.36644,-2.546924 -1.22332,-1.363707 -1.96534,-1.363707 -0.48131,0 -1.12305,0.742017 -0.62169,0.742017 -1.103,0.742017 -0.68185,0 -0.68185,-0.561526 0,-0.4412 1.90518,-2.226052 0.0802,-0.08022 3.32905,-3.369159 1.8049,-1.764797 5.27433,-5.394665 -0.84229,-0.160436 -1.60436,-0.421145 -0.40109,-0.140381 -1.98539,-1.123052 -1.34366,-0.822236 -1.90518,-0.822236 -0.56153,0 -0.94257,0.461254 -0.38103,0.4412 -0.38103,1.002726 0,0.340927 0.34092,0.862344 0.34093,0.501363 0.34093,0.762072 0,0.481308 -0.58158,0.481308 -0.64174,0 -1.103,-0.982671 -0.38103,-0.802181 -0.38103,-1.544198 0,-1.504089 1.12305,-2.647196 1.12305,-1.163162 2.60709,-1.163162 1.20327,0 3.40926,1.24338 2.206,1.223326 3.38922,1.223326 0.70191,0 1.28349,-1.203272 0.58158,-1.203271 1.24338,-1.203271 0.6618,0 0.6618,0.742018 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path859"
-       inkscape:connector-curvature="0" />
-    <svg:path
-       d="m 217.6399,14.760125 q 0,3.028232 -3.66997,4.572429 -2.18595,0.902454 -6.29712,1.403817 -0.16044,1.123053 -0.16044,2.145833 0,3.54965 3.46943,3.54965 1.12306,0 2.4266,-1.183217 1.30354,-1.183216 1.22333,-1.183216 0.14038,0 0.46125,0.320872 0.32087,0.300818 0.32087,0.441199 0,0.140382 -0.12032,0.300818 -2.54693,3.429322 -5.89603,3.429322 -2.18595,0 -3.5296,-1.544197 -1.28349,-1.46398 -1.28349,-3.669977 0,-4.612539 2.82769,-8.12208 2.84774,-3.50954 6.61799,-3.50954 1.50409,0 2.50682,0.762072 1.10299,0.842289 1.10299,2.286215 z m -2.54692,0.220599 q 0,-1.784852 -1.46398,-1.784852 -1.84502,0 -3.54965,2.205997 -1.3236,1.704634 -2.04556,3.890576 7.05919,-0.822235 7.05919,-4.311721 z"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.07165146px;font-family:Alexander;-inkscape-font-specification:'Alexander Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#252525;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:0.72772277"
-       id="path861"
-       inkscape:connector-curvature="0" />
-  </svg:g>
-  <svg:path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fa005a;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 16.886254,1.9938812 c -3.910133,-0.022008 -6.9535917,2.245681 -9.0800783,4.662109 -2.0973298,2.383295 -3.833062,5.3337288 -5.6621092,8.9804688 -2.05699735,4.100418 1.0356001,9.111984 5.6230472,9.111328 H 22.208519 c 1.140931,2.016544 2.30672,3.900631 3.666016,5.457031 2.103842,2.40891 5.109808,4.690926 9.011718,4.712891 3.908789,0.02201 6.953047,-2.243435 9.080078,-4.660157 2.097507,-2.383176 3.833076,-5.333755 5.66211,-8.980468 C 51.685439,17.176666 48.59284,12.1651 44.005394,12.165756 H 29.563988 C 28.422971,10.14915 27.258741,8.2650182 25.899925,6.7087242 23.796753,4.2998952 20.789506,2.0158522 16.886254,1.9938812 Z m -0.02344,4.4375 c 2.180149,0.012272 4.038227,1.299637 5.693359,3.1953118 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 a 2.2186407,2.2186407 0 0 0 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 C 27.969301,25.86123 26.721297,23.841706 25.429222,21.46849 A 2.2186407,2.2186407 0 0 0 23.480003,20.310287 H 7.7671137 C 6.2946566,20.310498 5.448665,18.940873 6.1089102,17.62474 7.8599547,14.133521 9.4461247,11.50847 11.138206,9.585677 12.801131,7.6960182 14.689541,6.4191492 16.862816,6.4313812 Z"
-     id="path819"
-     inkscape:connector-curvature="0" />
-  <svg:path
-     inkscape:connector-curvature="0"
-     id="path837"
-     d="m 43.966331,30.257552 c -29.310887,4.106878 -14.655444,2.053439 0,0 z M 16.862814,6.4313812 c 2.180149,0.012272 4.038227,1.299637 5.693359,3.1953118 1.245218,1.426187 2.495246,3.44536 3.78711,5.818359 0.388515,0.713988 1.136369,1.158355 1.949218,1.158204 h 15.712891 c 1.472457,-2.11e-4 2.318449,1.369414 1.658203,2.685546 -1.751077,3.491284 -3.337367,6.116702 -5.029297,8.039063 -1.662405,1.888817 -3.551482,3.164578 -5.724609,3.152344 -2.180003,-0.01227 -4.040284,-1.298343 -5.695313,-3.19336 -1.245075,-1.425619 -2.493079,-3.445143 -3.785154,-5.818359 -0.388515,-0.713988 -1.13637,-1.158355 -1.949219,-1.158203 H 7.7671137 C 6.2946566,20.310498 5.448665,18.940873 6.1089102,17.62474 7.8599547,14.133521 9.4461247,11.50847 11.138206,9.585677 12.801131,7.6960182 14.689541,6.4191492 16.862816,6.4313812 Z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffc500;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.72772277;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     sodipodi:nodetypes="cccsccccscsccccscc" />
-</svg:svg>
diff --git a/static/countdown.js b/static/countdown.js
deleted file mode 100644
index ad8d0be..0000000
--- a/static/countdown.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// countdown timer for gacha enthusiasts
-// sample: bandori/wiki/BanG_Dream!_Wikia
-// sample: ensemble-stars/wiki/The_English_Ensemble_Stars_Wiki
-
-import {h, htm, render, signal, computed, effect} from "./preact.js"
-const html = htm.bind(h)
-
-const now = signal(Date.now())
-setInterval(() => now.value = Date.now(), 1000)
-
-const units = [
-	["w", 7*24*60*60*1000],
-	["d", 24*60*60*1000],
-	["h", 60*60*1000],
-	["m", 60*1000],
-	["s", 1000]
-]
-
-function getDisplayTime(datetime, now, or) {
-	let difference = datetime - now
-	let foundSignificantField = false
-	if (difference > 0) {
-		return units.map(([letter, duration], index) => {
-			const multiplier = Math.floor(difference / duration)
-			difference -= multiplier * duration
-			if (multiplier > 0 || foundSignificantField) {
-				foundSignificantField = true
-				return multiplier + letter
-			}
-		}).filter(s => s).join(" ")
-	} else if (or) {
-		return or
-	} else {
-		return `[timer ended on ${new Date(datetime).toLocaleString()}]`
-	}
-}
-
-function Countdown(props) {
-	return html`<span>${props.display}</span>`
-}
-
-document.querySelectorAll(".countdown").forEach(eCountdown => {
-	// grab information and make variables
-	const eDate = eCountdown.querySelector(".countdowndate")
-	const eOr = eCountdown.nextElementSibling
-	const or = eOr?.textContent
-	const datetime = new Date(eDate.textContent).getTime()
-	// the mapped signal
-	const display = computed(() => getDisplayTime(datetime, now.value, or))
-	// clear content and render
-	while (eDate.childNodes[0] !== undefined) eDate.childNodes[0].remove()
-	render(html`<${Countdown} display=${display} />`, eDate);
-})
diff --git a/static/icon-theme-dark.svg b/static/icon-theme-dark.svg
deleted file mode 100644
index bc36ede..0000000
--- a/static/icon-theme-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg fill="currentColor" width="32" height="32" version="1.1" viewBox="0 0 8.46667 8.46667" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -288.533)"><path transform="matrix(.264583 0 0 .264583 0 288.533)" d="m23.0039 3.875-1.31445 2.27344a11 11 0 013.31055 7.85156 11 11 0 01-11 11 11 11 0 01-7.85938-3.30664l-2.26172 1.30859c2.93591 5.08516 8.77013 7.80476 14.5527 6.78516 5.78263-1.01964 10.3378-5.57482 11.3574-11.3574 1.01965-5.7826-1.7-11.6188-6.78516-14.5547z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><circle cx="2.11667" cy="290.65" r=".529167" style="paint-order:stroke fill markers"/><circle cx="1.5875" cy="292.237" r=".529167" style="paint-order:stroke fill markers"/><circle cx="3.70417" cy="290.121" r=".529167" style="paint-order:stroke fill markers"/></g></svg>
diff --git a/static/icon-theme-default.svg b/static/icon-theme-default.svg
deleted file mode 100644
index 4f5655c..0000000
--- a/static/icon-theme-default.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" fill="currentColor" version="1.1" viewBox="0 0 8.46667 8.46667" xmlns="http://www.w3.org/2000/svg"><path d="m4.23242.5295c-2.03949 0-3.70313 1.66559-3.70313 3.70508 0 2.03948 1.66364 3.70312 3.70313 3.70312 2.03949 0 3.70508-1.66364 3.70508-3.70312 0-2.03949-1.66559-3.70508-3.70508-3.70508zm0 1.05859c1.46752 0 2.64648 1.17897 2.64648 2.64649s-1.17896 2.64453-2.64648 2.64453c-1.46752 0-2.64453-1.17701-2.64453-2.64453s1.17701-2.64649 2.64453-2.64649z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m4.23333 2.64583a1.5875 1.5875 0 00-1.495 1.05937h2.99a1.5875 1.5875 0 00-1.495-1.05937zm-1.495 2.11563a1.5875 1.5875 0 001.495 1.05937 1.5875 1.5875 0 001.495-1.05937h-2.99z" style="paint-order:stroke fill markers"/></svg>
diff --git a/static/icon-theme-light.svg b/static/icon-theme-light.svg
deleted file mode 100644
index cc19c3a..0000000
--- a/static/icon-theme-light.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg fill="currentColor" width="32" height="32" version="1.1" viewBox="0 0 8.46667 8.46667" xmlns="http://www.w3.org/2000/svg"><path d="m6.87891 4.23458c1e-7.46447-.121282.92002-.353516 1.32226l.916016.5293c.325095-.56308.496094-1.20137.496094-1.85156z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><circle cx="4.23333" cy="4.234" r="2.11093" style="paint-order:stroke fill markers"/><g shape-rendering="auto"><path d="m5.55695 6.52551c-.402234.23223-.858376.35329-1.32285.35329l-.0003772 1.05794c.650186 0 1.28846-.17106 1.85154-.49615z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m2.91165 6.52543c-.402243-.23223-.737813-.56603-.970048-.96827l-.916389.52865c.325097.56308.794061 1.03129 1.35714 1.35639z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m1.58789 4.23458c-1e-7-.46447.121282-.92198.353516-1.32422l-.916016-.5293c-.325095.56308-.496094 1.20333-.496094 1.85352z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m2.91046 1.94167c.402243-.23224.858389-.35329 1.32285-.35329l-.0005978-1.05964c-.650195 1e-5-1.28847.17106-1.85155.49616z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m5.55547 1.9423c.402243.23223.736121.56504.968351.96728l.916397-.52864c-.325092-.56309-.792372-1.03031-1.35545-1.35541z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-padding:0;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></svg>
diff --git a/static/internal.css b/static/internal.css
index 3ca3d38..3b9a037 100644
--- a/static/internal.css
+++ b/static/internal.css
@@ -24,7 +24,7 @@
     --theme-body-background-color: #286cab;
     --theme-body-background-color--rgb: 40,108,171;
     
-    --theme-body-text-color: #000;
+    --theme-body-text-color: #fff;
     --theme-body-text-color--rgb: 255,255,255;
     --theme-body-text-color--hover: #cccccc;
     --theme-sticky-nav-background-color: #ffffff;
diff --git a/static/main.css b/static/main.css
index 3d3ed5a..0976e72 100644
--- a/static/main.css
+++ b/static/main.css
@@ -8,9 +8,6 @@ pre, code {
     font-family: monospace;
     font-size: 0.85em;
 }
-pre {
-    overflow-x: auto;
-}
 ul, ol {
     list-style-type: initial;
     padding-left: 2em;
@@ -34,8 +31,6 @@ body.skin-fandomdesktop, button, input, textarea, .wikitable, .va-table {
     font-family: "Source Sans Pro", "Segoe UI", sans-serif;
     font-size: 18px;
     line-height: 1.5;
-    margin: 0;
-    padding: 0;
 }
 h1, h2, h3, h4, h5, h6 {
     margin: 1.2em 0 0.6em;
@@ -56,7 +51,7 @@ p {
 .custom-top {
     display: flex;
     flex-wrap: wrap;
-    align-items: center;
+    align-items: baseline;
     justify-content: space-between;
 }
 .page-title {
@@ -72,25 +67,6 @@ p {
     max-width: 240px;
 }
 
-/* global top banner message */
-.bw-top-banner {
-    display: flex;
-    justify-content: space-evenly;
-    align-items: center;
-    background-color: #000;
-    color: #fff;
-    text-align: center;
-    white-space: pre-line;
-    padding: 8px;
-}
-.bw-top-banner a, .bw-top-banner a:visited {
-    color: #ffdd57;
-    text-decoration: underline;
-}
-.bw-top-banner-rainbow {
-    animation: bw-rainbow-color 1.6s linear infinite;
-}
-
 /* custom footer with source and license info */
 .custom-footer {
     clear: both;
@@ -98,7 +74,6 @@ p {
     margin-top: 30px;
     padding-top: 20px;
     border-top: 1px solid var(--theme-page-text-color);
-    word-break: break-word;
 }
 .custom-footer__cols {
     display: grid;
@@ -252,7 +227,6 @@ figcaption, .lightbox-caption, .thumbcaption {
     display: grid;
     grid-template-columns: auto 1fr;
     grid-gap: 0px 5px;
-    align-items: baseline;
 }
 .bw-ss__container {
     grid-column: 2;
@@ -281,9 +255,6 @@ figcaption, .lightbox-caption, .thumbcaption {
 .bw-ss__list--loading {
     background: #c0c0c0;
 }
-.bw-ss__input {
-    width: 100%; /* magically makes it fit the available space */
-}
 .bw-ss__input--accepted {
     background: #fffbc0;
 }
@@ -311,47 +282,6 @@ figcaption, .lightbox-caption, .thumbcaption {
     text-align: left;
 }
 
-/* (breezewiki) theme selector */
-.bw-theme__select {
-    display: grid;
-    grid-template-columns: auto auto;
-    grid-gap: 0px 5px;
-    justify-content: right;
-    align-items: baseline;
-    margin-top: 4px;
-}
-.bw-theme__items {
-    display: flex;
-}
-.bw-theme__item {
-    display: flex;
-    align-items: baseline;
-    padding: 2px;
-    border: 1px solid var(--theme-border-color);
-    border-right-width: 0px;
-    background-color: var(--custom-table-background);
-    color: var(--theme-page-text-color);
-    transition: none;
-}
-.bw-theme__item:hover, .bw-theme__item:focus {
-    /* background-color: var(--theme-page-background-color); */
-    color: var(--theme-accent-color);
-}
-.bw-theme__item:first-child {
-    border-radius: 4px 0px 0px 4px;
-}
-.bw-theme__item:last-child {
-    border-radius: 0px 4px 4px 0px;
-    border-right-width: 1px;
-}
-.bw-theme__item--selected, .bw-theme__item--selected:hover, .bw-theme__item--selected:focus {
-    background-color: var(--theme-accent-color);
-    color: var(--theme-accent-label-color);
-}
-.bw-theme__icon-container svg {
-    vertical-align: middle;
-}
-
 /* nintendo independent wiki alliance notice */
 .niwa__notice {
     background: #fdedd8;
@@ -362,11 +292,8 @@ figcaption, .lightbox-caption, .thumbcaption {
     border-radius: 6px;
     font-size: 18px;
 }
-.niwa__notice--alt {
-    background: #e5fdd8;
-}
 .niwa__header {
-    font-size: max(2.75vw, 26px);
+    font-size: max(2.9vw, 26px);
     margin-top: 0;
 }
 .niwa__notice a {
@@ -430,10 +357,6 @@ figcaption, .lightbox-caption, .thumbcaption {
     .niwa__right {
         display: none;
     }
-    /* remove balloons in top banner */
-    .bw-balloon {
-        display: none;
-    }
 }
 
 @media (min-width: 560px) { /* wider than 560 px */
@@ -449,16 +372,6 @@ figcaption, .lightbox-caption, .thumbcaption {
         width: auto !important;
         text-align: center !important;
     }
-    /* make text content hit the edges of the screen (no space for the background) */
-    .page {
-        margin: 0;
-    }
-    .page__main {
-        background: linear-gradient(to bottom, rgba(var(--theme-page-background-color--rgb), 0), rgba(var(--theme-page-background-color--rgb), 1) 160px);
-    }
-    .page-title {
-        color: var(--theme-body-text-color);
-    }
 }
 
 /* *****
@@ -497,12 +410,3 @@ figcaption, .lightbox-caption, .thumbcaption {
   font-display: swap;
   src: url("/static/source-sans-pro-v21-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2") format("woff2");
 }
-
-@keyframes bw-rainbow-color {
-    0% {
-        filter: hue-rotate(0deg);
-    }
-    100% {
-        filter: hue-rotate(360deg);
-    }
-}
diff --git a/static/robots.txt b/static/robots.txt
index b0e8bf6..6f706c5 100644
--- a/static/robots.txt
+++ b/static/robots.txt
@@ -1,4 +1,3 @@
 User-Agent: *
 Disallow: /*/wiki/*
 Disallow: /proxy
-Disallow: /set-user-settings
diff --git a/static/search-suggestions.js b/static/search-suggestions.js
index e0a32d6..1a9a3d3 100644
--- a/static/search-suggestions.js
+++ b/static/search-suggestions.js
@@ -1,4 +1,4 @@
-import {h, htm, render, signal, computed, effect} from "./preact.js"
+import {h, htm, render, useState, useEffect, createContext, useContext, signal, computed, effect} from "./preact.js"
 const html = htm.bind(h)
 const classNames = classArr => classArr.filter(el => el).join(" ")
 
@@ -64,7 +64,6 @@ render(html`<${SuggestionList} />`, eSuggestions)
 // input view
 
 effect(() => {
-	query.value // dependency should always be tracked
 	if (st.peek() === "accepted") return // lock results from changing during navigation
 	st.value = "loading"
 	fetchSuggestions(query.value).then(res => {
@@ -75,7 +74,7 @@ effect(() => {
 	})
 })
 
-window.addEventListener("pageshow", () => {
+document.addEventListener("pageshow", () => {
 	st.value = "ready" // unlock results from changing after returning to page
 })
 
@@ -89,12 +88,4 @@ render(html`<${SuggestionInput} />`, eInput)
 // form focus
 
 eForm.addEventListener("focusin", () => focus.value = true)
-eForm.addEventListener("focusout", event => {
-	if (eForm.contains(event.relatedTarget)) {
-		// event fired when changing from one form element to the other
-		focus.value = true
-	} else {
-		// event fired when moving out of the form element
-		focus.value = false
-	}
-})
+eForm.addEventListener("focusout", () => focus.value = false)
diff --git a/static/three-balloons.png b/static/three-balloons.png
deleted file mode 100644
index 616d527..0000000
Binary files a/static/three-balloons.png and /dev/null differ