236 files changed, 300 insertions, 112 deletions

diff --git a/.gitignore b/.gitignore
index 087b0b3..5cb2818 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
 *.pub
 homelab-wiki/wiki.env
 homelab-wiki/images/*
-edaweb.conf
+*edaweb.conf
 markdowns/
-static/images/random.jpg
-static/zips/*.zip
+*random.jpg
+*.zip
 .nfs*
 static/images/Thumbs.db
 nitter/nitter.conf
diff --git a/.gitmodules b/.gitmodules
index 1b086ba..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "nitter/nitter"]
-	path = nitter/nitter
-	url = git@github.com:zedeus/nitter.git
-	branch = guest_accounts
diff --git a/Dockerfile b/Dockerfile
index ec1b310..0cda40f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:jammy-20250404
 MAINTAINER Eden Attenborough "eden.attenborough@outlook.com"
 ENV TZ=Europe/London
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -7,5 +7,6 @@ RUN apt-get install -y python3-pip python3-dev build-essential clang libffi-dev
 COPY . /app
 WORKDIR /app
 RUN pip3 install -r requirements.txt
-ENTRYPOINT ["python3"]
-CMD ["app.py", "--production"]
+
+ENTRYPOINT ["bash"]
+CMD ["entrypoint.sh"]
diff --git a/Dockerfile_cron b/Dockerfile_cron
new file mode 100755
index 0000000..dea3208
--- /dev/null
+++ b/Dockerfile_cron
@@ -0,0 +1,11 @@
+FROM reg.reaweb.uk/edaweb
+MAINTAINER Eden Attenborough "eden.attenborough@outlook.com"
+ENV TZ=Europe/London
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN apt-get update -y
+RUN apt-get install -y tmux cron
+
+RUN echo "*/30 * * * * root python3 /app/edaweb/cache.py > /proc/1/fd/1 2>/proc/1/fd/2" > /etc/crontab
+
+ENTRYPOINT ["bash"]
+CMD ["cron_entrypoint.sh"]
diff --git a/cron_entrypoint.sh b/cron_entrypoint.sh
new file mode 100644
index 0000000..2d98169
--- /dev/null
+++ b/cron_entrypoint.sh
@@ -0,0 +1,6 @@
+rm -rvf /app/edaweb/edaweb.conf/
+ln -s /app/edaweb.conf /app/edaweb/edaweb.conf
+printenv | grep -v "no_proxy" >> /etc/environment
+# tmux new-session -d -s "cron" 'cron -f || bash && bash';
+cron -f
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 47c5d5f..01bf365 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
     edaweb:
         build:
@@ -7,13 +6,34 @@ services:
         image: reg.reaweb.uk/edaweb
         volumes:
             - /tmp/:/media/ISOs/
-            - ./static/:/app/static/
+            - ./edaweb/static/:/app/edaweb/static/
             - ./edaweb.conf:/app/edaweb.conf
+            - edaweb-tmp:/tmp/
         ports:
             - "6969:6969"
+        external_links:
+            - mariadb:mysql
+            - transmission_1:transmission
+        mac_address: 44:c8:09:a7:d0:93 
+        networks:
+            db-network:
+            rr-net:
+                ipv4_address: "192.168.23.13"
+        restart: unless-stopped
+
+    edaweb_cron:
+        build:
+            context: .
+            dockerfile: Dockerfile_cron
+        image: reg.reaweb.uk/edaweb_cron
+        volumes:
+            - /tmp/:/media/ISOs/
+            - ./edaweb/static/:/app/edaweb/static/
+            - ./edaweb.conf:/app/edaweb.conf
+            - ./edaweb-docker.pem:/keys/docker-key.pem
+            - edaweb-tmp:/tmp/
         networks:
             - db-network
-            - edaweb-net
         external_links:
             - mariadb:mysql
         restart: unless-stopped
@@ -32,19 +52,19 @@ services:
             - "6970:80"
         networks:
             - db-network
-            - edaweb-net
         external_links:
             - mariadb:mysql
         restart: unless-stopped
 
-networks:
-    edaweb-net:
-        external:
-            name: edaweb-net
+volumes:
+    edaweb-tmp:
 
+networks:
     db-network:
-        external:
-            name: mariadb
+        external: true
+        name: mariadb
+
+    rr-net:
+        external: true
+        name: rr-net
 
-volumes:
-    nitter-redis:
diff --git a/app.py b/edaweb/app.py
index 985bcac..36fe8bb 100755..100644
--- a/app.py
+++ b/edaweb/app.py
@@ -17,7 +17,7 @@ import io
 
 app = flask.Flask(__name__)
 CONFIG = configparser.ConfigParser(interpolation = None)
-CONFIG.read("edaweb.conf")
+CONFIG.read(os.path.join(os.path.dirname(__file__), "edaweb.conf"))
 shown_images = set()
 shown_sidebar_images = set()
 
@@ -64,13 +64,14 @@ def get_template_items(title, db):
 @app.route("/~")
 def index():
     with database.Database() as db:
-        with open(os.path.join("static", "index.md"), "r") as f:
+        with open(os.path.join(os.path.dirname(__file__), "static", "index.md"), "r") as f:
             return flask.render_template(
                 "index.html.j2", 
                 **get_template_items("eden's site :3", db),
+                days_till_ffs = datetime.datetime(2025, 11, 8) - datetime.datetime.now(),
                 markdown = parser.parse_text(f.read())[0],
                 featured_thoughts = db.get_featured_thoughts(),
-                commits = db.get_cached_commits()[:10],
+                commits = services.get_recent_commits(db)[:15],
                 sidebar_img = get_sidebar_img(db)
             )
 
@@ -84,7 +85,7 @@ def serve_services():
         return flask.render_template(
             "services.html.j2",
             **get_template_items("services", db),
-            docker = services.get_all_docker_containers(CONFIG.get("ssh", "docker_key_path")),
+            docker = services.get_all_docker_containers(),
             trans = services.get_torrent_stats(),
             pihole = services.get_pihole_stats()
         )
@@ -142,7 +143,7 @@ def get_thoughts():
 
 @app.route("/img/<filename>")
 def serve_image(filename):
-    imdirpath = os.path.join(".", "static", "images")
+    imdirpath = os.path.join(os.path.dirname(__file__), "static", "images")
     if filename in os.listdir(imdirpath):
         try:
             w = int(flask.request.args['w'])
@@ -184,7 +185,11 @@ def serve_iso_form():
 
 @app.route("/zip/<zipfile>")
 def serve_zip(zipfile):
-    return flask.send_from_directory(os.path.join(".", "static", "zips"), zipfile)
+    return flask.send_from_directory(os.path.join(os.path.dirname(__file__), "static", "zips"), zipfile)
+
+@app.route("/pdf/<pdfname>")
+def serve_pdf(pdfname):
+    return flask.send_from_directory(os.path.join(os.path.dirname(__file__), "static", "papers"), pdfname)
 
 @app.route("/nhdlredirect", methods = ["POST"])
 def redirect_nhdl():
@@ -209,26 +214,26 @@ def get_iso_cd():
             id_ = id_
         )
 
-@app.route("/random")
-def serve_random():
-    try:
-        tags = flask.request.args['tags'].split(" ")
-    except KeyError:
-        flask.abort(400)
-    
-    sbi = services.get_random_image(tags)
-    req = urllib.request.Request(sbi.imurl)
-    mediaContent = urllib.request.urlopen(req).read()
-    with open(os.path.join("static", "images", "random.jpg"), "wb") as f:
-        f.write(mediaContent)
-
-    with database.Database() as db:
-        return flask.render_template(
-            "random.html.j2",
-            **get_template_items("random image", db),
-            sbi = sbi,
-            localimg = "/img/random.jpg?seed=%i" % random.randint(0, 9999)
-        )
+#@app.route("/random")
+#def serve_random():
+#    try:
+#        tags = flask.request.args['tags'].split(" ")
+#    except KeyError:
+#        flask.abort(400)
+#    
+#    sbi = services.get_random_image(tags)
+#    req = urllib.request.Request(sbi.imurl)
+#    mediaContent = urllib.request.urlopen(req).read()
+#    with open(os.path.join(os.path.dirname(__file__), "static", "images", "random.jpg"), "wb") as f:
+#        f.write(mediaContent)
+#
+#    with database.Database() as db:
+#        return flask.render_template(
+#            "random.html.j2",
+#            **get_template_items("random image", db),
+#            sbi = sbi,
+#            localimg = "/img/random.jpg?seed=%i" % random.randint(0, 9999)
+#        )
 
 @app.route("/questions")
 def serve_questions():
diff --git a/edaweb/cache.py b/edaweb/cache.py
new file mode 100644
index 0000000..5b66e43
--- /dev/null
+++ b/edaweb/cache.py
@@ -0,0 +1,18 @@
+import database
+import services
+
+def update_cache():
+    print("Updating cache...")
+    with database.Database() as db:
+        db.update_commit_cache(services.request_recent_commits(since = db.get_last_commit_time()))
+        print("Finished adding github commits...")
+        db.append_qnas(services.scrape_whispa(db.config.get("qnas", "url"), since = db.get_oldest_qna()))
+        print("Finished parsing Q&As...")
+
+    print("Started getting docker information with SSH...")
+    print(services.cache_all_docker_containers(services.CONFIG.get("ssh", "docker_key_path")))
+    print("Finished caching.")
+
+
+if __name__ == "__main__":
+    update_cache()
\ No newline at end of file
diff --git a/database.py b/edaweb/database.py
index cd15cec..c6553a6 100644
--- a/database.py
+++ b/edaweb/database.py
@@ -20,8 +20,11 @@ class Database:
     passwd:str = None
 
     def __enter__(self):
+        config_path = os.path.join(os.path.dirname(__file__), "..", "edaweb.conf")
+        if not os.path.exists(config_path):
+            raise FileNotFoundError("Could not find edaweb.conf config file")
         self.config = configparser.ConfigParser(interpolation = None)
-        self.config.read("edaweb.conf")
+        self.config.read(config_path)
 
         if self.safeLogin:
             self.__connection = pymysql.connect(
@@ -44,7 +47,7 @@ class Database:
 
     def get_header_links(self):
         with self.__connection.cursor() as cursor:
-            cursor.execute("SELECT name, link FROM headerLinks ORDER BY name;")
+            cursor.execute("SELECT name, link FROM headerLinks WHERE display = true ORDER BY name;")
             return cursor.fetchall()
 
     def get_image(self, imageName):
@@ -64,7 +67,7 @@ class Database:
 
     def get_header_articles(self):
         with self.__connection.cursor() as cursor:
-            cursor.execute("SELECT articleName, link FROM headerArticles;")
+            cursor.execute("SELECT articleName, link FROM headerArticles WHERE display = true;")
             return cursor.fetchall()
 
     def get_all_categories(self):
@@ -146,7 +149,6 @@ class Database:
             return [(i[0], "https://%s/%s/status/%d" % (self.config.get("nitter", "outsideurl"), i[2], i[1])) for i in cursor.fetchall()]
 
     def get_cached_commits(self, since = None, recurse = True):
-        threading.Thread(target = update_cache).start()
         with self.__connection.cursor() as cursor:
             if since is not None:
                 cursor.execute("SELECT DISTINCT message, url, commitTime, additions, deletions, total FROM commitCache WHERE commitTime > %s ORDER BY commitTime DESC;", (since, ))
@@ -164,7 +166,7 @@ class Database:
                     urlparse(i[1]).path.split("/")[2], 
                     urlparse(i[1]).path.split("/")[-1]
                 ),
-                "datetime": i[2],
+                "datetime": i[2].timestamp(),
                 "stats": {
                     "additions": i[3],
                     "deletions": i[4],
@@ -243,17 +245,7 @@ class Database:
             cursor.execute("SELECT * FROM qnas;")
             return sorted(cursor.fetchall(), key = operator.itemgetter(2), reverse = True)
 
-def update_cache():
-    print("Updating cache...")
-    with Database() as db:
-        db.update_commit_cache(services.request_recent_commits(since = db.get_last_commit_time()))
-        print("Finished adding github commits...")
-        db.append_qnas(services.scrape_whispa(db.config.get("qnas", "url"), since = db.get_oldest_qna()))
-        print("Finished parsing Q&As...")
 
-
-if __name__ == "__main__":
-    update_cache()
     
 
 
diff --git a/downloader.py b/edaweb/downloader.py
index 4b2af2f..4b2af2f 100755..100644
--- a/downloader.py
+++ b/edaweb/downloader.py
diff --git a/parser.py b/edaweb/parser.py
index a851846..00daf3b 100755..100644
--- a/parser.py
+++ b/edaweb/parser.py
@@ -49,6 +49,14 @@ class EdawebRenderer(mistune.HTMLRenderer):
         return "<h%d id='%s'>%s <a class='header_linker' href='#%s'>[#]</a></h%d>" % (
             level, hash_, text, hash_, level
         )
+    
+    # it would appear that the escape=False option does not work with custom renderers,
+    # so we set it to True and just have these silly function stubs to include them manually
+    def inline_html(self, html):
+        return html
+
+    def block_html(self, html):
+        return html
 
 def get_thought_from_id(db, id_):
     category_name, title, dt, markdown, redirect = db.get_thought(id_)
@@ -64,7 +72,8 @@ def parse_file(path):
 def parse_text(unformatted):
     md = mistune.create_markdown(
         renderer = EdawebRenderer(), 
-        plugins = ["strikethrough", "table", "url", "task_lists", "def_list"]
+        plugins = ["strikethrough", "table", "url", "task_lists", "def_list"],
+        # escape = False
     )
     html = md(unformatted)
     if html == "":
diff --git a/services.py b/edaweb/services.py
index 5fb7d81..bb70d2a 100755..100644
--- a/services.py
+++ b/edaweb/services.py
@@ -15,14 +15,18 @@ import docker
 import random
 import subprocess
 import fabric
+import pickle
 import queue
 import json
 import time
 import os
 
 theLastId = 0
+config_path = os.path.join(os.path.dirname(__file__), "..", "edaweb.conf")
+if not os.path.exists(config_path):
+    raise FileNotFoundError("Could not find edaweb.conf config file")
 CONFIG = configparser.ConfigParser(interpolation = None)
-CONFIG.read("edaweb.conf")
+CONFIG.read(config_path)
 
 def humanbytes(B):
    'Return the given bytes as a human friendly KB, MB, GB, or TB string'
@@ -246,8 +250,19 @@ def parse_tweet(tweet_url):
 
     return dt, replying_to, text, images
 
-def scrape_whispa(whispa_url, since):
-    tree = html.fromstring(requests.get(whispa_url).content.decode())
+def scrape_whispa(whispa_url, since = None):
+    # add a bit of wiggle room in case i don't answer the questions in order (i often do this)
+    if since is None:
+        stop_at = datetime.datetime(year = 2001, month = 8, day = 12)
+    else:
+        stop_at = since - datetime.timedelta(days = 14)
+        print("The newest Q&A timestamp in the database was %s, we will stop looking at %s." % (since.astimezone().isoformat(), stop_at.astimezone().isoformat()))
+
+    html_ = requests.get(whispa_url).content.decode()
+    # with open("temp.html", "w") as f:
+    #     f.write(html_)
+
+    tree = html.fromstring(html_)
     qnas = []
     # we're not doing proper HTML scraping here really... since the site uses client side rendering
     # we rather parse the JS scripts to get the JSON payload of useful information... sadly this looks horrible
@@ -255,18 +270,33 @@ def scrape_whispa(whispa_url, since):
         js = str(script.text)
         if "receivedFeedback" in js:
             # my god this is horrible...
-            for j in json.loads(json.loads(js[19:-1])[1][2:])[0][3]["loadedUser"]["receivedFeedback"]:
-                dt = datetime.datetime.fromisoformat(j["childFeedback"][0]["createdAt"][:-1])
-            
-                qnas.append({
-                    # "id": int(str(maths.modf(maths.log(int(j["id"], 16)))[0])[2:]),
+            parsed_json = json.loads(json.loads(js[19:-1])[1][2:])[0][3]["loadedUser"]["receivedFeedback"]
+            # print(json.dumps(parsed_json, indent = 4))
+            # with open("whispas_%i.json" % i, "w") as f:
+            #     json.dump(parsed_json, f, indent = 4)
+            for j in parsed_json:
+                if j["_count"]["childFeedback"] < 0:
+                    continue
+
+                answer_url = "https://apiv4.whispa.sh/feedbacks/%s/children/public" % j["id"]
+                req = requests.get(answer_url)
+                firstanswer = req.json()["data"][0]
+                dt = datetime.datetime.fromisoformat(firstanswer["createdAt"][:-1])
+
+                qna = {
+                    # "id": int(j["id"], base = 16),
                     "id": int(dt.timestamp()),
-                    "link": None,
+                    "link": answer_url,
                     "datetime": dt,
                     "question": j["content"],
-                    "answer": j["childFeedback"][0]["content"],
+                    "answer": firstanswer["content"],
                     "host": "whispa.sh"
-                })
+                }
+                print(qna)     
+                qnas.append(qna)
+                if dt <= stop_at:
+                    print("Met the threshold for oldest Q&A, so stopped looking.")
+                    break
     return qnas
 
 def get_docker_containers(host, ssh_key_path):
@@ -280,12 +310,23 @@ def get_docker_containers(host, ssh_key_path):
     ).run('docker ps -a -s --format "table {{.Names}};{{.Status}};{{.Image}}"', hide = True)
     return [line.split(";") for line in result.stdout.split("\n")[1:-1]]
 
-def get_all_docker_containers(ssh_key_path):
+def cache_all_docker_containers(ssh_key_path):
     containers = {}
+    containers["containers"] = {}
     for host, name in CONFIG["docker_hosts"].items():
         print(host)
-        containers[(host, name)] = get_docker_containers(host, ssh_key_path)
-    return containers
+        containers["containers"][(host, name)] = get_docker_containers(host, ssh_key_path)
+
+    containers["cachetime"] = "Docker information last updated at %s" % str(datetime.datetime.now())
+    with open("/tmp/docker-cache.json", "wb") as f:
+        pickle.dump(containers, f)
+
+def get_all_docker_containers():
+    if not os.path.exists("/tmp/docker-cache.json"):
+        return {"containers": {}, "cachetime": "No cached docker information"}
+
+    with open("/tmp/docker-cache.json", "rb") as f:
+        return pickle.load(f)
 
 def timeout(func):
     # cant get this to work with queue.Queue() for some reason?
@@ -324,7 +365,7 @@ def get_torrent_stats():
         "Uploaded:": humanbytes(s["cumulative-stats"]["uploadedBytes"]),
         "Active time:": str(datetime.timedelta(seconds = s["cumulative-stats"]["secondsActive"])),
         "Files added:": s["cumulative-stats"]["filesAdded"],
-        "Current upload speed": humanbytes(s["uploadSpeed"]) + "s/S",
+        "Current upload speed:": humanbytes(s["uploadSpeed"]) + "s/S",
         "Current download speed:": humanbytes(s["downloadSpeed"]) + "s/S"
     }
 
@@ -332,17 +373,23 @@ def get_torrent_stats():
 def get_pihole_stats():
     return PiHole.GetSummary(CONFIG.get("pihole", "url"), CONFIG.get("pihole", "key"), True)
 
-if __name__ == "__main__":
-    # print(get_trans_stats())
-
-    #print(scrape_nitter(CONFIG.get("twitter", "diary_account"), 1697430888617840909))
-    # print(scrape_nitter("estrogenizedboy", 1698107440489734640))
+def get_recent_commits(db, max_per_repo = 3):
+    cache = db.get_cached_commits()
+    num_per_repo = {}
+    out = []
+    for commit in cache:
+        if commit["repo"] not in num_per_repo.keys():
+            num_per_repo[commit["repo"]] = 0
 
-    # print(parse_tweet("https://nitter.net/HONMISGENDERER/status/1694231618443981161#m"))
+        num_per_repo[commit["repo"]] += 1
+        if num_per_repo[commit["repo"]] <= max_per_repo:
+            out.append(commit)
 
-    # print(request_recent_commits(since = datetime.datetime.now() - datetime.timedelta(days=30)))
+    return sorted(out, key = lambda a: a["datetime"], reverse = True)
 
-    # print(scrape_whispa(CONFIG.get("qnas", "url"), datetime.datetime.fromtimestamp(0.0)))
-    # print(get_all_docker_containers(os.path.join(os.path.dirname(__file__), "edaweb-docker.pem")))
+if __name__ == "__main__":
+    print(scrape_whispa(CONFIG.get("qnas", "url")))
+    # import database
 
-    print(get_torrent_stats())
+    # with database.Database() as db:
+    #     print(json.dumps(get_recent_commits(db), indent=4))
diff --git a/static/images/0don0t4ofuc41-3776935852.jpg b/edaweb/static/images/0don0t4ofuc41-3776935852.jpg
index f65e951..f65e951 100755..100644
--- a/static/images/0don0t4ofuc41-3776935852.jpg
+++ b/edaweb/static/images/0don0t4ofuc41-3776935852.jpg
diff --git a/static/images/1544552064683.jpg b/edaweb/static/images/1544552064683.jpg
index 20a6527..20a6527 100644
--- a/static/images/1544552064683.jpg
+++ b/edaweb/static/images/1544552064683.jpg
diff --git a/static/images/1549844950404.jpg b/edaweb/static/images/1549844950404.jpg
index 5197c11..5197c11 100644
--- a/static/images/1549844950404.jpg
+++ b/edaweb/static/images/1549844950404.jpg
diff --git a/static/images/1555824429083.png b/edaweb/static/images/1555824429083.png
index 5b2fd0b..5b2fd0b 100644
--- a/static/images/1555824429083.png
+++ b/edaweb/static/images/1555824429083.png
diff --git a/static/images/1555824491105.png b/edaweb/static/images/1555824491105.png
index 2e20fca..2e20fca 100644
--- a/static/images/1555824491105.png
+++ b/edaweb/static/images/1555824491105.png
diff --git a/edaweb/static/images/1583581996540.jpg b/edaweb/static/images/1583581996540.jpg
new file mode 100755
index 0000000..53ceaae
--- /dev/null
+++ b/edaweb/static/images/1583581996540.jpg
diff --git a/static/images/1671540582317176.png b/edaweb/static/images/1671540582317176.png
index dd741d3..dd741d3 100644
--- a/static/images/1671540582317176.png
+++ b/edaweb/static/images/1671540582317176.png
diff --git a/static/images/1urouter.jpg b/edaweb/static/images/1urouter.jpg
index b295e59..b295e59 100755..100644
--- a/static/images/1urouter.jpg
+++ b/edaweb/static/images/1urouter.jpg
diff --git a/static/images/20220401_222149.jpg b/edaweb/static/images/20220401_222149.jpg
index d9fecae..d9fecae 100644
--- a/static/images/20220401_222149.jpg
+++ b/edaweb/static/images/20220401_222149.jpg
diff --git a/edaweb/static/images/20251111_102045.jpg b/edaweb/static/images/20251111_102045.jpg
new file mode 100755
index 0000000..9f4c94b
--- /dev/null
+++ b/edaweb/static/images/20251111_102045.jpg
diff --git a/edaweb/static/images/20251111_102045.png b/edaweb/static/images/20251111_102045.png
new file mode 100755
index 0000000..e7d7700
--- /dev/null
+++ b/edaweb/static/images/20251111_102045.png
diff --git a/edaweb/static/images/2209509307.jpg b/edaweb/static/images/2209509307.jpg
new file mode 100755
index 0000000..1b5d515
--- /dev/null
+++ b/edaweb/static/images/2209509307.jpg
diff --git a/edaweb/static/images/2684330373.jpg b/edaweb/static/images/2684330373.jpg
new file mode 100755
index 0000000..b050888
--- /dev/null
+++ b/edaweb/static/images/2684330373.jpg
diff --git a/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg b/edaweb/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg
index cede48f..cede48f 100644
--- a/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg
+++ b/edaweb/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg
diff --git a/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg b/edaweb/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg
index 1f75924..1f75924 100755..100644
--- a/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg
+++ b/edaweb/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg
diff --git a/static/images/5600x.jpg b/edaweb/static/images/5600x.jpg
index f3995b2..f3995b2 100644
--- a/static/images/5600x.jpg
+++ b/edaweb/static/images/5600x.jpg
diff --git a/static/images/9400t.jpg b/edaweb/static/images/9400t.jpg
index 175e8f1..175e8f1 100755..100644
--- a/static/images/9400t.jpg
+++ b/edaweb/static/images/9400t.jpg
diff --git a/static/images/9400t_cooler.jpg b/edaweb/static/images/9400t_cooler.jpg
index dcfaf27..dcfaf27 100755..100644
--- a/static/images/9400t_cooler.jpg
+++ b/edaweb/static/images/9400t_cooler.jpg
diff --git a/static/images/E1NlPc1X0AEkB-s.png b/edaweb/static/images/E1NlPc1X0AEkB-s.png
index b0be028..b0be028 100755..100644
--- a/static/images/E1NlPc1X0AEkB-s.png
+++ b/edaweb/static/images/E1NlPc1X0AEkB-s.png
diff --git a/static/images/E3xdm-hWYAEADNx.jpg b/edaweb/static/images/E3xdm-hWYAEADNx.jpg
index d14513d..d14513d 100755..100644
--- a/static/images/E3xdm-hWYAEADNx.jpg
+++ b/edaweb/static/images/E3xdm-hWYAEADNx.jpg
diff --git a/static/images/E4WhXAvWYAIFwEa.png b/edaweb/static/images/E4WhXAvWYAIFwEa.png
index 144eb45..144eb45 100755..100644
--- a/static/images/E4WhXAvWYAIFwEa.png
+++ b/edaweb/static/images/E4WhXAvWYAIFwEa.png
diff --git a/static/images/E4cjVaPXEAU83U0.png b/edaweb/static/images/E4cjVaPXEAU83U0.png
index 941a436..941a436 100755..100644
--- a/static/images/E4cjVaPXEAU83U0.png
+++ b/edaweb/static/images/E4cjVaPXEAU83U0.png
diff --git a/static/images/E7ODIBeX0AAivRV.jpg b/edaweb/static/images/E7ODIBeX0AAivRV.jpg
index dc52196..dc52196 100755..100644
--- a/static/images/E7ODIBeX0AAivRV.jpg
+++ b/edaweb/static/images/E7ODIBeX0AAivRV.jpg
diff --git a/static/images/E7ODIZEWUAMQjty.jpg b/edaweb/static/images/E7ODIZEWUAMQjty.jpg
index 2e90eda..2e90eda 100755..100644
--- a/static/images/E7ODIZEWUAMQjty.jpg
+++ b/edaweb/static/images/E7ODIZEWUAMQjty.jpg
diff --git a/static/images/E7ODIv0WUAUp-ad.jpg b/edaweb/static/images/E7ODIv0WUAUp-ad.jpg
index 97e704e..97e704e 100755..100644
--- a/static/images/E7ODIv0WUAUp-ad.jpg
+++ b/edaweb/static/images/E7ODIv0WUAUp-ad.jpg
diff --git a/static/images/E7ODJELX0AAVqna.jpg b/edaweb/static/images/E7ODJELX0AAVqna.jpg
index eedfb14..eedfb14 100755..100644
--- a/static/images/E7ODJELX0AAVqna.jpg
+++ b/edaweb/static/images/E7ODJELX0AAVqna.jpg
diff --git a/static/images/EbmVCYKWkAAwXKW.jpg b/edaweb/static/images/EbmVCYKWkAAwXKW.jpg
index 20b3a19..20b3a19 100755..100644
--- a/static/images/EbmVCYKWkAAwXKW.jpg
+++ b/edaweb/static/images/EbmVCYKWkAAwXKW.jpg
diff --git a/edaweb/static/images/Ffi1ducXEAArXDg.jpg b/edaweb/static/images/Ffi1ducXEAArXDg.jpg
new file mode 100644
index 0000000..5c31cc5
--- /dev/null
+++ b/edaweb/static/images/Ffi1ducXEAArXDg.jpg
diff --git a/static/images/GGBDzuSXMAA1Ktk.jpg b/edaweb/static/images/GGBDzuSXMAA1Ktk.jpg
index 35e04e1..35e04e1 100644
--- a/static/images/GGBDzuSXMAA1Ktk.jpg
+++ b/edaweb/static/images/GGBDzuSXMAA1Ktk.jpg
diff --git a/static/images/GSxGe_rXQAAgEhj.jpg b/edaweb/static/images/GSxGe_rXQAAgEhj.jpg
index 0351920..0351920 100644
--- a/static/images/GSxGe_rXQAAgEhj.jpg
+++ b/edaweb/static/images/GSxGe_rXQAAgEhj.jpg
diff --git a/static/images/GTq-GOgWQAErvCp.jpg b/edaweb/static/images/GTq-GOgWQAErvCp.jpg
index 6a2f7b4..6a2f7b4 100644
--- a/static/images/GTq-GOgWQAErvCp.jpg
+++ b/edaweb/static/images/GTq-GOgWQAErvCp.jpg
diff --git a/edaweb/static/images/GZhgzaK.png b/edaweb/static/images/GZhgzaK.png
new file mode 100755
index 0000000..c73e8b4
--- /dev/null
+++ b/edaweb/static/images/GZhgzaK.png
diff --git a/static/images/GcyexeCW0AAYssz.jpg b/edaweb/static/images/GcyexeCW0AAYssz.jpg
index c0762a8..c0762a8 100644
--- a/static/images/GcyexeCW0AAYssz.jpg
+++ b/edaweb/static/images/GcyexeCW0AAYssz.jpg
diff --git a/edaweb/static/images/GegzRla.png b/edaweb/static/images/GegzRla.png
new file mode 100755
index 0000000..cf12555
--- /dev/null
+++ b/edaweb/static/images/GegzRla.png
diff --git a/static/images/IMG_-g4wqat.jpg b/edaweb/static/images/IMG_-g4wqat.jpg
index 9f05aaf..9f05aaf 100755..100644
--- a/static/images/IMG_-g4wqat.jpg
+++ b/edaweb/static/images/IMG_-g4wqat.jpg
diff --git a/static/images/IMG_1602.jpg b/edaweb/static/images/IMG_1602.jpg
index d1937fb..d1937fb 100644
--- a/static/images/IMG_1602.jpg
+++ b/edaweb/static/images/IMG_1602.jpg
diff --git a/static/images/IMG_1603.jpg b/edaweb/static/images/IMG_1603.jpg
index 4d3e8c1..4d3e8c1 100644
--- a/static/images/IMG_1603.jpg
+++ b/edaweb/static/images/IMG_1603.jpg
diff --git a/static/images/IMG_1604.jpg b/edaweb/static/images/IMG_1604.jpg
index 4cc82c3..4cc82c3 100644
--- a/static/images/IMG_1604.jpg
+++ b/edaweb/static/images/IMG_1604.jpg
diff --git a/static/images/IMG_1605.jpg b/edaweb/static/images/IMG_1605.jpg
index 38d6770..38d6770 100644
--- a/static/images/IMG_1605.jpg
+++ b/edaweb/static/images/IMG_1605.jpg
diff --git a/static/images/IMG_1606.jpg b/edaweb/static/images/IMG_1606.jpg
index fcbe2a4..fcbe2a4 100644
--- a/static/images/IMG_1606.jpg
+++ b/edaweb/static/images/IMG_1606.jpg
diff --git a/static/images/IMG_1607.jpg b/edaweb/static/images/IMG_1607.jpg
index 825e338..825e338 100644
--- a/static/images/IMG_1607.jpg
+++ b/edaweb/static/images/IMG_1607.jpg
diff --git a/static/images/IMG_1609.jpg b/edaweb/static/images/IMG_1609.jpg
index 6b7d834..6b7d834 100644
--- a/static/images/IMG_1609.jpg
+++ b/edaweb/static/images/IMG_1609.jpg
diff --git a/static/images/IMG_1610.jpg b/edaweb/static/images/IMG_1610.jpg
index d201596..d201596 100644
--- a/static/images/IMG_1610.jpg
+++ b/edaweb/static/images/IMG_1610.jpg
diff --git a/static/images/IMG_1611.jpg b/edaweb/static/images/IMG_1611.jpg
index 9eb1af5..9eb1af5 100644
--- a/static/images/IMG_1611.jpg
+++ b/edaweb/static/images/IMG_1611.jpg
diff --git a/static/images/IMG_1612.jpg b/edaweb/static/images/IMG_1612.jpg
index f176c17..f176c17 100644
--- a/static/images/IMG_1612.jpg
+++ b/edaweb/static/images/IMG_1612.jpg
diff --git a/static/images/IMG_1613.png b/edaweb/static/images/IMG_1613.png
index 63b743a..63b743a 100644
--- a/static/images/IMG_1613.png
+++ b/edaweb/static/images/IMG_1613.png
diff --git a/static/images/IMG_1614.png b/edaweb/static/images/IMG_1614.png
index 349afb7..349afb7 100644
--- a/static/images/IMG_1614.png
+++ b/edaweb/static/images/IMG_1614.png
diff --git a/static/images/IMG_1615.jpg b/edaweb/static/images/IMG_1615.jpg
index da42a2b..da42a2b 100644
--- a/static/images/IMG_1615.jpg
+++ b/edaweb/static/images/IMG_1615.jpg
diff --git a/static/images/IMG_1616.jpg b/edaweb/static/images/IMG_1616.jpg
index 6f83c38..6f83c38 100644
--- a/static/images/IMG_1616.jpg
+++ b/edaweb/static/images/IMG_1616.jpg
diff --git a/static/images/IMG_1617.jpg b/edaweb/static/images/IMG_1617.jpg
index 7528c7d..7528c7d 100644
--- a/static/images/IMG_1617.jpg
+++ b/edaweb/static/images/IMG_1617.jpg
diff --git a/static/images/IMG_1618.jpg b/edaweb/static/images/IMG_1618.jpg
index 9b82ea1..9b82ea1 100644
--- a/static/images/IMG_1618.jpg
+++ b/edaweb/static/images/IMG_1618.jpg
diff --git a/static/images/IMG_1619.jpg b/edaweb/static/images/IMG_1619.jpg
index ccae28a..ccae28a 100644
--- a/static/images/IMG_1619.jpg
+++ b/edaweb/static/images/IMG_1619.jpg
diff --git a/static/images/IMG_1620.jpg b/edaweb/static/images/IMG_1620.jpg
index 54e92d6..54e92d6 100644
--- a/static/images/IMG_1620.jpg
+++ b/edaweb/static/images/IMG_1620.jpg
diff --git a/static/images/IMG_1621.jpg b/edaweb/static/images/IMG_1621.jpg
index 5aebae0..5aebae0 100644
--- a/static/images/IMG_1621.jpg
+++ b/edaweb/static/images/IMG_1621.jpg
diff --git a/static/images/IMG_1622.jpg b/edaweb/static/images/IMG_1622.jpg
index 56cc9c3..56cc9c3 100644
--- a/static/images/IMG_1622.jpg
+++ b/edaweb/static/images/IMG_1622.jpg
diff --git a/static/images/IMG_1623.jpg b/edaweb/static/images/IMG_1623.jpg
index 43d0107..43d0107 100644
--- a/static/images/IMG_1623.jpg
+++ b/edaweb/static/images/IMG_1623.jpg
diff --git a/static/images/IMG_1624.png b/edaweb/static/images/IMG_1624.png
index 4fd690f..4fd690f 100644
--- a/static/images/IMG_1624.png
+++ b/edaweb/static/images/IMG_1624.png
diff --git a/static/images/IMG_1625.jpg b/edaweb/static/images/IMG_1625.jpg
index 496a7fa..496a7fa 100644
--- a/static/images/IMG_1625.jpg
+++ b/edaweb/static/images/IMG_1625.jpg
diff --git a/static/images/IMG_1626.jpg b/edaweb/static/images/IMG_1626.jpg
index 90060fb..90060fb 100644
--- a/static/images/IMG_1626.jpg
+++ b/edaweb/static/images/IMG_1626.jpg
diff --git a/static/images/IMG_1627.jpg b/edaweb/static/images/IMG_1627.jpg
index 90c4f49..90c4f49 100644
--- a/static/images/IMG_1627.jpg
+++ b/edaweb/static/images/IMG_1627.jpg
diff --git a/static/images/IMG_1628.jpg b/edaweb/static/images/IMG_1628.jpg
index f2cc8c6..f2cc8c6 100644
--- a/static/images/IMG_1628.jpg
+++ b/edaweb/static/images/IMG_1628.jpg
diff --git a/static/images/IMG_1629.jpg b/edaweb/static/images/IMG_1629.jpg
index b19b03e..b19b03e 100644
--- a/static/images/IMG_1629.jpg
+++ b/edaweb/static/images/IMG_1629.jpg
diff --git a/static/images/IMG_1630.jpg b/edaweb/static/images/IMG_1630.jpg
index ddef77b..ddef77b 100644
--- a/static/images/IMG_1630.jpg
+++ b/edaweb/static/images/IMG_1630.jpg
diff --git a/static/images/IMG_1632.jpg b/edaweb/static/images/IMG_1632.jpg
index 070615a..070615a 100644
--- a/static/images/IMG_1632.jpg
+++ b/edaweb/static/images/IMG_1632.jpg
diff --git a/static/images/IMG_1633.jpg b/edaweb/static/images/IMG_1633.jpg
index 6fa7ae8..6fa7ae8 100644
--- a/static/images/IMG_1633.jpg
+++ b/edaweb/static/images/IMG_1633.jpg
diff --git a/static/images/IMG_1636.jpg b/edaweb/static/images/IMG_1636.jpg
index a3de5ad..a3de5ad 100644
--- a/static/images/IMG_1636.jpg
+++ b/edaweb/static/images/IMG_1636.jpg
diff --git a/static/images/IMG_1637.jpg b/edaweb/static/images/IMG_1637.jpg
index 8e6b489..8e6b489 100644
--- a/static/images/IMG_1637.jpg
+++ b/edaweb/static/images/IMG_1637.jpg
diff --git a/static/images/IMG_1638.jpg b/edaweb/static/images/IMG_1638.jpg
index b9ca9f3..b9ca9f3 100644
--- a/static/images/IMG_1638.jpg
+++ b/edaweb/static/images/IMG_1638.jpg
diff --git a/static/images/IMG_1639.jpg b/edaweb/static/images/IMG_1639.jpg
index 5695e58..5695e58 100644
--- a/static/images/IMG_1639.jpg
+++ b/edaweb/static/images/IMG_1639.jpg
diff --git a/static/images/IMG_1640.jpg b/edaweb/static/images/IMG_1640.jpg
index df3eaea..df3eaea 100644
--- a/static/images/IMG_1640.jpg
+++ b/edaweb/static/images/IMG_1640.jpg
diff --git a/static/images/IMG_1641.jpg b/edaweb/static/images/IMG_1641.jpg
index ce2eddb..ce2eddb 100644
--- a/static/images/IMG_1641.jpg
+++ b/edaweb/static/images/IMG_1641.jpg
diff --git a/static/images/IMG_20210422_212009.jpg b/edaweb/static/images/IMG_20210422_212009.jpg
index a8337c4..a8337c4 100755..100644
--- a/static/images/IMG_20210422_212009.jpg
+++ b/edaweb/static/images/IMG_20210422_212009.jpg
diff --git a/static/images/IMG_20210824_175000.jpg b/edaweb/static/images/IMG_20210824_175000.jpg
index 216c617..216c617 100755..100644
--- a/static/images/IMG_20210824_175000.jpg
+++ b/edaweb/static/images/IMG_20210824_175000.jpg
diff --git a/static/images/IMG_20220809_172130442_HDR.jpg b/edaweb/static/images/IMG_20220809_172130442_HDR.jpg
index e1987f8..e1987f8 100755..100644
--- a/static/images/IMG_20220809_172130442_HDR.jpg
+++ b/edaweb/static/images/IMG_20220809_172130442_HDR.jpg
diff --git a/static/images/IMG_20220811_133224877_HDR.jpg b/edaweb/static/images/IMG_20220811_133224877_HDR.jpg
index eb05b1b..eb05b1b 100755..100644
--- a/static/images/IMG_20220811_133224877_HDR.jpg
+++ b/edaweb/static/images/IMG_20220811_133224877_HDR.jpg
diff --git a/static/images/IMG_20220811_133224877_HDR_crop.jpg b/edaweb/static/images/IMG_20220811_133224877_HDR_crop.jpg
index 7bc63ba..7bc63ba 100755..100644
--- a/static/images/IMG_20220811_133224877_HDR_crop.jpg
+++ b/edaweb/static/images/IMG_20220811_133224877_HDR_crop.jpg
diff --git a/static/images/IMG_20220812_112838125_HDR.jpg b/edaweb/static/images/IMG_20220812_112838125_HDR.jpg
index 6e56a49..6e56a49 100755..100644
--- a/static/images/IMG_20220812_112838125_HDR.jpg
+++ b/edaweb/static/images/IMG_20220812_112838125_HDR.jpg
diff --git a/static/images/IMG_20220823_154457137_HDR.jpg b/edaweb/static/images/IMG_20220823_154457137_HDR.jpg
index b46f0fe..b46f0fe 100755..100644
--- a/static/images/IMG_20220823_154457137_HDR.jpg
+++ b/edaweb/static/images/IMG_20220823_154457137_HDR.jpg
diff --git a/static/images/IMG_20221023_163821542.jpg b/edaweb/static/images/IMG_20221023_163821542.jpg
index f2284df..f2284df 100755..100644
--- a/static/images/IMG_20221023_163821542.jpg
+++ b/edaweb/static/images/IMG_20221023_163821542.jpg
diff --git a/static/images/IMG_20230812_132400733_HDR.jpg b/edaweb/static/images/IMG_20230812_132400733_HDR.jpg
index 9f46bdc..9f46bdc 100755..100644
--- a/static/images/IMG_20230812_132400733_HDR.jpg
+++ b/edaweb/static/images/IMG_20230812_132400733_HDR.jpg
diff --git a/static/images/IMG_20230812_132632784_HDR.jpg b/edaweb/static/images/IMG_20230812_132632784_HDR.jpg
index 82060d1..82060d1 100755..100644
--- a/static/images/IMG_20230812_132632784_HDR.jpg
+++ b/edaweb/static/images/IMG_20230812_132632784_HDR.jpg
diff --git a/edaweb/static/images/JwL2S2V.png b/edaweb/static/images/JwL2S2V.png
new file mode 100755
index 0000000..9394c56
--- /dev/null
+++ b/edaweb/static/images/JwL2S2V.png
diff --git a/edaweb/static/images/PXL_20250314_150055804.jpg b/edaweb/static/images/PXL_20250314_150055804.jpg
new file mode 100644
index 0000000..b660e18
--- /dev/null
+++ b/edaweb/static/images/PXL_20250314_150055804.jpg
diff --git a/edaweb/static/images/PXL_20251108_063442686.MP.jpg b/edaweb/static/images/PXL_20251108_063442686.MP.jpg
new file mode 100755
index 0000000..86171bb
--- /dev/null
+++ b/edaweb/static/images/PXL_20251108_063442686.MP.jpg
diff --git a/static/images/Screenshot_20210520-221830.png b/edaweb/static/images/Screenshot_20210520-221830.png
index 33afee7..33afee7 100755..100644
--- a/static/images/Screenshot_20210520-221830.png
+++ b/edaweb/static/images/Screenshot_20210520-221830.png
diff --git a/static/images/Screenshot_20210527_122432.png b/edaweb/static/images/Screenshot_20210527_122432.png
index 33432ff..33432ff 100755..100644
--- a/static/images/Screenshot_20210527_122432.png
+++ b/edaweb/static/images/Screenshot_20210527_122432.png
diff --git a/static/images/Screenshot_20210620-144127.png b/edaweb/static/images/Screenshot_20210620-144127.png
index dd9b43a..dd9b43a 100755..100644
--- a/static/images/Screenshot_20210620-144127.png
+++ b/edaweb/static/images/Screenshot_20210620-144127.png
diff --git a/static/images/Screenshot_20210620-231652.png b/edaweb/static/images/Screenshot_20210620-231652.png
index 5e2532d..5e2532d 100755..100644
--- a/static/images/Screenshot_20210620-231652.png
+++ b/edaweb/static/images/Screenshot_20210620-231652.png
diff --git a/static/images/Screenshot_20210727-072303.png b/edaweb/static/images/Screenshot_20210727-072303.png
index 7c03644..7c03644 100755..100644
--- a/static/images/Screenshot_20210727-072303.png
+++ b/edaweb/static/images/Screenshot_20210727-072303.png
diff --git a/static/images/Screenshot_20210727-072344.png b/edaweb/static/images/Screenshot_20210727-072344.png
index 248644a..248644a 100755..100644
--- a/static/images/Screenshot_20210727-072344.png
+++ b/edaweb/static/images/Screenshot_20210727-072344.png
diff --git a/static/images/Screenshot_20210727-223004.png b/edaweb/static/images/Screenshot_20210727-223004.png
index dbe0630..dbe0630 100755..100644
--- a/static/images/Screenshot_20210727-223004.png
+++ b/edaweb/static/images/Screenshot_20210727-223004.png
diff --git a/static/images/Screenshot_20210731-181223.png b/edaweb/static/images/Screenshot_20210731-181223.png
index b1547be..b1547be 100755..100644
--- a/static/images/Screenshot_20210731-181223.png
+++ b/edaweb/static/images/Screenshot_20210731-181223.png
diff --git a/static/images/Screenshot_20210731-181229.png b/edaweb/static/images/Screenshot_20210731-181229.png
index 363c17b..363c17b 100755..100644
--- a/static/images/Screenshot_20210731-181229.png
+++ b/edaweb/static/images/Screenshot_20210731-181229.png
diff --git a/static/images/Screenshot_20210811-125853.png b/edaweb/static/images/Screenshot_20210811-125853.png
index 7d45240..7d45240 100755..100644
--- a/static/images/Screenshot_20210811-125853.png
+++ b/edaweb/static/images/Screenshot_20210811-125853.png
diff --git a/static/images/Screenshot_20210818-203828.png b/edaweb/static/images/Screenshot_20210818-203828.png
index 8026a0c..8026a0c 100755..100644
--- a/static/images/Screenshot_20210818-203828.png
+++ b/edaweb/static/images/Screenshot_20210818-203828.png
diff --git a/static/images/Screenshot_20210825-131938.png b/edaweb/static/images/Screenshot_20210825-131938.png
index 4b16443..4b16443 100755..100644
--- a/static/images/Screenshot_20210825-131938.png
+++ b/edaweb/static/images/Screenshot_20210825-131938.png
diff --git a/static/images/Startech.jpg b/edaweb/static/images/Startech.jpg
index ba7f02f..ba7f02f 100644
--- a/static/images/Startech.jpg
+++ b/edaweb/static/images/Startech.jpg
diff --git a/static/images/a4-5000.jpg b/edaweb/static/images/a4-5000.jpg
index f26fd66..f26fd66 100755..100644
--- a/static/images/a4-5000.jpg
+++ b/edaweb/static/images/a4-5000.jpg
diff --git a/edaweb/static/images/aLvcFjj.png b/edaweb/static/images/aLvcFjj.png
new file mode 100755
index 0000000..c928ba7
--- /dev/null
+++ b/edaweb/static/images/aLvcFjj.png
diff --git a/static/images/aaaaahh.jpg b/edaweb/static/images/aaaaahh.jpg
index 8dac9d4..8dac9d4 100755..100644
--- a/static/images/aaaaahh.jpg
+++ b/edaweb/static/images/aaaaahh.jpg
diff --git a/static/images/anti_nft_b.png b/edaweb/static/images/anti_nft_b.png
index 61dfb99..61dfb99 100644
--- a/static/images/anti_nft_b.png
+++ b/edaweb/static/images/anti_nft_b.png
diff --git a/static/images/arenas.jpg b/edaweb/static/images/arenas.jpg
index 2b2cac6..2b2cac6 100644
--- a/static/images/arenas.jpg
+++ b/edaweb/static/images/arenas.jpg
diff --git a/static/images/basil.jpg b/edaweb/static/images/basil.jpg
index c63ba48..c63ba48 100755..100644
--- a/static/images/basil.jpg
+++ b/edaweb/static/images/basil.jpg
diff --git a/edaweb/static/images/bdd_fuel.png b/edaweb/static/images/bdd_fuel.png
new file mode 100755
index 0000000..e79522e
--- /dev/null
+++ b/edaweb/static/images/bdd_fuel.png
diff --git a/static/images/bigshark.png b/edaweb/static/images/bigshark.png
index a499fb1..a499fb1 100755..100644
--- a/static/images/bigshark.png
+++ b/edaweb/static/images/bigshark.png
diff --git a/static/images/bob.gif b/edaweb/static/images/bob.gif
index 90b6dd5..90b6dd5 100755..100644
--- a/static/images/bob.gif
+++ b/edaweb/static/images/bob.gif
diff --git a/static/images/braindamage.png b/edaweb/static/images/braindamage.png
index c26e75f..c26e75f 100755..100644
--- a/static/images/braindamage.png
+++ b/edaweb/static/images/braindamage.png
diff --git a/static/images/catonlap.jpg b/edaweb/static/images/catonlap.jpg
index 37e526b..37e526b 100644
--- a/static/images/catonlap.jpg
+++ b/edaweb/static/images/catonlap.jpg
diff --git a/static/images/chuddy.jpg b/edaweb/static/images/chuddy.jpg
index 7d732f7..7d732f7 100644
--- a/static/images/chuddy.jpg
+++ b/edaweb/static/images/chuddy.jpg
diff --git a/edaweb/static/images/cloudfree.png b/edaweb/static/images/cloudfree.png
new file mode 100644
index 0000000..71c6ff2
--- /dev/null
+++ b/edaweb/static/images/cloudfree.png
diff --git a/static/images/embedded_img2.png b/edaweb/static/images/embedded_img2.png
index 3eeea56..3eeea56 100755..100644
--- a/static/images/embedded_img2.png
+++ b/edaweb/static/images/embedded_img2.png
diff --git a/static/images/embedded_img3.png b/edaweb/static/images/embedded_img3.png
index 2a55742..2a55742 100755..100644
--- a/static/images/embedded_img3.png
+++ b/edaweb/static/images/embedded_img3.png
diff --git a/static/images/embedded_img4.png b/edaweb/static/images/embedded_img4.png
index 5e6ec6d..5e6ec6d 100755..100644
--- a/static/images/embedded_img4.png
+++ b/edaweb/static/images/embedded_img4.png
diff --git a/static/images/embedded_img5.PNG b/edaweb/static/images/embedded_img5.PNG
index c96d284..c96d284 100755..100644
--- a/static/images/embedded_img5.PNG
+++ b/edaweb/static/images/embedded_img5.PNG
diff --git a/static/images/face.jpg b/edaweb/static/images/face.jpg
index b123e53..b123e53 100755..100644
--- a/static/images/face.jpg
+++ b/edaweb/static/images/face.jpg
diff --git a/static/images/first_server.jpg b/edaweb/static/images/first_server.jpg
index 8f537d7..8f537d7 100755..100644
--- a/static/images/first_server.jpg
+++ b/edaweb/static/images/first_server.jpg
diff --git a/static/images/fstab.png b/edaweb/static/images/fstab.png
index 6acaa83..6acaa83 100755..100644
--- a/static/images/fstab.png
+++ b/edaweb/static/images/fstab.png
diff --git a/static/images/graduation.jpg b/edaweb/static/images/graduation.jpg
index 89bafd7..89bafd7 100644
--- a/static/images/graduation.jpg
+++ b/edaweb/static/images/graduation.jpg
diff --git a/static/images/greenboi.jpg b/edaweb/static/images/greenboi.jpg
index 7761c8a..7761c8a 100755..100644
--- a/static/images/greenboi.jpg
+++ b/edaweb/static/images/greenboi.jpg
diff --git a/static/images/hpkvm_puttyconf.png b/edaweb/static/images/hpkvm_puttyconf.png
index 5e9852f..5e9852f 100755..100644
--- a/static/images/hpkvm_puttyconf.png
+++ b/edaweb/static/images/hpkvm_puttyconf.png
diff --git a/static/images/hpkvm_serialconf.png b/edaweb/static/images/hpkvm_serialconf.png
index 76122c1..76122c1 100755..100644
--- a/static/images/hpkvm_serialconf.png
+++ b/edaweb/static/images/hpkvm_serialconf.png
diff --git a/static/images/i5-1145G7.png b/edaweb/static/images/i5-1145G7.png
index 96b6fa3..96b6fa3 100644
--- a/static/images/i5-1145G7.png
+++ b/edaweb/static/images/i5-1145G7.png
diff --git a/edaweb/static/images/iKVCEoy.png b/edaweb/static/images/iKVCEoy.png
new file mode 100755
index 0000000..05d6d70
--- /dev/null
+++ b/edaweb/static/images/iKVCEoy.png
diff --git a/static/images/icons.png b/edaweb/static/images/icons.png
index 4f19e72..4f19e72 100755..100644
--- a/static/images/icons.png
+++ b/edaweb/static/images/icons.png
diff --git a/static/images/ioporn.jpg b/edaweb/static/images/ioporn.jpg
index 6608d31..6608d31 100755..100644
--- a/static/images/ioporn.jpg
+++ b/edaweb/static/images/ioporn.jpg
diff --git a/static/images/its_true_1.jpg b/edaweb/static/images/its_true_1.jpg
index 3dddfb3..3dddfb3 100755..100644
--- a/static/images/its_true_1.jpg
+++ b/edaweb/static/images/its_true_1.jpg
diff --git a/static/images/its_true_2.jpg b/edaweb/static/images/its_true_2.jpg
index b532a21..b532a21 100755..100644
--- a/static/images/its_true_2.jpg
+++ b/edaweb/static/images/its_true_2.jpg
diff --git a/static/images/j1800.jpg b/edaweb/static/images/j1800.jpg
index 05db3a6..05db3a6 100755..100644
--- a/static/images/j1800.jpg
+++ b/edaweb/static/images/j1800.jpg
diff --git a/static/images/j5040.jpg b/edaweb/static/images/j5040.jpg
index 1a24299..1a24299 100755..100644
--- a/static/images/j5040.jpg
+++ b/edaweb/static/images/j5040.jpg
diff --git a/static/images/j5040_server.jpg b/edaweb/static/images/j5040_server.jpg
index 9e2f3aa..9e2f3aa 100755..100644
--- a/static/images/j5040_server.jpg
+++ b/edaweb/static/images/j5040_server.jpg
diff --git a/static/images/kvm_1.png b/edaweb/static/images/kvm_1.png
index fa05b15..fa05b15 100755..100644
--- a/static/images/kvm_1.png
+++ b/edaweb/static/images/kvm_1.png
diff --git a/static/images/kvm_2.png b/edaweb/static/images/kvm_2.png
index 6fca0f8..6fca0f8 100755..100644
--- a/static/images/kvm_2.png
+++ b/edaweb/static/images/kvm_2.png
diff --git a/static/images/lackrack1.jpg b/edaweb/static/images/lackrack1.jpg
index 31c4f9d..31c4f9d 100755..100644
--- a/static/images/lackrack1.jpg
+++ b/edaweb/static/images/lackrack1.jpg
diff --git a/static/images/lackrack2.jpg b/edaweb/static/images/lackrack2.jpg
index 9fda7d8..9fda7d8 100755..100644
--- a/static/images/lackrack2.jpg
+++ b/edaweb/static/images/lackrack2.jpg
diff --git a/static/images/libreboot.jpg b/edaweb/static/images/libreboot.jpg
index 0bac72e..0bac72e 100755..100644
--- a/static/images/libreboot.jpg
+++ b/edaweb/static/images/libreboot.jpg
diff --git a/static/images/liostore.png b/edaweb/static/images/liostore.png
index 43003ee..43003ee 100755..100644
--- a/static/images/liostore.png
+++ b/edaweb/static/images/liostore.png
diff --git a/static/images/media_E9lTIldWUAEeT63.jpg b/edaweb/static/images/media_E9lTIldWUAEeT63.jpg
index b30195a..b30195a 100755..100644
--- a/static/images/media_E9lTIldWUAEeT63.jpg
+++ b/edaweb/static/images/media_E9lTIldWUAEeT63.jpg
diff --git a/static/images/media_FPus_2aXsAUhCu9.jpg b/edaweb/static/images/media_FPus_2aXsAUhCu9.jpg
index 398fadd..398fadd 100755..100644
--- a/static/images/media_FPus_2aXsAUhCu9.jpg
+++ b/edaweb/static/images/media_FPus_2aXsAUhCu9.jpg
diff --git a/static/images/media_FRlRqYKXoAIw82O.jpg b/edaweb/static/images/media_FRlRqYKXoAIw82O.jpg
index b45a62b..b45a62b 100755..100644
--- a/static/images/media_FRlRqYKXoAIw82O.jpg
+++ b/edaweb/static/images/media_FRlRqYKXoAIw82O.jpg
diff --git a/static/images/media_FeP_m8FXEAAqcJs.jpg b/edaweb/static/images/media_FeP_m8FXEAAqcJs.jpg
index f3afe10..f3afe10 100755..100644
--- a/static/images/media_FeP_m8FXEAAqcJs.jpg
+++ b/edaweb/static/images/media_FeP_m8FXEAAqcJs.jpg
diff --git a/static/images/media_FfcNNZ2WYAAz97v.jpg b/edaweb/static/images/media_FfcNNZ2WYAAz97v.jpg
index 8ae39ad..8ae39ad 100755..100644
--- a/static/images/media_FfcNNZ2WYAAz97v.jpg
+++ b/edaweb/static/images/media_FfcNNZ2WYAAz97v.jpg
diff --git a/static/images/media_FlBsMq2XwAATJX5.jpg b/edaweb/static/images/media_FlBsMq2XwAATJX5.jpg
index 7ba3ef1..7ba3ef1 100644
--- a/static/images/media_FlBsMq2XwAATJX5.jpg
+++ b/edaweb/static/images/media_FlBsMq2XwAATJX5.jpg
diff --git a/static/images/media_FlBsfDcWQAQhJdP.jpg b/edaweb/static/images/media_FlBsfDcWQAQhJdP.jpg
index 601dfbe..601dfbe 100644
--- a/static/images/media_FlBsfDcWQAQhJdP.jpg
+++ b/edaweb/static/images/media_FlBsfDcWQAQhJdP.jpg
diff --git a/static/images/minecraft.png b/edaweb/static/images/minecraft.png
index 19210d2..19210d2 100755..100644
--- a/static/images/minecraft.png
+++ b/edaweb/static/images/minecraft.png
diff --git a/static/images/new_switch_opened.jpg b/edaweb/static/images/new_switch_opened.jpg
index df797ed..df797ed 100755..100644
--- a/static/images/new_switch_opened.jpg
+++ b/edaweb/static/images/new_switch_opened.jpg
diff --git a/static/images/newdiscord.jpg b/edaweb/static/images/newdiscord.jpg
index d446602..d446602 100755..100644
--- a/static/images/newdiscord.jpg
+++ b/edaweb/static/images/newdiscord.jpg
diff --git a/static/images/nicfan.jpg b/edaweb/static/images/nicfan.jpg
index 6c2415e..6c2415e 100755..100644
--- a/static/images/nicfan.jpg
+++ b/edaweb/static/images/nicfan.jpg
diff --git a/static/images/notstolenvalour4.png b/edaweb/static/images/notstolenvalour4.png
index f9e82e2..f9e82e2 100644
--- a/static/images/notstolenvalour4.png
+++ b/edaweb/static/images/notstolenvalour4.png
diff --git a/static/images/notstolenvalour5.png b/edaweb/static/images/notstolenvalour5.png
index 87c09da..87c09da 100644
--- a/static/images/notstolenvalour5.png
+++ b/edaweb/static/images/notstolenvalour5.png
diff --git a/edaweb/static/images/notstolenvalour8.png b/edaweb/static/images/notstolenvalour8.png
new file mode 100644
index 0000000..dcddf27
--- /dev/null
+++ b/edaweb/static/images/notstolenvalour8.png
diff --git a/static/images/oldpic.png b/edaweb/static/images/oldpic.png
index 20314e4..20314e4 100755..100644
--- a/static/images/oldpic.png
+++ b/edaweb/static/images/oldpic.png
diff --git a/static/images/pfsenseswissvpnportforwards.png b/edaweb/static/images/pfsenseswissvpnportforwards.png
index 34c05dc..34c05dc 100644
--- a/static/images/pfsenseswissvpnportforwards.png
+++ b/edaweb/static/images/pfsenseswissvpnportforwards.png
diff --git a/static/images/photo_2022-12-07_14-06-03.jpg b/edaweb/static/images/photo_2022-12-07_14-06-03.jpg
index 224b748..224b748 100755..100644
--- a/static/images/photo_2022-12-07_14-06-03.jpg
+++ b/edaweb/static/images/photo_2022-12-07_14-06-03.jpg
diff --git a/edaweb/static/images/photo_2025-12-04_22-34-24.jpg b/edaweb/static/images/photo_2025-12-04_22-34-24.jpg
new file mode 100755
index 0000000..51ced37
--- /dev/null
+++ b/edaweb/static/images/photo_2025-12-04_22-34-24.jpg
diff --git a/static/images/photo_5857106224099739202_y.jpg b/edaweb/static/images/photo_5857106224099739202_y.jpg
index c0a5820..c0a5820 100644
--- a/static/images/photo_5857106224099739202_y.jpg
+++ b/edaweb/static/images/photo_5857106224099739202_y.jpg
diff --git a/static/images/powerani.gif b/edaweb/static/images/powerani.gif
index 1eb1a18..1eb1a18 100644
--- a/static/images/powerani.gif
+++ b/edaweb/static/images/powerani.gif
diff --git a/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg b/edaweb/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg
index 775d4e9..775d4e9 100755..100644
--- a/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg
+++ b/edaweb/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg
diff --git a/edaweb/static/images/rOJXmjG.png b/edaweb/static/images/rOJXmjG.png
new file mode 100755
index 0000000..58a4ae4
--- /dev/null
+++ b/edaweb/static/images/rOJXmjG.png
diff --git a/static/images/rack1.jpg b/edaweb/static/images/rack1.jpg
index b5049e9..b5049e9 100755..100644
--- a/static/images/rack1.jpg
+++ b/edaweb/static/images/rack1.jpg
diff --git a/static/images/rack2.jpg b/edaweb/static/images/rack2.jpg
index 1c9bc11..1c9bc11 100755..100644
--- a/static/images/rack2.jpg
+++ b/edaweb/static/images/rack2.jpg
diff --git a/static/images/router.jpg b/edaweb/static/images/router.jpg
index 587f0e0..587f0e0 100755..100644
--- a/static/images/router.jpg
+++ b/edaweb/static/images/router.jpg
diff --git a/static/images/russian_isp.png b/edaweb/static/images/russian_isp.png
index 5b529c0..5b529c0 100755..100644
--- a/static/images/russian_isp.png
+++ b/edaweb/static/images/russian_isp.png
diff --git a/static/images/russian_isp_abuse.png b/edaweb/static/images/russian_isp_abuse.png
index 96da244..96da244 100755..100644
--- a/static/images/russian_isp_abuse.png
+++ b/edaweb/static/images/russian_isp_abuse.png
diff --git a/static/images/russian_nginx_logs.jpg b/edaweb/static/images/russian_nginx_logs.jpg
index 3fe22d3..3fe22d3 100755..100644
--- a/static/images/russian_nginx_logs.jpg
+++ b/edaweb/static/images/russian_nginx_logs.jpg
diff --git a/static/images/russian_yt.jpg b/edaweb/static/images/russian_yt.jpg
index 16f3767..16f3767 100755..100644
--- a/static/images/russian_yt.jpg
+++ b/edaweb/static/images/russian_yt.jpg
diff --git a/static/images/s-l1600.jpg b/edaweb/static/images/s-l1600.jpg
index 34a82cf..34a82cf 100755..100644
--- a/static/images/s-l1600.jpg
+++ b/edaweb/static/images/s-l1600.jpg
diff --git a/static/images/s-l16001.jpg b/edaweb/static/images/s-l16001.jpg
index 0c34348..0c34348 100755..100644
--- a/static/images/s-l16001.jpg
+++ b/edaweb/static/images/s-l16001.jpg
diff --git a/static/images/s-l500.jpg b/edaweb/static/images/s-l500.jpg
index 92307ff..92307ff 100755..100644
--- a/static/images/s-l500.jpg
+++ b/edaweb/static/images/s-l500.jpg
diff --git a/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg b/edaweb/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg
index b146bc4..b146bc4 100644
--- a/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg
+++ b/edaweb/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg
diff --git a/static/images/selfie.jpg b/edaweb/static/images/selfie.jpg
index 17730e8..17730e8 100755..100644
--- a/static/images/selfie.jpg
+++ b/edaweb/static/images/selfie.jpg
diff --git a/static/images/server.jpg b/edaweb/static/images/server.jpg
index 50bc1d7..50bc1d7 100755..100644
--- a/static/images/server.jpg
+++ b/edaweb/static/images/server.jpg
diff --git a/static/images/server2.jpg b/edaweb/static/images/server2.jpg
index dda70b1..dda70b1 100755..100644
--- a/static/images/server2.jpg
+++ b/edaweb/static/images/server2.jpg
diff --git a/static/images/shark1.jpg b/edaweb/static/images/shark1.jpg
index 394846c..394846c 100755..100644
--- a/static/images/shark1.jpg
+++ b/edaweb/static/images/shark1.jpg
diff --git a/static/images/shark2.jpg b/edaweb/static/images/shark2.jpg
index 2c432cd..2c432cd 100755..100644
--- a/static/images/shark2.jpg
+++ b/edaweb/static/images/shark2.jpg
diff --git a/static/images/shark3.jpg b/edaweb/static/images/shark3.jpg
index 5343254..5343254 100755..100644
--- a/static/images/shark3.jpg
+++ b/edaweb/static/images/shark3.jpg
diff --git a/static/images/shark3.png b/edaweb/static/images/shark3.png
index 22e8ff9..22e8ff9 100755..100644
--- a/static/images/shark3.png
+++ b/edaweb/static/images/shark3.png
diff --git a/edaweb/static/images/shun-hashimoto-mio-chibana.gif b/edaweb/static/images/shun-hashimoto-mio-chibana.gif
new file mode 100644
index 0000000..869793f
--- /dev/null
+++ b/edaweb/static/images/shun-hashimoto-mio-chibana.gif
diff --git a/static/images/sicp.jpg b/edaweb/static/images/sicp.jpg
index 575a456..575a456 100755..100644
--- a/static/images/sicp.jpg
+++ b/edaweb/static/images/sicp.jpg
diff --git a/static/images/startech_rack_1.jpg b/edaweb/static/images/startech_rack_1.jpg
index 1f66734..1f66734 100755..100644
--- a/static/images/startech_rack_1.jpg
+++ b/edaweb/static/images/startech_rack_1.jpg
diff --git a/static/images/startech_rack_2.jpg b/edaweb/static/images/startech_rack_2.jpg
index 47f9aac..47f9aac 100755..100644
--- a/static/images/startech_rack_2.jpg
+++ b/edaweb/static/images/startech_rack_2.jpg
diff --git a/static/images/stolenvalour.jpg b/edaweb/static/images/stolenvalour.jpg
index d666623..d666623 100644
--- a/static/images/stolenvalour.jpg
+++ b/edaweb/static/images/stolenvalour.jpg
diff --git a/static/images/sun.gif b/edaweb/static/images/sun.gif
index 674e32a..674e32a 100755..100644
--- a/static/images/sun.gif
+++ b/edaweb/static/images/sun.gif
diff --git a/static/images/switch.jpg b/edaweb/static/images/switch.jpg
index 64ab20c..64ab20c 100755..100644
--- a/static/images/switch.jpg
+++ b/edaweb/static/images/switch.jpg
diff --git a/static/images/switches.jpg b/edaweb/static/images/switches.jpg
index 8b56651..8b56651 100755..100644
--- a/static/images/switches.jpg
+++ b/edaweb/static/images/switches.jpg
diff --git a/static/images/t30.jpg b/edaweb/static/images/t30.jpg
index 949d14b..949d14b 100755..100644
--- a/static/images/t30.jpg
+++ b/edaweb/static/images/t30.jpg
diff --git a/static/images/techdome.jpg b/edaweb/static/images/techdome.jpg
index 74fe69c..74fe69c 100644
--- a/static/images/techdome.jpg
+++ b/edaweb/static/images/techdome.jpg
diff --git a/static/images/telegrampic.jpg b/edaweb/static/images/telegrampic.jpg
index ddadb8b..ddadb8b 100755..100644
--- a/static/images/telegrampic.jpg
+++ b/edaweb/static/images/telegrampic.jpg
diff --git a/static/images/telegrampic2.jpg b/edaweb/static/images/telegrampic2.jpg
index 8b306ff..8b306ff 100755..100644
--- a/static/images/telegrampic2.jpg
+++ b/edaweb/static/images/telegrampic2.jpg
diff --git a/static/images/testimonials.PNG b/edaweb/static/images/testimonials.PNG
index 8584cdd..8584cdd 100755..100644
--- a/static/images/testimonials.PNG
+++ b/edaweb/static/images/testimonials.PNG
diff --git a/static/images/theNVMEVault.png b/edaweb/static/images/theNVMEVault.png
index 2cf31d7..2cf31d7 100755..100644
--- a/static/images/theNVMEVault.png
+++ b/edaweb/static/images/theNVMEVault.png
diff --git a/static/images/twitterpic.jpg b/edaweb/static/images/twitterpic.jpg
index 57f16b4..57f16b4 100755..100644
--- a/static/images/twitterpic.jpg
+++ b/edaweb/static/images/twitterpic.jpg
diff --git a/edaweb/static/images/v2Yfoou.jpg b/edaweb/static/images/v2Yfoou.jpg
new file mode 100755
index 0000000..f3a3249
--- /dev/null
+++ b/edaweb/static/images/v2Yfoou.jpg
diff --git a/static/images/vcss-blue.gif b/edaweb/static/images/vcss-blue.gif
index c373b2a..c373b2a 100755..100644
--- a/static/images/vcss-blue.gif
+++ b/edaweb/static/images/vcss-blue.gif
diff --git a/static/images/www.gif b/edaweb/static/images/www.gif
index 48fbd13..48fbd13 100644
--- a/static/images/www.gif
+++ b/edaweb/static/images/www.gif
diff --git a/edaweb/static/images/wxbKYVv.png b/edaweb/static/images/wxbKYVv.png
new file mode 100755
index 0000000..75feb10
--- /dev/null
+++ b/edaweb/static/images/wxbKYVv.png
diff --git a/static/images/x200.jpg b/edaweb/static/images/x200.jpg
index d7e48eb..d7e48eb 100755..100644
--- a/static/images/x200.jpg
+++ b/edaweb/static/images/x200.jpg
diff --git a/static/images/xeon.jpg b/edaweb/static/images/xeon.jpg
index 4b1eef9..4b1eef9 100755..100644
--- a/static/images/xeon.jpg
+++ b/edaweb/static/images/xeon.jpg
diff --git a/static/images/xeon_motherboard.jpg b/edaweb/static/images/xeon_motherboard.jpg
index a17819f..a17819f 100755..100644
--- a/static/images/xeon_motherboard.jpg
+++ b/edaweb/static/images/xeon_motherboard.jpg
diff --git a/static/index.md b/edaweb/static/index.md
index 39bbc7c..0d45f12 100755..100644
--- a/static/index.md
+++ b/edaweb/static/index.md
@@ -1,15 +1,11 @@
-![(you)s](/img/braindamage.png)
-
 site now also avaliable under the domain [boymoder.blog](https://boymoder.blog)!
 
+![yaoi](/img/shun-hashimoto-mio-chibana.gif)
+
 ## haiiiiiii
-my name is eden and im a 23yo (boymoder) computer science/robotics PhD student. i made my own website to encourage others to do so too.
+my name is eden and im a 23yo (boymoder/[fujoshi](https://www.urbandictionary.com/define.php?term=fujoshi)) computer science/robotics PhD student. i made my own website to encourage others to do so too.
 i'll post my thoughts on here sometimes, and use this site to link to other stuff i host [more about me](/thought?id=2).
 
-[click here for a random image of lio fotia](/random?tags=lio_fotia)
-
-[click here for a random KawoShin image](/random?tags=nagisa_kaworu+ikari_shinji+yaoi)
-
 ## FOSS alternative services
 
 - [nextcloud - dropbox (+ much more!) alternative](https://nc.eda.gay)
@@ -25,6 +21,9 @@ these sites are hosted on my [homelab system](https://wiki.eda.gay)
 
 ## nice websites
 - [wiby.me](http://wiby.me/) - search engine for old style websites with limited javascript (my site used to be on here but it got blacklisted for some reason?)
+- [dysmorph.nekoweb.org](https://dysmorph.nekoweb.org/) - a site that is very based because it looks similar
+- [transsexual.org](https://web.archive.org/web/20010802032136/http://transsexual.org/Toon.html) - awesome and relatable transsexual comics from a website that's slightly older than me
+- [norfolkchurches.co.uk](http://www.norfolkchurches.co.uk/norwichintro.htm) - site about all the churches in norwich (and norfolk!), the city that has far too many medieval churches than it knows what to do with. this site is preciesly what the internet should be, the muted ramblings of someone with an expert knowledge on his preferred niche interest. without any javascript. nice if, like me, you have a middling interest in theology
 - [boymoder.network](https://boymoder.network/) - website for boymoder awareness
 - [4chan.org/lgbt/](https://boards.4channel.org/lgbt/) - but dont blame me if u catch brainworms
 - [https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html](https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html) any website with a URL like this is gonna be good
diff --git a/edaweb/static/papers/aai.pdf b/edaweb/static/papers/aai.pdf
new file mode 100644
index 0000000..af2223b
--- /dev/null
+++ b/edaweb/static/papers/aai.pdf
diff --git a/edaweb/static/papers/ar2.pdf b/edaweb/static/papers/ar2.pdf
new file mode 100644
index 0000000..2b1693f
--- /dev/null
+++ b/edaweb/static/papers/ar2.pdf
diff --git a/edaweb/static/robots.txt b/edaweb/static/robots.txt
new file mode 100644
index 0000000..04154e9
--- /dev/null
+++ b/edaweb/static/robots.txt
@@ -0,0 +1,7 @@
+User-agent: *

+Allow: /

+User-agent: Googlebot-Image

+Disallow: *

+User-agent: *

+Disallow: /random*

+ 

diff --git a/static/style.css b/edaweb/static/style.css
index 6069ebf..6069ebf 100755..100644
--- a/static/style.css
+++ b/edaweb/static/style.css
diff --git a/templates/diary.html.j2 b/edaweb/templates/diary.html.j2
index f6604f7..f6604f7 100755..100644
--- a/templates/diary.html.j2
+++ b/edaweb/templates/diary.html.j2
diff --git a/templates/discord.html.j2 b/edaweb/templates/discord.html.j2
index 597fb4b..597fb4b 100755..100644
--- a/templates/discord.html.j2
+++ b/edaweb/templates/discord.html.j2
diff --git a/templates/index.html.j2 b/edaweb/templates/index.html.j2
index 53ca77e..d6c08d8 100755..100644
--- a/templates/index.html.j2
+++ b/edaweb/templates/index.html.j2
@@ -1,6 +1,7 @@
 {% extends "template.html.j2" %}
 {% block content %}
     <aside>
+        <a><i>{{ "%d days until FFS" % days_till_ffs.days }}</i></a>
         <section id="recent_thoughts">
             <h4>recent thoughts:</h4>
             <ul>
diff --git a/templates/isocd.html.j2 b/edaweb/templates/isocd.html.j2
index 3c532c0..3c532c0 100755..100644
--- a/templates/isocd.html.j2
+++ b/edaweb/templates/isocd.html.j2
diff --git a/templates/isocd_confirmation.html.j2 b/edaweb/templates/isocd_confirmation.html.j2
index 81045a8..81045a8 100755..100644
--- a/templates/isocd_confirmation.html.j2
+++ b/edaweb/templates/isocd_confirmation.html.j2
diff --git a/templates/nhdl.html.j2 b/edaweb/templates/nhdl.html.j2
index 5ab62c2..5ab62c2 100755..100644
--- a/templates/nhdl.html.j2
+++ b/edaweb/templates/nhdl.html.j2
diff --git a/templates/questions.html.j2 b/edaweb/templates/questions.html.j2
index eb58380..eb58380 100644
--- a/templates/questions.html.j2
+++ b/edaweb/templates/questions.html.j2
diff --git a/templates/random.html.j2 b/edaweb/templates/random.html.j2
index 76b433b..76b433b 100755..100644
--- a/templates/random.html.j2
+++ b/edaweb/templates/random.html.j2
diff --git a/templates/services.html.j2 b/edaweb/templates/services.html.j2
index 9c9e5ec..9f42c7f 100755..100644
--- a/templates/services.html.j2
+++ b/edaweb/templates/services.html.j2
@@ -4,7 +4,7 @@
     <section id=docker>
         <h2>docker</h2>
         <ul>
-            {% for host, containers in docker.items() %}
+            {% for host, containers in docker["containers"].items() %}
                 <h4>{{ "%s - %s" % (host[0], host[1]) }}</h4>
                 <table>
                     {% for name, status, image in containers %}
@@ -21,6 +21,7 @@
                 </table>
             {% endfor %}
         </ul>
+        <p>{{ docker["cachetime"] }}</p>
     </section>
 
     <section id="torrents">
diff --git a/templates/template.html.j2 b/edaweb/templates/template.html.j2
index 1c9e99e..86618bc 100755..100644
--- a/templates/template.html.j2
+++ b/edaweb/templates/template.html.j2
@@ -67,6 +67,7 @@
                     <img src="/img/www.gif">
                     <img src="/img/bob.gif">
                     <img src="/img/sun.gif">
+                    <img src="/img/cloudfree.png">
                 </div>
                 <iframe src="https://john.citrons.xyz/embed?ref=eda.gay" style="padding-top:20px;margin-left:auto;display:block;margin-right:auto;max-width:732px;width:100%;height:94px;border:none;"></iframe>
             </footer>
diff --git a/templates/thought.html.j2 b/edaweb/templates/thought.html.j2
index 2a5b519..2a5b519 100755..100644
--- a/templates/thought.html.j2
+++ b/edaweb/templates/thought.html.j2
diff --git a/templates/thoughts.html.j2 b/edaweb/templates/thoughts.html.j2
index bf06f57..bf06f57 100755..100644
--- a/templates/thoughts.html.j2
+++ b/edaweb/templates/thoughts.html.j2
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 0000000..f8664f0
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,5 @@
+rm -rvf /app/edaweb/edaweb.conf/
+ln -s /app/edaweb.conf /app/edaweb/edaweb.conf
+printenv | grep -v "no_proxy" >> /etc/environment
+#tmux new-session -d -s "cron" 'cron -f || bash && bash';
+python3 /app/edaweb/app.py --production
diff --git a/ffs.md b/ffs.md
new file mode 100644
index 0000000..9e8f981
--- /dev/null
+++ b/ffs.md
@@ -0,0 +1,69 @@
+![lobotomy](/img/photo_2025-12-04_22-34-24.jpg)
+
+Quite a lot of people have asked me questions about my FFS experience, so I don't have to repeat myself,
+I write this detailed post about how it went for me, the questions to ask, and the recovery process etc.
+
+Once I'm more healed up I will consider adding before/after pictures, but for now there are no pictures.
+
+## Selecting your surgeon and what procedures to get
+
+For me, I was raised on transgender imageboards where surgeons are openly discussed, where people know
+every single FFS surgeon in the world, call them by their first name, and have opinions on every single
+one of them. It's almost funny that there is this group of people, who are extremely famous to this tiny
+niche audience. But for those of us who are unfamiliar with surgeons, and who don't know what to look for
+in their results, this section describes your options.
+
+I consider there to be three categories of surgeons:
+
+1. Big-name American surgeons who also do midface (maxillofacial/double jaw surgery work)
+2. European surgeons, and local (state-level/no-name) American surgeons
+3. South American surgeons
+
+With price reducing proportionally for each category. American surgeons are generally significantly more
+expensive, since the assumption is that they're being paid for by insurance. The top level surgeons
+could cost you $80-100k, and are thus basically out of reach unless you have an America-tier salary or an
+American insurance plan who agrees to pay for it. 
+
+If you're American, you can probably afford to shop round, and choose your surgeon in accordance to the results
+you like, but the rest of us (me) had to dictate their choice by budget. I knew my only real choice was to
+go to a European surgeon, but my personal choices are discussed later.
+
+How do you decide if a surgeon's results are good? I think most of us have an implicit, subconcious, vibes-based impression of facial sexual dimorphism, but if you're like me and spent too much time on /lgbt/, we can get more specific on the features that define how we are gendered.
+
+![skullzie](/img/1583581996540.jpg?h=400&w=5000)
+
+I wish I could use a real human face instead of a skull, but I feel weird about using someone else's picture,
+so for now a skull will do. In this picture above, we basically can't help A and E, unless we find some way of
+shrinking the brain, and C doesn't matter imo, but FFS surgery aims to fix the bone-based deviations of the others:
+
+- Orbitoplasty fixes B, by shaving down the orbital bones, which really help bring out the eyes, it is normally done in conjunciton with a frontoplasty
+- V-line genioplasty (right) and mandible angle contouring (left) fixes D, and is imo one of the most important procedures. A genioplasty shifts round bones and re-attaches them with metal plates, other times if chin projection doesn't need to be changed, surgeons simply just remove and cut away mandible bone, thus making a 'V' shape instead of a 'U' shape. The incision is made inside the mouth, at the gumline and thus their is no visible scar.
+
+![mandible angle contouring](/img/2684330373.jpg?h=400&w=400) ![v line (narrowing) genioplasty](/img/2209509307.jpg?h=400&w=400)
+
+- Frontoplasty reduces the browbone, which is especially obvious in profile. This can either consist of just shaving down the bone, or can be *Type-3 forehead construction* for cases in which there is a cavity/sinus in the browbone, in this case the bone above the sinus is removed completely, shaved down, and then reinserted and set with metalwork. The way this is achieved is rather scary- the incision is made at the hairline (some surgeons also do a "coronal" incision, in which the incision is made at the top of the head), and the skin is pulled almost as down as the eyes to expose the browbone. See the below pictures.
+
+![spoopy](/img/20251111_102045.jpg)
+
+- Not discussed by the top image, but important nonetheless is *midface*, by which I mean overall face length. Some tgirls can look uncanny if they get other aspects of their face fixed, but leave the midface untouched. It can be fixed with orthadontic techniques, like *Le Fort* by taking out bits of bone above the top jaw, but only a few American FFS surgeons do this, because it is usually considered a separate medical dicipline to the other stuff.
+
+![bdd fuel](/img/bdd_fuel.png?h=300&w=5000)
+
+So so far we've talked about bone differences, but what about soft tissue differences? What procedures are avaliable then? (I really wish I could use pictures to demonstrate here)
+
+- Forehead shape: The female hairline is different to the male hairline, the latter is more round, and less square. This is the case even if you don't have hair loss. You can essentially get this fixed for free if you're having forehead work done anyway, the surgeon just stitches your hairline back in a different shape.
+- Nose: despite what some wokescolds on twitter would tell you, yes, human noses are sexually dimorphic, and getting a rhinoplasty is not enforcing "western european beauty standards", especially if you happen to be a western european. The main sexual difference is nasal projection and the shape of the tip, the female nose is tipped up more at the end. If you're getting a rhinoplasty at the same time anyway, you might as well get other aesthetic improvements, such as dorsal hump reduction, width reduction, and nostril size reduction. American surgeons love to do this beverly-hills look, I call it a "ski slope nose", in which the nose is made completely concave, but unless you're lucky to have a tiny round face with zero midface, I think a simple straight nose is going to suit you better. European surgeons are better about this imo.
+- Cheeks: A rarer procedure that some people get is implants or fat grafting into the cheeks to make them look fuller. Perhaps this could help with midface, but this is just a theory of mine, the aesthetic improvements are besides this.
+- Blepharoplasty: Reduction of excess skin above the eyes. This is an age related surgery that you don't need to get done if you're young, but some people get it done at the same time as FFS.
+- Lip lift: An underrated dimorphic feature is the size of the lips, the top lift especially. Males have a bigger philtrum length (the space between the bottom of the nose and the top of the lip) and a lip lift can improve this, and make the lips look fuller. Lip injections can also help with this, but in this aspect you should be conservative imo unless you want to look like a bimbo. Just be tasteful with it. Things to look out for here are that the shape of the top lip is preserved, a nice "bow" shape.
+- Tracheal shave: Males obviously have a bigger Adam's apple. Some people are scared it affects voice and are nervous to get it done, especially after FFS, but personally my surgeon advised me that it deals with tissue far away from the tissue that affects voice and was extremely confident my voice would be unaffected. Nonetheless, it is under the area in which an ENT surgeon would be its speciality, thus FFS surgeons may not be as familiar with this region. I would advise that if you're getting VFS from an ENT surgeon anyway, you get a trach shave done by them instead. My VFS surgeon did offer this but I wasn't aware to ask for it at the time.
+
+Now we know what to look for in a surgeon's results pictures, we can better guage the surgeon we want to pick. But still, it is common to have consultations with multiple surgeons so you can decide which one you want to choose that way.
+
+## My FFS journey
+
+![the last pre-ffs picture of me that exists](/img/PXL_20251108_063442686.MP.jpg?h=400&w=5000)
+
+*The last picture of me that exists pre-FFS*
+
+This section discusses my personal experiences, which might be a good way of knowing what to expect during the recovery process. I write it in the first person present tense because I've been reading a lot of fiction like that recently. Nonetheless, my experiences remain personal, and your recovery could well be different. 
diff --git a/homelab-wiki/Dockerfile b/homelab-wiki/Dockerfile
index 445bcc3..62b1f60 100644
--- a/homelab-wiki/Dockerfile
+++ b/homelab-wiki/Dockerfile
@@ -1,4 +1,4 @@
-FROM mediawiki:1.39.3
+FROM mediawiki:1.43.3
 
 ENV MW_HOME=/var/www/html
 
diff --git a/homelab-wiki/LocalSettings.php b/homelab-wiki/LocalSettings.php
index e3c1d5a..e8e5eb2 100644
--- a/homelab-wiki/LocalSettings.php
+++ b/homelab-wiki/LocalSettings.php
@@ -30,7 +30,7 @@ $wgMetaNamespace = "Eden's_Homelab_Wiki";
 $wgScriptPath = "";
 
 ## The protocol and server name to use in fully-qualified URLs
-$wgServer = "https://wiki.eda.gay";
+$wgServer = "https://homelabwiki.boymoder.blog";
 
 ## The URL path to static resources (images, scripts, etc.)
 $wgResourceBasePath = $wgScriptPath;
@@ -159,7 +159,6 @@ wfLoadExtension( 'ParserFunctions' );
 wfLoadExtension( 'PdfHandler' );
 wfLoadExtension( 'Poem' );
 wfLoadExtension( 'PortableInfobox' );
-wfLoadExtension( 'Renameuser' );
 wfLoadExtension( 'ReplaceText' );
 wfLoadExtension( 'Scribunto' );
 wfLoadExtension( 'SecureLinkFixer' );
@@ -174,7 +173,11 @@ wfLoadExtension( 'WikiEditor' );
 
 # End of automatically generated settings.
 # Add more configuration options below.
-$wgShowDebug = false;
-$wgDevelopmentWarnings = false;
-$wgShowExceptionDetails = false;
-$wgDebugToolbar = false;
+# $wgShowDebug = false;
+# $wgDevelopmentWarnings = false;
+# $wgShowExceptionDetails = false;
+# $wgDebugToolbar = false;
+
+$wgShowExceptionDetails = true;
+$wgShowDBErrorBacktrace = true;
+$wgShowSQLErrors = true;
diff --git a/nitter/nitter b/nitter/nitter
deleted file mode 160000
-Subproject fcd74e8048362fcf8284871ee067099e8de28a8
diff --git a/requirements.txt b/requirements.txt
index 581cd7c..8d51c87 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
-itsdangerous==2.0.1
 PyMySQL==1.0.2
-transmission_rpc==4.1.0
-Werkzeug==2.3.7
+transmission_rpc==4.1.4
+Werkzeug==2.2.3
 Flask==2.2.2
 PiHole_api
 dataclasses
@@ -18,4 +17,4 @@ Pygments
 mistune==2.0.3
 twython==3.8.2
 fabric
-paramiko
\ No newline at end of file
+paramiko
diff --git a/scripts/export.sh b/scripts/export.sh
index c65a6e9..a2ecb6f 100755
--- a/scripts/export.sh
+++ b/scripts/export.sh
@@ -9,4 +9,4 @@ read export_name
 echo "Exporting blog post " $id " to " $export_name
 
 touch $export_name
-sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py export -i $id -u root -o $export_name
+sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/edaweb.conf":/app/edaweb/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm reg.reaweb.uk/edaweb /app/edaweb/parser.py export -i $id -u root -o $export_name
diff --git a/scripts/update.sh b/scripts/update.sh
index b082f18..32b3b2a 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -3,4 +3,4 @@
 echo -n "Input blog post ID to update: "
 read id
 
-sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py update -i $id -u root -m $1
+sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/edaweb.conf":/app/edaweb/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm reg.reaweb.uk/edaweb /app/edaweb/parser.py update -i $id -u root -m $1
diff --git a/static/robots.txt b/static/robots.txt
deleted file mode 100755
index c2aab7e..0000000
--- a/static/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *

-Disallow: /
\ No newline at end of file