9 files changed, 137 insertions, 116 deletions
diff --git a/Makefile b/Makefile
index 1f72d53..34a3d59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,28 @@
 all: install
-import: venv
+install: venv/bin/flask
+import: install
        venv/bin/python3 ./halfnarp2.py -i
-do-export: venv
+do-export: install
        venv/bin/python3 ./halfnarp2.py -e
-run: venv
+run: install
        PYTHONIOENCODING=utf-8 venv/bin/python3 ./halfnarp2.py
-run-fullnarp: venv
+run-halfnarp-waitress: install venv/bin/waitress-serve
+        PYTHONIOENCODING=utf-8 venv/bin/python3 venv/bin/waitress-serve --host 127.0.0.1 --port 5023 wsgi:app
+run-fullnarp: install
        PYTHONIOENCODING=utf-8 venv/bin/python3 ./fullnarp.py
+venv/bin/waitress-serve: install
+        venv/bin/pip install waitress
 venv:
        python3 -m venv ./venv
-install: venv
+venv/bin/flask: venv
        venv/bin/pip install --upgrade pip
        venv/bin/pip install -r requirements.txt
diff --git a/halfnarp2.py b/halfnarp2.py
index 0cc3906..fcc8788 100755
--- a/halfnarp2.py
+++ b/halfnarp2.py
@@ -1,6 +1,6 @@
 #!venv/bin/python
-from flask import Flask, render_template, jsonify, request, abort, send_file, url_for
+from flask import Flask, Blueprint, render_template, jsonify, request, abort, send_file, url_for
 from flask_sqlalchemy import SQLAlchemy
 from flask_cors import CORS
 from lxml import etree
@@ -13,10 +13,9 @@ from datetime import datetime, time, timedelta
 from html_sanitizer import Sanitizer
 from hashlib import sha256
-app = Flask(__name__)
+bp = Blueprint("main", __name__)
 db = SQLAlchemy()
 class TalkPreference(db.Model):
    """A preference of halfnarp frontend. An array of strings"""
@@ -26,17 +25,17 @@ class TalkPreference(db.Model):
 """
-@app.route("/")
+@bp.route("/")
 def root():
    return render_template("index.html")
 """
-@app.route("/-/talkpreferences", methods=["GET"])
+@bp.route("/-/talkpreferences", methods=["GET"])
 def sessions():
    return send_file("var/talks_local", mimetype="application/json")
-@app.route("/-/talkpreferences/<uid>", methods=["GET"])
+@bp.route("/-/talkpreferences/<uid>", methods=["GET"])
 def get_own_preferences(uid):
    pref = db.session.get(TalkPreference, uid)
    if pref == None:
@@ -46,7 +45,7 @@ def get_own_preferences(uid):
        {
            "hashed_uid": pref.public_uid,
            "public_url": url_for(
-                "get_preferences",
+                "main.get_preferences",
                public_uid=public_uid,
                _external=True,
                _scheme="https",
@@ -57,7 +56,7 @@ def get_own_preferences(uid):
    )
-@app.route("/-/talkpreferences/", methods=["POST"])
+@bp.route("/-/talkpreferences/", methods=["POST"])
 def store_preferences():
    try:
        content = request.json
@@ -80,19 +79,19 @@ def store_preferences():
            "uid": uid,
            "hashed_uid": str(public_uid),
            "public_url": url_for(
-                "get_preferences",
+                "main.get_preferences",
                public_uid=public_uid,
                _external=True,
                _scheme="https",
            ),
            "update_url": url_for(
-                "update_preferences", uid=uid, _external=True, _scheme="https"
+                "main.update_preferences", uid=uid, _external=True, _scheme="https"
            ),
        }
    )
-@app.route("/-/talkpreferences/<uid>", methods=["POST", "PUT"])
+@bp.route("/-/talkpreferences/<uid>", methods=["POST", "PUT"])
 def update_preferences(uid):
    pref = db.session.get(TalkPreference, uid)
    if pref == None:
@@ -105,7 +104,7 @@ def update_preferences(uid):
    return jsonify({"uid": pref.uid, "hashed_uid": pref.public_uid})
-@app.route("/-/talkpreferences/public/<public_uid>", methods=["GET"])
+@bp.route("/-/talkpreferences/public/<public_uid>", methods=["GET"])
 def get_preferences(public_uid):
    pref = (
        db.session.query(TalkPreference)
@@ -121,14 +120,14 @@ def get_preferences(public_uid):
 def filter_keys_halfnarp(session):
    abstract_html = markdown.markdown(session["abstract"], enable_attributes=False)
    abstract_clean_html = Sanitizer().sanitize(abstract_html)
-    slot = session["slot"]
+    slot = next(iter(session["slots"]), {})
    return {
        "title": session.get("title", "!!! NO TITLE !!!"),
        "duration": 60 * session.get("duration", 40),
        "event_id": session["code"],
        "language": session.get("content_locale", "de"),
-        "track_id": session["track_id"],
+        "track_id": session["track"],
        "speaker_names": ", ".join(
            [speaker.get("name", "unnamed") for speaker in session.get("speakers", {})]
        ),
@@ -141,7 +140,7 @@ def filter_keys_halfnarp(session):
 def filter_keys_fullnarp(session, speakers):
    abstract_html = markdown.markdown(session["abstract"], enable_attributes=False)
    abstract_clean_html = Sanitizer().sanitize(abstract_html)
-    slot = session["slot"]
+    slot = next(iter(session["slots"]), {})
    speaker_info = []
    for speaker in session.get("speakers", {}):
@@ -181,7 +180,7 @@ def filter_keys_fullnarp(session, speakers):
        "duration": 60 * session.get("duration", 40),
        "event_id": session["code"],
        "language": session.get("content_locale", "de"),
-        "track_id": session["track_id"],
+        "track_id": session["track"],
        "speakers": speaker_info,
        "speaker_names": ", ".join(
            [speaker.get("name", "unnamed") for speaker in session.get("speakers", {})]
@@ -194,27 +193,28 @@ def filter_keys_fullnarp(session, speakers):
 def fetch_talks(config):
    sess = requests.Session()
+    headers = {'Accept': 'application/json',
-    response = sess.get(
+               'Authorization': "Token " + config['pretalx-token'],
-        config["pretalx-api-url"] + "/submissions/?format=json&limit=20000",
+               'Pretalx-Version' : 'v1'}
-        stream=True,
-        headers={"Authorization": "Token " + config["pretalx-token"]},
+    speakers_result = []
-    )
+    url = config['pretalx-api-url'] + '/speakers/?format=json&limit=20000'
-    # with open('dump.txt', mode='wb') as localfile:
+    while url:
-    #           localfile.write(response.content)
+        response = sess.get(url, stream=True, headers=headers).json()
-    talks_json = json.loads(response.text)
+        speakers_result.extend(response['results'])
+        url = response['next']
-    response = sess.get(
+    speakers = { speaker['code']: speaker for speaker in speakers_result }
-        config["pretalx-api-url"] + "/speakers/?format=json&limit=20000",
-        stream=True,
+    session_results = []
-        headers={"Authorization": "Token " + config["pretalx-token"]},
+    url = config['pretalx-api-url'] + '/submissions/?expand=speakers,slot,speakers.availabilities&format=json&limit=20000'
-    )
+    while url:
-    speakers_json = json.loads(response.text)
+        response = sess.get(url, stream=True, headers=headers).json()
-    speakers = dict((speaker["code"], speaker) for speaker in speakers_json["results"])
+        session_results.extend(response['results'])
+        url = response['next']
    sessions = [
        filter_keys_halfnarp(submission)
-        for submission in talks_json["results"]
+        for submission in session_results
        if submission["state"] == "confirmed"
        and not "non-public" in submission.get("tags", {})
    ]
@@ -223,7 +223,7 @@ def fetch_talks(config):
    sessions = [
        filter_keys_fullnarp(submission, speakers)
-        for submission in talks_json["results"]
+        for submission in session_results
        if submission["state"] == "confirmed" or submission["state"] == "accepted"
    ]
    with open("var/talks_local_fullnarp", mode="w", encoding="utf8") as sessionsfile:
@@ -237,7 +237,7 @@ def export_prefs(config):
    print("[]]")
-if __name__ == "__main__":
+def parse_args():
    parser = ArgumentParser(description="halfnarp2")
    parser.add_argument(
        "-i",
@@ -256,20 +256,20 @@ if __name__ == "__main__":
    parser.add_argument(
        "-c", "--config", help="Config file location", default="./config.json"
    )
-    args = parser.parse_args()
+    return parser.parse_args()
-    with open(args.config, mode="r", encoding="utf-8") as json_file:
-        config = json.load(json_file)
-    config["pretalx-api-url"] = (
-        config["pretalx-url"] + "api/events/" + config["pretalx-conference"]
-    )
-    app.config["SQLALCHEMY_DATABASE_URI"] = config.get(
+def create_app(config_file="./config.json"):
+    app = Flask(__name__)
+    with open(config_file, mode="r", encoding="utf-8") as config_file:
+        app.config["halfnarp"] = json.load(config_file)
+    app.config["SQLALCHEMY_DATABASE_URI"] = app.config["halfnarp"].get(
        "database-uri", "sqlite:///test.db"
    )
    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
-    app.config["SERVER_NAME"] = config.get("server-name", "localhost")
+    app.config["SERVER_NAME"] = app.config["halfnarp"].get("server-name", "localhost")
-    app.config["SECRET_KEY"] = config.get("server-secret", "<YOUR SERVER SECRET HERE>")
+    app.config["SECRET_KEY"] = app.config["halfnarp"].get("server-secret", "<YOUR SERVER SECRET HERE>")
    if app.config["SECRET_KEY"] == "<YOUR SERVER SECRET HERE>":
        print("You must set the server-secret in your config.json")
@@ -280,15 +280,24 @@ if __name__ == "__main__":
    CORS()
    db.init_app(app)
+    app.register_blueprint(bp)
+    return app
+if __name__ == "__main__":
+    args = parse_args()
+    app = create_app(args.config)
+    app.config["halfnarp"]["pretalx-api-url"] = (
+        app.config["halfnarp"]["pretalx-url"] + "api/events/" + app.config["halfnarp"]["pretalx-conference"]
+    )
    with app.app_context():
        db.create_all()
        if args.pretalx_import:
-            fetch_talks(config)
+            fetch_talks(app.config["halfnarp"])
        elif args.fullnarp_export:
-            export_prefs(config)
+            export_prefs(app.config["halfnarp"])
        else:
            app.run(
-                host=config.get("host", "127.0.0.1"),
+                host=app.config["halfnarp"].get("host", "127.0.0.1"),
-                port=int(config.get("port", "8080")),
+                port=int(app.config["halfnarp"].get("port", "8080")),
            )
diff --git a/scripts/gen_css_tables.py b/scripts/gen_css_tables.py
index 4bc5ea8..0eb88f4 100755
--- a/scripts/gen_css_tables.py
+++ b/scripts/gen_css_tables.py
@@ -8,7 +8,7 @@
 start_y   = 400
 starttime = 10
 endtime   = 28
-rooms     = 3
+rooms     = 4
 days      = 4
 columns   = days * rooms          # how many columns does 
 event_gap = { 'large': 5, 'medium': 3, 'small': 2 }  # how much is an event shorter than what the grid would allow in px
diff --git a/static/faq.html b/static/faq.html
index aefd03d..e5f53cd 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -3,11 +3,11 @@
 <head>
  <meta charset="utf-8">
  <title>halfnarp FAQ</title>
-  <link rel="stylesheet" href="style.css">
+  <link rel="stylesheet" href="style_39c3.css">
 </head>
 <body>
-<div class="headline">The 38C3 halfnarp FAQ</div>
+<div class="headline">The 39C3 halfnarp FAQ</div>
 <dl>
 <dt>Q: What is halfnarp?</dt>
@@ -18,7 +18,7 @@
 </dd>
 <dt>Q: How does it work?</dt>
 <dd>
-    <p>A: 38C3 Fahrplan is curated by six teams each responsible for one track. By default, lectures are sorted by these tracks.</p>
+    <p>A: 39C3 Fahrplan is curated by six teams each responsible for one track. By default, lectures are sorted by these tracks.</p>
    <ul>
        <li>On a desktop browser, hovering over an event’s description reveals the full abstract. Clicking on an event adds or removes events to/from your favorites list – they turn green.</li>
        <li>On mobile browsers, tapping an event once selects it and reveals the whole content. Tapping a selected event adds or removes events to/from your favorites list – they turn green.</li>
@@ -38,7 +38,7 @@
 </dd>
 <dt>Q: How can I help?</dt>
 <dd>
-    <p>A: Submitting your preferences to the halfnarp servers helps a lot. You can find and create pull requests for <a href="https://github.com/tomster/halfnarp">halfnarp on its github home</a>.</p>
+    <p>A: Submitting your preferences to the halfnarp servers helps a lot. You can the halfnarp living <a href="https://erdgeist.org/gitweb/halfnarp2">halfnarp2 on its git home</a>.</p>
 </dd>
 </html>
diff --git a/static/fullnarp.html b/static/fullnarp.html
index a00f89e..3b86d6c 100644
--- a/static/fullnarp.html
+++ b/static/fullnarp.html
@@ -3,8 +3,8 @@
 <head>
  <meta charset="utf-8">
  <title>FULLnarp web scheduling helper app</title>
-  <link rel="stylesheet" href="style_38c3.css">
+  <link rel="stylesheet" href="style_39c3.css">
-  <link rel="stylesheet" href="style_38c3_tables.css">
+  <link rel="stylesheet" href="style_39c3_tables.css">
  <script src="fullnarp.js"></script>
  <script>
    document.addEventListener('DOMContentLoaded', () => { do_the_fullnarp(); });
@@ -20,7 +20,7 @@
 </div>
 <div class="trashbin">🗑️</div>
 <div class="version">version</div>
-<div class="headline">The 38C3 fullnarp</div>
+<div class="headline">The 39C3 fullnarp</div>
 <div class="header">
 <div class="leftbox">
 <input id="filter" type="text" placeholder="Filter events"/>
@@ -46,10 +46,10 @@
 </div>
 </div>
 </div>
-<div class="day_1 room-label room1">Saal 1</div><div class="day_1 room-label room2">Saal 2</div><div class="day_1 room-label room3">Saal 3</div></div>
+<div class="day_1 room-label room1">Saal 1</div><div class="day_1 room-label room2">Saal 2</div><div class="day_1 room-label room3">Saal 3</div><div class="day_1 room-label room4">Saal 4</div></div>
-<div class="day_2 room-label room1">Saal 1</div><div class="day_2 room-label room2">Saal 2</div><div class="day_2 room-label room3">Saal 3</div></div>
+<div class="day_2 room-label room1">Saal 1</div><div class="day_2 room-label room2">Saal 2</div><div class="day_2 room-label room3">Saal 3</div><div class="day_2 room-label room4">Saal 4</div></div>
-<div class="day_3 room-label room1">Saal 1</div><div class="day_3 room-label room2">Saal 2</div><div class="day_3 room-label room3">Saal 3</div></div>
+<div class="day_3 room-label room1">Saal 1</div><div class="day_3 room-label room2">Saal 2</div><div class="day_3 room-label room3">Saal 3</div><div class="day_3 room-label room4">Saal 4</div></div>
-<div class="day_4 room-label room1">Saal 1</div><div class="day_4 room-label room2">Saal 2</div><div class="day_4 room-label room3">Saal 3</div></div>
+<div class="day_4 room-label room1">Saal 1</div><div class="day_4 room-label room2">Saal 2</div><div class="day_4 room-label room3">Saal 3</div><div class="day_4 room-label room4">Saal 4</div></div>
 <div class=" time_1815 duration_3600 guide pause ">P A U S E</div>
 <div class=" time_1445 wholeblock room1 guide day_1"></div>
@@ -65,13 +65,13 @@
 <div class="wholeday room1 day_1 guide uneven"></div>
 <div class="wholeday room1 day_3 guide uneven"></div>
-<div class="track" id="6"><h2>Security</h2></div>
+<div class="track" id="31"><h2>Security</h2></div>
-<div class="track" id="4"><h2>Hardware &amp; Making</h2></div>
+<div class="track" id="32"><h2>Hardware &amp; Making</h2></div>
-<div class="track" id="7"><h2>Ethics, Society &amp; Politics</h2></div>
+<div class="track" id="28"><h2>Ethics, Society &amp; Politics</h2></div>
-<div class="track" id="2"><h2>CCC</h2></div>
+<div class="track" id="30"><h2>CCC</h2></div>
-<div class="track" id="3"><h2>Entertainment</h2></div>
+<div class="track" id="27"><h2>Entertainment</h2></div>
-<div class="track" id="5"><h2>Science</h2></div>
+<div class="track" id="29"><h2>Science</h2></div>
-<div class="track" id="1"><h2>Art &amp; Beauty</div>
+<div class="track" id="33"><h2>Art &amp; Beauty</div>
 <div class="track" id="999"><h2>Other</div>
 </body>
diff --git a/static/fullnarp.js b/static/fullnarp.js
index c4e24f4..34a59c4 100644
--- a/static/fullnarp.js
+++ b/static/fullnarp.js
@@ -1,5 +1,5 @@
 let ws; // WebSocket instance
-let allrooms   = ['1','2','3']
+let allrooms   = ['1','2','3','4']
 let allminutes = ['00','05','10','15','20','25','30','35','40','45','50','55']
 let allhours   = ['10','11','12','13','14','15','16','17','18','19','20','21','22','23','00','01','02'];
 let alldays    = ['1','2','3','4'];
@@ -395,7 +395,7 @@ function signalFullnarpConnect(state) {
 function getFullnarpData() {
    signalFullnarpConnect('fullnarp-connecting');
-    connect = window.location.href.replace('http', 'ws') + '/ws/';
+    connect = window.location.href.replace('http', 'ws') + 'ws/';
    ws = new WebSocket(connect);
    ws.onopen = () => {
diff --git a/static/halfnarp.js b/static/halfnarp.js
index b7f4a45..e40c84e 100644
--- a/static/halfnarp.js
+++ b/static/halfnarp.js
@@ -93,7 +93,7 @@ function redraw_calendar(myuid, ids) {
          calendar += 'DTSTART:' + start.toISOString().replace(/-|;|:|\./g, '').replace(/...Z$/, 'Z') + '\r\n';
          calendar += 'DURATION:PT' + item.duration + 'S\r\n';
          calendar += 'LOCATION:' + item.room_name + '\r\n';
-          calendar += 'URL:http://events.ccc.de/congress/2023/Fahrplan/events/' + item.event_id + '.html\r\n';
+          calendar += 'URL:http://events.ccc.de/congress/2025/Fahrplan/events/' + item.event_id + '.html\r\n';
          calendar += 'SUMMARY:' + item.title + '\r\n';
          calendar += 'DESCRIPTION:' + item.abstract.replace(/\n|\r/g, ' ') + '\r\n';
    //      console.log( 'id:' + id + ' ' + all_events[id] );
@@ -102,14 +102,14 @@ function redraw_calendar(myuid, ids) {
        }
    });
    calendar += 'END:VCALENDAR\r\n';
-    $('.export-url-a').attr( 'href', "data:text/calendar;filename=38C3.ics," + encodeURIComponent(calendar) );
+    $('.export-url-a').attr( 'href', "data:text/calendar;filename=39C3.ics," + encodeURIComponent(calendar) );
    $('.export-url').removeClass( 'hidden' );
 }
 function do_the_halfnarp() {
 //  var halfnarpAPI      = 'talks_36C3.json';
  var halfnarpAPI     = '/-/talkpreferences';
-  var halfnarpCorrs   = 'corr_array_38c3.json';
+  var halfnarpCorrs   = 'corr_array_39c3.json';
  var halfnarpPubAPI  = halfnarpAPI + '/public/';
  var isTouch = (('ontouchstart' in window) || (navigator.msMaxTouchPoints > 0));
  window.top.all_events = new Object();
@@ -179,8 +179,8 @@ function do_the_halfnarp() {
        return $(this).attr('event_id');
      }).get();
    try {
-      localStorage['38C3-halfnarp'] = ids;
+      localStorage['39C3-halfnarp'] = ids;
-      myapi = localStorage.getItem('38C3-halfnarp-api');
+      myapi = localStorage.getItem('39C3-halfnarp-api');
      if (myapi) {
        myapi = myapi.replace(/.*?:\//g, "");
        myapi = 'https:/' + myapi.replace(/.*?:\//g, "");
@@ -207,9 +207,9 @@ function do_the_halfnarp() {
        $('.info').text('submitted');
        $('.info').removeClass('hidden');
        try {
-          localStorage['38C3-halfnarp-api'] = data['update_url'];
+          localStorage['39C3-halfnarp-api'] = data['update_url'];
-          localStorage['38C3-halfnarp-pid'] = mypid = data['hashed_uid'];
+          localStorage['39C3-halfnarp-pid'] = mypid = data['hashed_uid'];
-          localStorage['38C3-halfnarp-uid'] = myuid = data['uid'];
+          localStorage['39C3-halfnarp-uid'] = myuid = data['uid'];
          window.location.hash = mypid;
        } catch(err) {}
      }, 'json' ).fail(function() {
@@ -225,9 +225,9 @@ function do_the_halfnarp() {
        contentType: "application/json",
        dataType: 'json',
      }).done(function(data) {
-        localStorage['38C3-halfnarp-uid'] = myuid = data['uid'];
+        localStorage['39C3-halfnarp-uid'] = myuid = data['uid'];
-        if( localStorage['38C3-halfnarp-pid'] ) {
+        if( localStorage['39C3-halfnarp-pid'] ) {
-            window.location.hash = localStorage['38C3-halfnarp-pid'];
+            window.location.hash = localStorage['39C3-halfnarp-pid'];
        }
        $('.info').text('updated');
        $('.info').removeClass('hidden');
@@ -279,18 +279,21 @@ function do_the_halfnarp() {
  }
  /* Add callbacks for view selector */
+  if (0) {
  document.querySelector('.vlist').onclick = function() { toggle_grid(0); };
  document.querySelector('.vday1').onclick = function() { toggle_grid(1); };
  document.querySelector('.vday2').onclick = function() { toggle_grid(2); };
  document.querySelector('.vday3').onclick = function() { toggle_grid(3); };
  document.querySelector('.vday4').onclick = function() { toggle_grid(4); };
  document.querySelector('.vdays').onclick = function() { toggle_grid(5); };
+  }
  document.querySelector('.vlang').onclick = function() { document.body.classList.toggle('languages'); };
  document.querySelector('.vtrack').onclick = function() { document.body.classList.toggle('all-tracks'); };
  document.querySelector('.vnarpr').onclick = function() { $('.narpr').toggleClass('hidden'); set_random_event(); };
+  if (0) {
  document.querySelector('.vcorr').onclick = toggle_corr_mode;
+  }
  $('.vclass').click( function() { toggle_classifier( $(this).attr('classifier'), $(this).hasClass('track'), $(this).hasClass('two_poles')); });
@@ -308,10 +311,10 @@ function do_the_halfnarp() {
  /* If we've been here before, try to get local preferences. They are authoratative */
  var selection = [], friends = { };
  try {
-    selection = localStorage['38C3-halfnarp'] || [];
+    selection = localStorage['39C3-halfnarp'] || [];
-    friends   = localStorage['38C3-halfnarp-friends'] || { };
+    friends   = localStorage['39C3-halfnarp-friends'] || { };
-    myuid     = localStorage['38C3-halfnarp-uid'] || '';
+    myuid     = localStorage['39C3-halfnarp-uid'] || '';
-    mypid     = localStorage['38C3-halfnarp-pid'] || '';
+    mypid     = localStorage['39C3-halfnarp-pid'] || '';
  } catch(err) {
  }
@@ -354,7 +357,7 @@ function do_the_halfnarp() {
          if( hour > 23)
              hour -= 24;
-          /* Fix up room for 38C3 */
+          /* Fix up room for 39C3 */
          room = (item.room_id || '').toString().replace('1','room1').replace('2','room2').replace('3','room3');
          /* Apply attributes to sort events into calendar */
@@ -400,8 +403,8 @@ function do_the_halfnarp() {
          }
      });
-      $.getJSON( halfnarpCorrs, { format: 'json' }).done(function(data) { window.top.all_votes = data; });
+      // $.getJSON( halfnarpCorrs, { format: 'json' }).done(function(data) { window.top.all_votes = data; });
-      toggle_grid(5);
+      toggle_grid(0);
      /* Check for a new friends public uid in location's #hash */
      var shared = window.location.hash;
@@ -439,7 +442,7 @@ function do_the_halfnarp() {
        $.getJSON( halfnarpPubAPI + friends.pid, { format: 'json' })
          .done(function( data ) {
            friend.prefs = data.talk_ids;
-            localStorage['38C3-halfnarp-friends'] = friends;
+            localStorage['39C3-halfnarp-friends'] = friends;
            update_friends();
          });
      }
diff --git a/static/index.html b/static/index.html
index bb680d1..bc8da67 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3,8 +3,8 @@
 <head>
  <meta charset="utf-8">
  <title>halfnarp web scheduling helper app</title>
-  <link rel="stylesheet" href="style_38c3.css">
+  <link rel="stylesheet" href="style_39c3.css">
-  <link rel="stylesheet" href="style_38c3_tables.css">
+  <link rel="stylesheet" href="style_39c3_tables.css">
  <script src="jquery-3.7.1.min.js"></script>
  <script src="jquery.qrcode.min.js"></script>
  <script src="halfnarp.js"></script>
@@ -14,14 +14,14 @@
 </head>
 <body class="size-small in-list halfnarp">
    <header class="header">
-        <!--div class="views touch-only hidden vnarpr">narpr</div-->
+        <!--div class="views touch-only hidden vnarpr">narpr</div>
        <div class="views vlist" title="Display all events sorted by track (Hotkey: L)">list</div>
        <div class="views vdays" title="Display all events in a 4-day-view (Hotkey: 0)">days</div>
        <div class="views vday1" title="Display all events on Day 1 (Hotkey: 1)">day 1</div>
        <div class="views vday2" title="Display all events on Day 2 (Hotkey: 2)">day 2</div>
        <div class="views vday3" title="Display all events on Day 3 (Hotkey: 3)">day 3</div>
        <div class="views vday4" title="Display all events on Day 4 (Hotkey: 4)">day 4</div>
-        <div class="views vcorr" title="Enter correlation view (Hotkey: C)">half</div>
+        <div class="views vcorr" title="Enter correlation view (Hotkey: C)">half</div-->
        <div class="views vtrack" title="Color event by track (Hotkey: T)">track</div>
        <div class="views vlang" title="Color event by language (Hotkey: I)">lang</div>
        <div class="header__right">
@@ -51,9 +51,9 @@
 </div>
    <div class="intro">
-        <h1>The 38C3 halfnarp</h1>
+        <h1>The 39C3 halfnarp</h1>
        <div class="touch-only hidden vnarpr narpr-beta">narpr<sup>β</sup></div>
-        <p>Help us to reduce conflicts of scheduling 38C3's Fahrplan: Click on the talks you would like to watch and press submit.</p>
+        <p>Help us to reduce conflicts of scheduling 39C3's Fahrplan: Click on the talks you would like to watch and press submit.</p>
        <p>For questions please read <a href="faq.html">our FAQ</a> and <a href="http://events.ccc.de/2014/11/25/lets-do-the-halfnarp/">our blogpost</a> for details. Please report problems to <a href="mailto:erdgeist@ccc.de">erdgeist@ccc.de</a>.</p>
        <p class="corr-hint">Select an event below to display halfnarp correlations, the darker the stronger.</p>
        <p class="touch-only hidden">NEW on mobile: Swipe the narpr!</p>
@@ -75,10 +75,10 @@
 </div-->
 <div style="clear:both"></div>
-<div class="day_1 room-label room1">Saal 1</div><div class="day_1 room-label room2">Saal GLITCH</div><div class="day_1 room-label room3">Saal ZIGZAG</div>
+<div class="day_1 room-label room1">Saal One</div><div class="day_1 room-label room2">Saal Zero</div><div class="day_1 room-label room3">Saal Ground</div><div class="day_1 room-label room4">Saal Fuse</div>
-<div class="day_2 room-label room1">Saal 1</div><div class="day_2 room-label room2">Saal GLITCH</div><div class="day_2 room-label room3">Saal ZIGZAG</div>
+<div class="day_2 room-label room1">Saal One</div><div class="day_2 room-label room2">Saal Zero</div><div class="day_2 room-label room3">Saal Ground</div><div class="day_2 room-label room4">Saal Fuse</div>
-<div class="day_3 room-label room1">Saal 1</div><div class="day_3 room-label room2">Saal GLITCH</div><div class="day_3 room-label room3">Saal ZIGZAG</div>
+<div class="day_3 room-label room1">Saal One</div><div class="day_3 room-label room2">Saal Zero</div><div class="day_3 room-label room3">Saal Ground</div><div class="day_3 room-label room4">Saal Fuse</div>
-<div class="day_4 room-label room1">Saal 1</div><div class="day_4 room-label room2">Saal GLITCH</div><div class="day_4 room-label room3">Saal ZIGZAG</div>
+<div class="day_4 room-label room1">Saal One</div><div class="day_4 room-label room2">Saal Zero</div><div class="day_4 room-label room3">Saal Ground</div><div class="day_4 room-label room4">Saal Fuse</div>
 <div class=" time_1815 duration_3600 guide pause pause1">P A U S E</div>
 <!--div class=" time_1950 duration_3600 guide pause ">P A U S E</div-->
@@ -90,13 +90,14 @@
  <div class="wholeday room1 day_3 guide uneven">Day 3</div>
  <div class="wholeday room1 day_4 guide">Day 4</div>
-  <div class="track" id="6"><h2>Security</h2></div>
+  <div class="track" id="31"><h2>Security</h2></div>
-  <div class="track" id="4"><h2>Hardware &amp; Making</h2></div>
+  <div class="track" id="32"><h2>Hardware &amp; Making</h2></div>
-  <div class="track" id="7"><h2>Ethics, Society &amp; Politics</h2></div>
+  <div class="track" id="28"><h2>Ethics, Society &amp; Politics</h2></div>
-  <div class="track" id="2"><h2>CCC</h2></div>
+  <div class="track" id="30"><h2>CCC</h2></div>
-  <div class="track" id="3"><h2>Entertainment</h2></div>
+  <div class="track" id="27"><h2>Entertainment</h2></div>
-  <div class="track" id="5"><h2>Science</h2></div>
+  <div class="track" id="29"><h2>Science</h2></div>
-  <div class="track" id="1"><h2>Art &amp; Beauty</div>
+  <div class="track" id="33"><h2>Art &amp; Beauty</div>
+  <!--div class="track" id="999"><h2>Other</div-->
 <footer class="footer">
    <div class="footer__filter-side">
@@ -107,7 +108,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 28" enable-background="new 0 0 22 28"><style type="text/css">.st0{fill:none;}</style><path class="st0" d="M-854-2242h1400v3600h-1400v-3600z"/><path d="M0 0v28l22-14-22-14z"/><path class="st0" d="M-16-10h48v48h-48v-48z"/></svg>
 </div>
    <div class="info hidden"></div>
-    <a class="export-url-a" download="38C3.ics" type="text/calendar" href="#"><div class="export-url hidden">38C3.ics</div></a>
+    <a class="export-url-a" download="39C3.ics" type="text/calendar" href="#"><div class="export-url hidden">39C3.ics</div></a>
    <div id="qrcode" class="hidden"></div>
 </footer>
diff --git a/wsgi.py b/wsgi.py
index 2ad28d9..db217db 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,4 +1,4 @@
-from halfnarp2 import app
+from halfnarp2 import create_app
-if __name__ == "__main__":
+app = create_app("config.json")
-    app.run(debug=False)
+#app.run(debug=False)