diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..9d791b3
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,32 @@
+name: build
+on:
+  schedule:
+    - cron: 0 2 * * 6
+  workflow_dispatch:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: docker.io/fedora:latest
+      # Fix SELinux for the built OSTree: https://github.com/coreos/rpm-ostree/issues/1943
+      options: --privileged --security-opt label:disable
+    steps:
+      - name: Install dependencies
+        run: dnf install -y rpm-ostree selinux-policy selinux-policy-targeted policycoreutils
+
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Build OSTree
+        run: ./compose.sh
+
+      # upload-artifact@v2 has trouble with tens of thousands of files
+      - name: Create repo tarball
+        run: tar -czf /var/tmp/repo.tar.gz -C /var/tmp/repo .
+
+      - name: Create repository artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: repository
+          path: /var/tmp/repo.tar.gz
+          retention-days: 5
diff --git a/2015-RH-IT-Root-CA.pem b/2015-RH-IT-Root-CA.pem
new file mode 100644
index 0000000..f306f00
--- /dev/null
+++ b/2015-RH-IT-Root-CA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx
+GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m
+b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx
+WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD
+VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS
+ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG
+9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz
+bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2
+c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo
+GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES
+X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK
+BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R
+4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz
+bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e
+LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak
+oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj
+S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf
+4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel
+RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3
+-----END CERTIFICATE-----
diff --git a/better-fonts.repo b/better-fonts.repo
new file mode 100644
index 0000000..48a44c8
--- /dev/null
+++ b/better-fonts.repo
@@ -0,0 +1,10 @@
+[copr:copr.fedorainfracloud.org:dawid:better_fonts]
+name=Copr repo for better_fonts owned by dawid
+baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-34-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
diff --git a/compose.sh b/compose.sh
new file mode 100755
index 0000000..8038f04
--- /dev/null
+++ b/compose.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -eu
+CACHE=/var/cache/x1-gen7-sway-ostree
+REPO=/srv/ostree/repo
+
+mkdir -p $CACHE
+
+if [ ! -d $REPO/objects ]; then
+    ostree --repo=$REPO init --mode=archive-z2
+fi
+
+rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x1-gen7-sway-desktop.yaml
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 4aa2ed1..92636ab 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -41,6 +41,7 @@ exclude_list:
     # Architecture specific packages
     - powerpc-utils
     - lsvpd
+    - s390utils-base
   base-x:
     # x86 specific packages. Added back by fedora-common-ostree.yaml
     - xorg-x11-drv-intel
@@ -61,6 +62,7 @@ exclude_list:
     - dnf
     - dnf-plugins-core
     - deltarpm
+    - python3-dnf-plugin-system-upgrade
     # We use fedora-release-silverblue instead
     - fedora-release-workstation
     # Really not worth listing explicitly
@@ -92,6 +94,7 @@ exclude_list:
     - evolution
     - evolution-ews
     - evolution-help
+    - mediawriter
     # This is ancient now, and IMO has been superceded by cgroups
     # Also it breaks with --unified-core.
     - psacct
@@ -106,7 +109,6 @@ exclude_list:
     # filesystem tools, again priv container
     - symlinks
     - dosfstools
-    - ntfs-3g
     # Misc
     - dos2unix
     # Gnome specific
@@ -145,6 +147,7 @@ desktop_exclude_list:
     - gnome-calendar
     - gnome-characters
     - gnome-clocks
+    - gnome-connections
     - gnome-contacts
     - gnome-documents
     - gnome-font-viewer
@@ -180,7 +183,6 @@ desktop_exclude_list:
     - kcalc
     - kcharselect
     - kcolorchooser
-    - kde-partitionmanager
     - kdnssd
     - kf5-kipi-plugins
     - kfind
@@ -197,18 +199,14 @@ desktop_exclude_list:
     - kwrite
     - libreoffice-kde
     - okular
-    - spectacle
     # Misc
     - adwaita-gtk2-theme
     - colord-kde
     - keditbookmarks
     - kwebkitpart
     - plasma-nm-l2tp
-    - plasma-nm-openconnect
     - plasma-nm-openswan
-    - plasma-nm-openvpn
     - plasma-nm-pptp
-    - plasma-nm-vpnc
   xfce-desktop:
     # Incompatible with ostree for various reasons
     - abrt-desktop
@@ -265,5 +263,5 @@ desktop_exclude_list:
     - NetworkManager-strongswan-gnome
     - NetworkManager-team
     - NetworkManager-wifi
-    # Use Silverblue release package for now
-    - fedora-release-matecompiz
+    # Already in the common set
+    - wireplumber
diff --git a/comps-sync.py b/comps-sync.py
index cd9d73e..aea3449 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# Usage: ./comps-sync.py /path/to/comps-f34.xml.in
+# Usage: ./comps-sync.py /path/to/comps-f35.xml.in
 #
 # Can both remove packages from the manifest
 # which are not mentioned in comps, and add packages from
diff --git a/config/environment.d/wayland.conf b/config/environment.d/wayland.conf
new file mode 100644
index 0000000..7a78aa7
--- /dev/null
+++ b/config/environment.d/wayland.conf
@@ -0,0 +1,4 @@
+XDG_SESSION_TYPE=wayland
+XDG_CURRENT_DESKTOP=sway
+MOZ_ENABLE_WAYLAND=1
+SDL_VIDEODRIVER=wayland
diff --git a/config/greetd/config.toml b/config/greetd/config.toml
new file mode 100644
index 0000000..8e05065
--- /dev/null
+++ b/config/greetd/config.toml
@@ -0,0 +1,6 @@
+[terminal]
+vt = 1
+
+[default_session]
+command = "cage -s -- gtkgreet"
+user = "greeter"
diff --git a/config/greetd/environments b/config/greetd/environments
new file mode 100644
index 0000000..d16bb19
--- /dev/null
+++ b/config/greetd/environments
@@ -0,0 +1,2 @@
+sway
+bash
diff --git a/config/i3status-rust/config.toml b/config/i3status-rust/config.toml
new file mode 100644
index 0000000..4681a21
--- /dev/null
+++ b/config/i3status-rust/config.toml
@@ -0,0 +1,78 @@
+# when using 3istsatus-rs with swaybar
+# https://github.com/greshake/i3status-rust
+#
+
+theme = "solarized-dark"
+icons = "awesome5"
+
+[[block]]
+block = "temperature"
+collapsed = false
+interval = 10
+format = "gpu {max}°"
+chip = "amdgpu-pci-*"
+
+[[block]]
+block = "temperature"
+collapsed = false
+interval = 10
+format = "cpu {max}°"
+chip = "k10temp-pci-*"
+
+[[block]]
+block = "temperature"
+collapsed = true
+interval = 10
+format = "nvme: {max}°"
+chip = "nvme-pci-*"
+
+[[block]]
+block = "temperature"
+collapsed = true
+interval = 10
+format = "wifi: {max}°"
+chip = "iwlwifi_1-*"
+
+[[block]]
+block = "net"
+device = "wlan0"
+format = "{ssid} {signal_strength} {ip} {speed_down} {graph_down}"
+interval = 5
+
+[[block]]
+block = "disk_space"
+path = "/"
+alias = "/"
+info_type = "available"
+unit = "GB"
+interval = 20
+warning = 20.0
+alert = 10.0
+
+[[block]]
+block = "memory"
+display_type = "memory"
+format_mem = "{Mup}%"
+format_swap = "{SUp}%"
+
+[[block]]
+block = "cpu"
+interval = 1
+
+[[block]]
+block = "load"
+interval = 1
+format = "{1m}"
+
+[[block]]
+block = "sound"
+
+[[block]]
+block = "keyboard_layout"
+driver = "sway"
+sway_kb_identifier = "6127:24585:Lite-On_Technology_Corp._ThinkPad_USB_Keyboard_with_TrackPoint"
+
+[[block]]
+block = "time"
+interval = 60
+format = "%a %d/%m %R"
diff --git a/config/modprobe.d/i2c_i801-blacklist.conf b/config/modprobe.d/i2c_i801-blacklist.conf
new file mode 100644
index 0000000..70f1f9b
--- /dev/null
+++ b/config/modprobe.d/i2c_i801-blacklist.conf
@@ -0,0 +1 @@
+blacklist i2c_i801
diff --git a/config/modprobe.d/i915.conf b/config/modprobe.d/i915.conf
new file mode 100644
index 0000000..39114f5
--- /dev/null
+++ b/config/modprobe.d/i915.conf
@@ -0,0 +1,4 @@
+options i915 enable_fbc=1
+options i915 enable_guc=2
+options i915 nuclear_pageflip=Y
+options i915 enable_dc=2
diff --git a/config/sway-service.desktop b/config/sway-service.desktop
new file mode 100644
index 0000000..63f18af
--- /dev/null
+++ b/config/sway-service.desktop
@@ -0,0 +1,6 @@
+# /usr/share/wayland-sessions/sway-service.desktop
+[Desktop Entry]
+Name=Sway Service
+Comment=i3-compatible Wayland compositor as a systemd service
+Exec=sway-service.sh
+Type=Application
diff --git a/config/sway-service.sh b/config/sway-service.sh
new file mode 100755
index 0000000..8b0de34
--- /dev/null
+++ b/config/sway-service.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+# /usr/local/bin/sway-service.sh - needs to be 0755
+
+# first import environment variables from the login manager
+systemctl --user import-environment
+# then start the service
+exec systemctl --wait --user start sway.service
\ No newline at end of file
diff --git a/config/swaylock/config b/config/swaylock/config
new file mode 100644
index 0000000..acb5cb4
--- /dev/null
+++ b/config/swaylock/config
@@ -0,0 +1,8 @@
+# ~/.config/swayidle/config
+before-sleep 'systemctl --user start swaylock'
+lock 'systemctl --user start swaylock'
+unlock 'swaymsg "output * dpms on"'
+after-resume 'swaymsg "output * dpms on"'
+timeout 300 'systemctl --user start swaylock'
+timeout 600 'swaymsg "output * dpms off"'
+resume 'swaymsg "output * dpms on"'
diff --git a/config/systemd/firefox.service b/config/systemd/firefox.service
new file mode 100644
index 0000000..55bf229
--- /dev/null
+++ b/config/systemd/firefox.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Firefox nightly
+PartOf=graphical-session.target
+
+[Service]
+Type=exec
+ExecStart=/opt/firefox/firefox
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/config/systemd/mako.service b/config/systemd/mako.service
new file mode 100644
index 0000000..bd2fac2
--- /dev/null
+++ b/config/systemd/mako.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Lightweight Wayland notification daemon
+Documentation=man:mako(1)
+PartOf=sway-session.target
+After=sway-session.target
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Notifications
+ExecCondition=/bin/sh -c '[ -n "$WAYLAND_DISPLAY" ]'
+ExecStart=/usr/bin/mako
+ExecReload=/usr/bin/makoctl reload
+
+[Install]
+WantedBy=sway-session.target
diff --git a/config/systemd/nm-applet.service b/config/systemd/nm-applet.service
new file mode 100644
index 0000000..3e35f1c
--- /dev/null
+++ b/config/systemd/nm-applet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=network monitor and control GUI applet
+Documentation=man:nm-applet(1)
+PartOf=wayland-session.target
+After=wayland-session.target
+
+# requires nm-applet compiled with -D appindicator=yes
+[Service]
+Type=dbus
+BusName=org.freedesktop.network-manager-applet
+ExecStart=/usr/bin/nm-applet --indicator
+
+[Install]
+WantedBy=wayland-session.target
diff --git a/config/systemd/sway-session.target b/config/systemd/sway-session.target
new file mode 100644
index 0000000..87fe41d
--- /dev/null
+++ b/config/systemd/sway-session.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=sway compositor session
+Documentation=man:systemd.special(7)
+BindsTo=graphical-session.target wayland-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target
diff --git a/config/systemd/sway.service b/config/systemd/sway.service
new file mode 100644
index 0000000..ea21f05
--- /dev/null
+++ b/config/systemd/sway.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=sway - i3-compatible Wayland compositor
+Documentation=man:sway(5)
+Before=graphical-session.service
+Wants=graphical-session-pre.service
+After=graphical-session-pre.service
+
+[Service]
+Type=simple
+EnvironmentFile=-%h/.config/sway/env
+ExecStart=/usr/bin/sway
+Restart=on-failure
+RestartSec=1
+TimeoutStopSec=10
diff --git a/config/systemd/swayidle.service b/config/systemd/swayidle.service
new file mode 100644
index 0000000..d235a7a
--- /dev/null
+++ b/config/systemd/swayidle.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Idle manager for Wayland
+Documentation=man:swayidle(1)
+Documentation=https://github.com/gdamjan/swayidle - fork with sd-notify and autolock
+PartOf=graphical-session.target
+After=sway-session.target
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/swayidle -w
+
+[Install]
+WantedBy=sway-session.target
diff --git a/config/systemd/swaylock.service b/config/systemd/swaylock.service
new file mode 100644
index 0000000..88c7a10
--- /dev/null
+++ b/config/systemd/swaylock.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=swaylock - Screen locker for Wayland
+Documentation=man:swaylock(1)
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/swaylock -f
+Restart=on-failure
+
+[Install]
+WantedBy=sway-session.target
diff --git a/config/systemd/wayland-session.target b/config/systemd/wayland-session.target
new file mode 100644
index 0000000..d0b2888
--- /dev/null
+++ b/config/systemd/wayland-session.target
@@ -0,0 +1,16 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is inspired from systemd's `graphical-session.target`
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Current wayland user session
+Documentation=man:systemd.special(7)
+Requires=basic.target
+RefuseManualStart=yes
+StopWhenUnneeded=yes
+BindsTo=graphical-session.target
diff --git a/config/waybar/config b/config/waybar/config
new file mode 100644
index 0000000..8b81d45
--- /dev/null
+++ b/config/waybar/config
@@ -0,0 +1,95 @@
+{
+    "layer": "top",
+    "position": "bottom",
+    "height": 24,
+    "modules-left": ["sway/workspaces", "idle_inhibitor", "sway/mode"],
+    "modules-center": ["sway/window"],
+    "modules-right": [ "pulseaudio", "backlight", "network", "cpu", "memory", "battery#bat0", "battery#bat1",
+                       "tray", "sway/language", "clock" ],
+    "sway/workspaces": {
+         "disable-scroll": true,
+         "all-outputs": true,
+         "format": "{index} {name}"
+    },
+    "sway/mode": {
+        "format": "{}"
+    },
+    "sway/language": {
+        "format": "{}",
+        "max-length": 50
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        "tooltip-format": "{:%A\n%d %B %Y\n%H:%M}",
+        "format": "{:%a %d %b %H:%M}",
+        "format-alt": "{:%H:%M}"
+    },
+    "cpu": {
+        "format": "{usage:2}% "
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "battery#bat0": {
+        "bat": "BAT0",
+        "name": "BAT0",
+        "states": {
+            "warning": 20,
+            "critical": 10
+        },
+        "format": "{capacity}% {icon}",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat1": {
+        "bat": "BAT1",
+        "name": "BAT1",
+        "states": {
+            "warning": 20,
+            "critical": 10
+        },
+        "format": "{capacity}% {icon}",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "network": {
+        "interval": 1,
+        "max-width": 50,
+        // "interface": "wlp2s0", // (Optional) To force the use of this interface
+        "format-wifi": "",
+        "format-ethernet": "{bandwidthUpBits} {bandwidthDownBits} ",
+        "format-disconnected": "⚠",
+        "tooltip-format-wifi": " {essid}: {frequency}Mhz ({signalStrength}%)\n{bandwidthUpBits}\n{bandwidthDownBits}",
+        "tooltip-format-ethernet": " {ifname}: {ipaddr}/{cidr}",
+        "tooltip-format-disconnected": "⚠ Disconnected"
+    },
+    "pulseaudio": {
+        //"scroll-step": 1,
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-muted": "",
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "backlight": {
+        "device": "intel_backlight",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", ""]
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    }
+}
diff --git a/config/waybar/style.css b/config/waybar/style.css
new file mode 100644
index 0000000..f9db8d2
--- /dev/null
+++ b/config/waybar/style.css
@@ -0,0 +1,213 @@
+* {
+    border: none;
+    border-radius: 0;
+    font-family: Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+    min-height: 0;
+}
+
+window#waybar {
+    background-color: rgba(43, 48, 59, 0.5);
+    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+    border-bottom: 3px solid transparent;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inherit;
+    border-bottom: 3px solid #ffffff;
+}
+
+#workspaces button.focused {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor {
+    padding: 0 10px;
+    margin: 0 4px;
+    color: #ffffff;
+}
+
+#clock {
+    padding: 0 10px;
+    color: #ffffff;
+    background-color: #64727D;
+}
+
+#battery .BAT0 {
+    margin-left: 9px;
+}
+#battery .BAT1 {
+    margin-right: 9px;
+}
+#battery {
+    padding: 0 10px;
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+#custom-layout {
+    background-color: #ecf0f1;
+    color: #2d3436;
+    min-width: 2em;
+}
+
diff --git a/fedora-35-updates.repo b/fedora-35-updates.repo
new file mode 100644
index 0000000..afcf850
--- /dev/null
+++ b/fedora-35-updates.repo
@@ -0,0 +1,6 @@
+[fedora-35-updates]
+name=Fedora 35 $basearch Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f35&arch=$basearch
+enabled=0
+gpgcheck=1
+metadata_expire=1d
\ No newline at end of file
diff --git a/fedora-35.repo b/fedora-35.repo
new file mode 100644
index 0000000..07213ca
--- /dev/null
+++ b/fedora-35.repo
@@ -0,0 +1,6 @@
+[fedora-35]
+name=Fedora 35 $basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
+enabled=0
+gpgcheck=1
+metadata_expire=1d
diff --git a/fedora-base.yaml b/fedora-base.yaml
index ed3c178..0f7fa07 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -1,10 +1,13 @@
 include: fedora-common-ostree.yaml
-ref: fedora/rawhide/${basearch}/base
+ref: fedora/35/${basearch}/base
 rojig:
   name: fedora-base
   summary: "Fedora base image for alternative DE"
   license: MIT
 packages:
+  # Generic release package for desktop variants
+  - fedora-release
+  - fedora-release-ostree-desktop
   # XWayland support
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
@@ -12,4 +15,5 @@ packages:
   - xdg-desktop-portal-gtk
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index f99a8fd..f8492a7 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -5,7 +5,6 @@ packages:
   - NetworkManager-config-connectivity-fedora
   - NetworkManager-wifi
   - NetworkManager-wwan
-  - aajohan-comfortaa-fonts
   - abattis-cantarell-fonts
   - acl
   - adwaita-qt5
@@ -28,6 +27,7 @@ packages:
   - chrony
   - cifs-utils
   - colord
+  - compsize
   - coreutils
   - cpio
   - cryptsetup
@@ -35,14 +35,15 @@ packages:
   - cups-filters
   - curl
   - cyrus-sasl-plain
+  - default-editor
   - dejavu-sans-fonts
   - dejavu-sans-mono-fonts
   - dejavu-serif-fonts
   - dhcp-client
   - dnsmasq
   - e2fsprogs
-  - earlyoom
   - ethtool
+  - exfatprogs
   - fedora-bookmarks
   - fedora-chromium-config
   - fedora-repos-modular
@@ -51,8 +52,6 @@ packages:
   - filesystem
   - firefox
   - firewalld
-  - foomatic
-  - foomatic-db-ppds
   - fpaste
   - fros-gnome
   - gamemode
@@ -72,15 +71,15 @@ packages:
   - hostname
   - hplip
   - hunspell
+  - ibus-anthy
   - ibus-gtk3
   - ibus-hangul
-  - ibus-kkc
   - ibus-libpinyin
   - ibus-libzhuyin
   - ibus-m17n
   - ibus-typing-booster
   - iproute
-  - iptables
+  - iptables-nft
   - iptstate
   - iputils
   - ipw2100-firmware
@@ -101,8 +100,8 @@ packages:
   - iwl6000g2b-firmware
   - iwl6050-firmware
   - iwl7260-firmware
+  - iwlax2xx-firmware
   - jomolhari-fonts
-  - julietaula-montserrat-fonts
   - kbd
   - kernel
   - kernel-modules-extra
@@ -114,6 +113,7 @@ packages:
   - libertas-sd8686-firmware
   - libertas-sd8787-firmware
   - libertas-usb8388-firmware
+  - libglvnd-gles
   - linux-firmware
   - logrotate
   - lohit-assamese-fonts
@@ -134,11 +134,10 @@ packages:
   - mlocate
   - mpage
   - mtr
-  - nano
-  - nano-default-editor
   - nfs-utils
   - nss-altfiles
   - nss-mdns
+  - ntfs-3g
   - ntfsprogs
   - opensc
   - openssh-clients
@@ -160,7 +159,6 @@ packages:
   - policycoreutils-python-utils
   - procps-ng
   - psmisc
-  - pt-sans-fonts
   - qemu-guest-agent
   - qt5-qtbase
   - qt5-qtbase-gui
@@ -189,6 +187,8 @@ packages:
   - sudo
   - system-config-printer-udev
   - systemd
+  - systemd-oomd-defaults
+  - systemd-resolved
   - systemd-udev
   - tar
   - thai-scalable-waree-fonts
@@ -202,7 +202,9 @@ packages:
   - vim-minimal
   - wget
   - which
+  - wireplumber
   - words
+  - wpa_supplicant
   - xorg-x11-drv-amdgpu
   - xorg-x11-drv-ati
   - xorg-x11-drv-evdev
@@ -212,7 +214,6 @@ packages:
   - xorg-x11-drv-qxl
   - xorg-x11-drv-wacom
   - xorg-x11-server-Xorg
-  - xorg-x11-utils
   - xorg-x11-xauth
   - xorg-x11-xinit
   - zd1211-firmware
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index e66c6cc..6b06e46 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -1,12 +1,11 @@
 ref: fedora/rawhide/${basearch}/ostree-base
 
-automatic_version_prefix: "34"
-mutate-os-release: "34"
+automatic_version_prefix: "35"
+mutate-os-release: "35"
 
 include: fedora-common-ostree-pkgs.yaml
 
 packages:
-  - fedora-release-silverblue
   - git-core
   - lvm2
   - rpm-ostree
@@ -17,7 +16,6 @@ packages:
   - toolbox
   # Flatpak support
   - flatpak
-  - flatpak-builder
   - xdg-desktop-portal
   # HFS filesystem tools for Apple hardware
   # See https://github.com/projectatomic/rpm-ostree/issues/1380
@@ -48,8 +46,12 @@ ignore-removed-users:
   - root
 ignore-removed-groups:
   - root
-check-passwd: { type: file, filename: passwd }
-check-groups: { type: file, filename: group }
+check-passwd:
+  type: file
+  filename: passwd
+check-groups:
+  type: file
+  filename: group
 
 default_target: graphical.target
 
@@ -69,11 +71,13 @@ packages-ppc64le:
   - grub2
   - ostree-grub2
 packages-x86_64:
-  - grub2
+  - grub2-efi-ia32
   - grub2-efi-x64
+  - grub2-pc
   - ostree-grub2
   - efibootmgr
-  - shim
+  - shim-ia32
+  - shim-x64
   - microcode_ctl
   - mcelog
   - thermald
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index a6470e4..1bde080 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -1,12 +1,16 @@
 include: deepin-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/deepin
+ref: fedora/35/${basearch}/deepin
 rojig:
   name: fedora-deepin
   summary: "Fedora Deepin base image"
   license: MIT
 packages:
+  # Generic release package for desktop variants
+  - fedora-release
+  - fedora-release-ostree-desktop
   # GUI to manage updates & Flatpaks
   - gnome-software
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 25099f1..cc331f8 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -1,10 +1,11 @@
 include: kde-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/kinoite
+ref: fedora/35/${basearch}/kinoite
 rojig:
   name: fedora-kde
   summary: "Fedora Kinoite (KDE) base image"
   license: MIT
 packages:
+  - fedora-release-kinoite
   # Wayland support
   - kwayland-integration
   - kwin-wayland
@@ -14,6 +15,21 @@ packages:
   - xdg-desktop-portal-kde
   # Provide an archive manager by default
   - ark
+  # Keep some basic apps installed until we have Flatpaks available
+  # See https://pagure.io/fedora-kde/SIG/issue/13
+  - gwenview
+  - kcalc
+  - kwrite
+  - okular
+
+# Make sure the following are not pulled in when Recommended by other packages
+exclude-packages:
+  - plasma-discover-offline-updates
+  - plasma-discover-packagekit
+  # Exclude currently broken support for rpm-ostree in Discover
+  - plasma-discover-rpm-ostree
+  - plasma-pk-updates
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index 21ecf2b..74f5071 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -1,13 +1,17 @@
 include: lxqt-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/lxqt
+ref: fedora/35/${basearch}/lxqt
 rojig:
   name: fedora-lxqt
   summary: "Fedora LXQt base image"
   license: MIT
 packages:
+  # Generic release package for desktop variants
+  - fedora-release
+  - fedora-release-ostree-desktop
   - libqtxdg
   # Portals for Flatpak
   - xdg-desktop-portal-kde
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index 6080915..ee0f8e3 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -1,11 +1,12 @@
 include: mate-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/mate
+ref: fedora/35/${basearch}/mate
 rojig:
   name: fedora-mate
   summary: "Fedora Mate base image"
   license: MIT
-
 packages:
+  # Generic release sub package for desktop variants
+  - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 
@@ -13,4 +14,5 @@ exclude-packages:
   - python3-unbound
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 31327f4..e6b32de 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -1,10 +1,14 @@
 include: pantheon-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/pantheon
+ref: fedora/35/${basearch}/pantheon
 rojig:
   name: fedora-pantheon
   summary: "Fedora Pantheon base image"
   license: MIT
 packages:
+  # Generic release package for desktop variants
+  - fedora-release
+  - fedora-release-ostree-desktop
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
deleted file mode 100644
index 5881c94..0000000
--- a/fedora-rawhide.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[fedora-rawhide]
-name=Fedora rawhide $basearch
-#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-enabled=0
-gpgcheck=0
-metadata_expire=1d
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index f7f810a..bcaca35 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -1,10 +1,11 @@
 include: gnome-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/silverblue
+ref: fedora/35/${basearch}/silverblue
 rojig:
   name: fedora-silverblue
   summary: "Fedora Silverblue base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
   - desktop-backgrounds-gnome
   - gnome-shell-extension-background-logo
   - pinentry-gnome3
@@ -14,6 +15,13 @@ packages:
   # Include evince-thumbnailer otherwise PDF thumbnails won't work in Nautilus
   # https://github.com/fedora-silverblue/issue-tracker/issues/98
   - evince-thumbnailer
+  # Include evince-previewer otherwise print previews are broken in Evince
+  # https://github.com/fedora-silverblue/issue-tracker/issues/122
+  - evince-previewer
+  # Include totem-video-thumbnailer for video thumbnailing in Nautilus
+  # https://pagure.io/fedora-workstation/issue/168
+  - totem-video-thumbnailer
 
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 4655808..408ca09 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -1,11 +1,15 @@
 include: xfce-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/xfce
+ref: fedora/35/${basearch}/xfce
 rojig:
   name: fedora-xfce
   summary: "Fedora XFCE base image"
   license: MIT
 packages:
+  - fedora-release-xfce
+  # Generic release sub package for desktop variants
+  - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 repos:
-  - fedora-rawhide
+  - fedora-35
+  - fedora-35-updates
diff --git a/github-fetch.sh b/github-fetch.sh
new file mode 100755
index 0000000..ebf972e
--- /dev/null
+++ b/github-fetch.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Download built GitHub OSTree repository artifact and unpack it into a plain directory
+set -eux
+
+# download latest repo build
+REPO_FINAL="$(dirname $0)/pitti-workstation"
+REPO="${REPO_FINAL}.new"
+
+CURL="curl -u token:$(cat ~/.config/github-token) --show-error --fail"
+RESPONSE=$($CURL --silent https://api.github.com/repos/martinpitt/ostree-pitti-workstation/actions/artifacts)
+ZIP=$(echo "$RESPONSE" | jq --raw-output '.artifacts | map(select(.name == "repository"))[0].archive_download_url')
+echo "INFO: Downloading $ZIP ..."
+[ -e /tmp/repository.zip ] || $CURL -L -o /tmp/repository.zip "$ZIP"
+rm -rf "$REPO"
+mkdir -p "$REPO"
+unzip -p /tmp/repository.zip | tar -xzC "$REPO"
+rm /tmp/repository.zip
+[ ! -e "$REPO_FINAL" ] || mv "${REPO_FINAL}" "${REPO_FINAL}.old"
+mv "$REPO" "$REPO_FINAL"
+rm -rf "${REPO_FINAL}.old"
diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml
index fd31ff5..5200e7a 100644
--- a/gnome-desktop-pkgs.yaml
+++ b/gnome-desktop-pkgs.yaml
@@ -25,7 +25,6 @@ packages:
   - gnome-color-manager
   - gnome-control-center
   - gnome-disk-utility
-  - gnome-getting-started-docs
   - gnome-initial-setup
   - gnome-remote-desktop
   - gnome-session-wayland-session
@@ -60,6 +59,7 @@ packages:
   - tracker
   - tracker-miners
   - xdg-desktop-portal
+  - xdg-desktop-portal-gnome
   - xdg-desktop-portal-gtk
   - xdg-user-dirs-gtk
   - yelp
diff --git a/greetd-35.repo b/greetd-35.repo
new file mode 100644
index 0000000..f78ff45
--- /dev/null
+++ b/greetd-35.repo
@@ -0,0 +1,11 @@
+[copr:copr.fedorainfracloud.org:alebastr:sway-extras]
+name=Copr repo for sway-extras owned by alebastr
+baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-35-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
+module_hotfixes=1
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 2a1afb6..6c48e82 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -5,13 +5,12 @@ packages:
   - bluedevil
   - breeze-icon-theme
   - dolphin
-  - earlyoom
   - firewall-config
   - glibc-all-langpacks
   - gnome-keyring-pam
   - initial-setup-gui
-  - kcm_systemd
   - kde-gtk-config
+  - kde-partitionmanager
   - kde-print-manager
   - kde-settings-pulseaudio
   - kdegraphics-thumbnailers
@@ -29,7 +28,6 @@ packages:
   - konsole5
   - kscreen
   - kscreenlocker
-  - ksysguard
   - kwalletmanager5
   - kwin
   - pam-kwallet
@@ -39,9 +37,17 @@ packages:
   - plasma-desktop
   - plasma-desktop-doc
   - plasma-discover
+  - plasma-discover-notifier
+  - plasma-disks
   - plasma-drkonqi
   - plasma-nm
+  - plasma-nm-openconnect
+  - plasma-nm-openvpn
+  - plasma-nm-vpnc
   - plasma-pa
+  - plasma-systemmonitor
+  - plasma-thunderbolt
+  - plasma-vault
   - plasma-workspace
   - plasma-workspace-geolocation
   - plasma-workspace-xorg
@@ -52,4 +58,6 @@ packages:
   - sddm
   - sddm-breeze
   - sddm-kcm
+  - spectacle
+  - xdg-desktop-portal-gnome
   - xorg-x11-drv-libinput
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
index 1f49c68..45c141b 100644
--- a/mate-desktop-pkgs.yaml
+++ b/mate-desktop-pkgs.yaml
@@ -23,10 +23,11 @@ packages:
   - dconf-editor
   - engrampa
   - eom
-  - f33-backgrounds-base
-  - f33-backgrounds-extras-base
-  - f33-backgrounds-extras-mate
-  - f33-backgrounds-mate
+  - f35-backgrounds-base
+  - f35-backgrounds-extras-base
+  - f35-backgrounds-extras-mate
+  - f35-backgrounds-mate
+  - fedora-release-matecompiz
   - firefox
   - firewall-config
   - gnome-epub-thumbnailer
@@ -94,3 +95,5 @@ packages:
   - system-config-printer-applet
   - usermode-gtk
   - xdg-user-dirs-gtk
+  - xmodmap
+  - xrdb
diff --git a/pantheon-desktop-pkgs.yaml b/pantheon-desktop-pkgs.yaml
index dd97c4d..cc4df6e 100644
--- a/pantheon-desktop-pkgs.yaml
+++ b/pantheon-desktop-pkgs.yaml
@@ -11,10 +11,12 @@ packages:
   - elementary-greeter
   - elementary-icon-theme
   - elementary-music
+  - elementary-notifications
   - elementary-photos
   - elementary-print
   - elementary-screenshot-tool
   - elementary-shortcut-overlay
+  - elementary-sideload
   - elementary-sound-theme
   - elementary-terminal
   - elementary-theme
@@ -36,7 +38,6 @@ packages:
   - switchboard-plug-mouse-touchpad
   - switchboard-plug-networking
   - switchboard-plug-notifications
-  - switchboard-plug-onlineaccounts
   - switchboard-plug-pantheon-shell
   - switchboard-plug-printers
   - switchboard-plug-sharing
diff --git a/rpmfusion-free-35.repo b/rpmfusion-free-35.repo
new file mode 100644
index 0000000..a1fb520
--- /dev/null
+++ b/rpmfusion-free-35.repo
@@ -0,0 +1,33 @@
+[rpmfusion-free-35]
+name=RPM Fusion for Fedora 35 - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-35&arch=$basearch
+enabled=0
+metadata_expire=14d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
+[rpmfusion-free-debuginfo-35]
+name=RPM Fusion for Fedora 35 - Free - Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-35&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
+[rpmfusion-free-source-35]
+name=RPM Fusion for Fedora 35 - Free - Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/35/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-35&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
diff --git a/rpmfusion-free-updates-35.repo b/rpmfusion-free-updates-35.repo
new file mode 100644
index 0000000..f7553a1
--- /dev/null
+++ b/rpmfusion-free-updates-35.repo
@@ -0,0 +1,30 @@
+[rpmfusion-free-updates-35]
+name=RPM Fusion for Fedora 35 - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-35&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
+[rpmfusion-free-updates-debuginfo-35]
+name=RPM Fusion for Fedora 35 - Free - Updates Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-35&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
+[rpmfusion-free-updates-source-35]
+name=RPM Fusion for Fedora 35 - Free - Updates Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/35/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-35&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-35
+
diff --git a/rpmfusion.repo b/rpmfusion.repo
new file mode 100644
index 0000000..e826798
--- /dev/null
+++ b/rpmfusion.repo
@@ -0,0 +1,18 @@
+[rpmfusion-free]
+name=RPM Fusion for Fedora $releasever - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-34&arch=$basearch
+enabled=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=0
+
+[rpmfusion-free-updates]
+name=RPM Fusion for Fedora $releasever - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-34&arch=$basearch
+enabled=1
+enabled_metadata=1
+type=rpm-md
+gpgcheck=0
+repo_gpgcheck=0
diff --git a/x1-gen7-sway-desktop.yaml b/x1-gen7-sway-desktop.yaml
new file mode 100644
index 0000000..df68271
--- /dev/null
+++ b/x1-gen7-sway-desktop.yaml
@@ -0,0 +1,418 @@
+ref: x1-gen7-sway-desktop-35
+rojig:
+  name: x1-gen7-sway-desktop-35
+  summary: "Thinkpad X1 Gen 7 Sway Desktop - Fedora 35"
+  license: MIT
+
+automatic_version_prefix: "35"
+mutate-os-release: "35"
+
+repos:
+  - fedora-35
+  - fedora-35-updates
+  - rpmfusion-free-35
+  - rpmfusion-free-updates-35
+  - copr:copr.fedorainfracloud.org:dawid:better_fonts
+  - copr:copr.fedorainfracloud.org:alebastr:sway-extras
+
+selinux: true
+documentation: true
+boot-location: modules
+etc-group-members:
+  - wheel
+tmp-is-dir: true
+
+postprocess-script: post.sh
+
+ignore-removed-users:
+  - root
+ignore-removed-groups:
+  - root
+check-passwd:
+  type: file
+  filename: passwd
+check-groups:
+  type: file
+  filename: group
+
+default_target: graphical.target
+
+packages:
+  - lvm2
+  - rpm-ostree
+# Container management
+  - buildah
+  - podman
+  - skopeo
+  - toolbox
+# Flatpak support
+  - flatpak
+  - xdg-desktop-portal
+  - glibc-devel
+  - kernel-devel
+  - elfutils-libelf-devel
+  - fedora-repos-ostree
+  - fedora-repos-archive
+# boot / hardware / drivers
+  - efibootmgr
+  - fwupd
+  - grub2-efi-ia32
+  - grub2-efi-x64
+  - grub2-pc
+  - libva-intel-driver
+  - libva-intel-hybrid-driver
+  - mcelog
+  - microcode_ctl
+  - ostree-grub2
+  - shim-ia32
+  - shim-x64
+  - thermald
+  - thinkfan
+# base system
+  - biosdevname
+  - coreutils-common
+  - dbus-daemon
+  - device-mapper-multipath
+  - nvme-cli
+  - rng-tools
+# diagnostic / utils
+  - htop
+  - iotop
+  - lm_sensors
+  - lshw
+  - net-tools
+  - nmap-ncat
+  - powertop
+  - wireshark
+# alternative modern rust apps
+  - bat
+  - ripgrep
+# networking
+  - bridge-utils
+  - dhcpcd
+  - iwd
+  - network-manager-applet
+# shell tools and development
+  - alacritty
+  - autoconf
+  - automake
+  - ctags
+  - emacs
+  - gettext-devel
+  - git
+  - intltool
+  - ipython3
+  - libtool
+  - make
+  - neovim
+  - patchutils
+  - squashfs-tools
+  - strace
+  - systemd-container
+  - vim-enhanced
+  - w3m
+  - zram-generator
+# fonts
+  - adobe-source-sans-pro-fonts
+  - bitstream-vera-fonts-all
+  - fontawesome-fonts
+  - fontawesome-fonts-web
+  - fontconfig
+  - fontconfig-font-replacements
+  - fontconfig-enhanced-defaults
+  - google-roboto-slab-fonts
+  - langpacks-core-font-en
+  - lato-fonts
+  - open-sans-fonts
+  - terminus-fonts
+  - ucs-miscfixed-opentype-fonts
+  - urw-base35-bookman-fonts
+  - urw-base35-c059-fonts
+  - urw-base35-d050000l-fonts
+  - urw-base35-fonts-common
+  - urw-base35-fonts
+  - urw-base35-gothic-fonts
+  - urw-base35-nimbus-mono-ps-fonts
+  - urw-base35-nimbus-roman-fonts
+  - urw-base35-nimbus-sans-fonts
+  - urw-base35-p052-fonts
+  - urw-base35-standard-symbols-ps-fonts
+  - urw-base35-z003-fonts
+# audio / video
+  - alsa-plugins-pulseaudio
+  - ffmpeg
+  - gstreamer1-libav
+  - gvfs-mtp
+  - libavdevice
+  - libva
+  - libva-utils
+  - pavucontrol
+  - pulseaudio-utils
+  - vlc
+# misc
+  - feh
+  - okular
+# sway / wayland desktop
+  - brightnessctl
+  - cage
+  - greetd
+  - greetd-gtkgreet
+  - grim
+  - i3status-rs
+  - kanshi
+  - mako
+  - pinentry-qt
+  - slurp
+  - sway
+  - swayidle
+  - swaylock
+  - waybar
+  - wayland-devel
+  - wdisplays
+  - wl-clipboard
+  - wofi
+  - xdg-desktop-portal-wlr
+# virtualization
+  - libguestfs-tools
+  - libvirt-daemon-config-network
+  - libvirt-daemon-kvm
+  - python-libguestfs
+  - qemu-img
+  - qemu-kvm
+  - qemu-system-x86-core
+  - qemu-ui-sdl
+  - virt-install
+  - virt-manager
+  - virt-top
+  - virt-viewer
+# comps-sync
+  - NetworkManager
+  - NetworkManager-bluetooth
+  - NetworkManager-config-connectivity-fedora
+  - NetworkManager-wifi
+  - NetworkManager-wwan
+  - abattis-cantarell-fonts
+  - acl
+    # - adwaita-qt5
+  - alsa-sof-firmware
+  - alsa-ucm
+  - alsa-utils
+    # - atmel-firmware
+  - attr
+  - audit
+  - b43-fwcutter
+  - b43-openfwwf
+  - basesystem
+  - bash
+  - bash-completion
+  - bc
+  - bind-utils
+    # - bluez-cups
+    # - btrfs-progs
+  - bzip2
+    # - chrony
+    # - cifs-utils
+  - colord
+  - compsize
+  - coreutils
+  - cpio
+  - cryptsetup
+    # - cups
+    # - cups-filters
+  - curl
+  - cyrus-sasl-plain
+    # - default-editor
+  - dejavu-sans-fonts
+  - dejavu-sans-mono-fonts
+  - dejavu-serif-fonts
+  - dhcp-client
+  - dnsmasq
+  - e2fsprogs
+  - ethtool
+  - exfatprogs
+    # - fedora-bookmarks
+    # - fedora-chromium-config
+  - fedora-repos-modular
+    # - fedora-workstation-backgrounds
+  - file
+  - filesystem
+  - firefox
+  - firewalld
+    # - fpaste
+    # - fros-gnome
+    # - gamemode
+  - glibc
+  - glibc-all-langpacks
+  - glx-utils
+  - gnupg2
+  - google-noto-emoji-color-fonts
+  # - google-noto-sans-cjk-ttc-fonts
+  - google-noto-sans-gurmukhi-fonts
+  - google-noto-sans-sinhala-vf-fonts
+  - gstreamer1-plugins-bad-free
+  - gstreamer1-plugins-good
+  - gstreamer1-plugins-ugly-free
+    # - gutenprint
+    # - gutenprint-cups
+  - hostname
+    # - hplip
+  - hunspell
+  - ibus-anthy
+  - ibus-gtk3
+  - ibus-hangul
+  - ibus-libpinyin
+  - ibus-libzhuyin
+  - ibus-m17n
+  - ibus-typing-booster
+  - iproute
+  - iptables-nft
+  - iptstate
+  - iputils
+  - ipw2100-firmware
+  - ipw2200-firmware
+  - iwl100-firmware
+  - iwl1000-firmware
+  - iwl105-firmware
+  - iwl135-firmware
+  - iwl2000-firmware
+  - iwl2030-firmware
+  - iwl3160-firmware
+  - iwl3945-firmware
+  - iwl4965-firmware
+  - iwl5000-firmware
+  - iwl5150-firmware
+  - iwl6000-firmware
+  - iwl6000g2a-firmware
+  - iwl6000g2b-firmware
+  - iwl6050-firmware
+  - iwl7260-firmware
+  - iwlax2xx-firmware
+  - jomolhari-fonts
+  - kbd
+  - kernel
+  - kernel-modules-extra
+  - khmer-os-system-fonts
+  - less
+  - liberation-mono-fonts
+  - liberation-sans-fonts
+  - liberation-serif-fonts
+  - libertas-sd8686-firmware
+  - libertas-sd8787-firmware
+  - libertas-usb8388-firmware
+    # - libglvnd-gles
+  - linux-firmware
+  - logrotate
+  - lohit-assamese-fonts
+  - lohit-bengali-fonts
+  - lohit-devanagari-fonts
+  - lohit-gujarati-fonts
+  - lohit-kannada-fonts
+  - lohit-odia-fonts
+  - lohit-tamil-fonts
+  - lohit-telugu-fonts
+    # - lrzsz
+  - lsof
+  - man-db
+  - man-pages
+  - mdadm
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
+  - mlocate
+    # - mpage
+  - mtr
+  - nfs-utils
+  - nss-altfiles
+  - nss-mdns
+    # - ntfs-3g
+    # - ntfsprogs
+  - opensc
+  - openssh-clients
+  - openssh-server
+  - paktype-naskh-basic-fonts
+  - pam_afs_session
+    # - paps
+  - passwd
+  - passwdqc
+  - pciutils
+  - pinfo
+  - pipewire-alsa
+  - pipewire-gstreamer
+  - pipewire-pulseaudio
+  - pipewire-utils
+  - plymouth
+  - plymouth-system-theme
+  - policycoreutils
+  - policycoreutils-python-utils
+  - procps-ng
+  - psmisc
+  - qemu-guest-agent
+  - qt5-qtbase
+  - qt5-qtbase-gui
+  - qt5-qtdeclarative
+  - qt5-qtxmlpatterns
+  - quota
+    # - realmd
+  - rootfiles
+  - rpm
+  - rsync
+    # - samba-client
+  - selinux-policy-targeted
+  - setup
+  - shadow-utils
+  - sil-abyssinica-fonts
+  - sil-mingzat-fonts
+  - sil-nuosu-fonts
+  - sil-padauk-fonts
+  - smc-meera-fonts
+  - sos
+  - spice-vdagent
+  - sssd
+  - sssd-common
+  - sssd-kcm
+  - stix-fonts
+  - sudo
+    # - system-config-printer-udev
+  - systemd
+  - systemd-oomd-defaults
+  - systemd-resolved
+  - systemd-udev
+  - tar
+  - thai-scalable-waree-fonts
+  - time
+  - tree
+  - unzip
+  - uresourced
+  - usb_modeswitch
+  - usbutils
+  - util-linux
+    # - vim-minimal
+  - wget
+  - which
+  - wireplumber
+  - words
+  - wpa_supplicant
+    # - zd1211-firmware
+  - zip
+  - zram-generator-defaults
+
+# Make sure the following are not pulled in when Recommended by other packages
+exclude-packages:
+  - PackageKit
+  # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
+  - gstreamer1-plugin-openh264
+  - mozilla-openh264
+  - openh264
+  - xdg-desktop-portal-gtk
+
+add-files:
+  - ["config/systemd/mako.service", "/etc/systemd/user/mako.service"]
+  - ["config/systemd/nm-applet.service", "/etc/systemd/user/nm-applet.service"]
+  - ["config/systemd/swayidle.service", "/etc/systemd/user/swayidle.service"]
+  - ["config/systemd/swaylock.service", "/etc/systemd/user/swaylock.service"]
+  - ["config/systemd/sway-session.target", "/etc/systemd/user/sway-session.target"]
+  - ["config/systemd/wayland-session.target", "/etc/systemd/user/wayland-session.target"]
+  - ["config/sway-service.desktop", "/usr/share/wayland-sessions/sway-service.desktop"]
+  - ["config/modprobe.d/i2c_i801-blacklist.conf", "/etc/modprobe.d/i2c_i801-blacklist.conf"]
+  - ["config/environment.d/wayland.conf", "/etc/environment.d/wayland.conf"]
+  - ["config/greetd/config.toml", "/etc/greetd/config.toml"]
+  - ["config/greetd/environments", "/etc/greetd/environments"]
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index e473a98..def43f1 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -45,5 +45,4 @@ packages:
   - xfconf
   - xfdesktop
   - xfwm4
-  - xfwm4-theme-nodoka
   - xfwm4-themes