diff --git a/roles/linroom/tasks/fri_base.yml b/roles/linroom/tasks/fri_base.yml
index f8b0fb6..c431f16 100644
--- a/roles/linroom/tasks/fri_base.yml
+++ b/roles/linroom/tasks/fri_base.yml
@@ -11,29 +11,52 @@
       - kate
       - krita
       - blender
+      - inkscape
       - pcmanfm-qt
       - qutebrowser
-      - chromium
+      - chromium-browser
       - firefox
       - qemu
       - qemu-kvm
-      - virt-goodies
+      - qemu-utils
       - virt-manager
       - wine-development
       - dosbox
-      - xul-ext-ublock-origin
-      - chromium-ublock-origin
+      - webext-ublock-origin-chromium
+      - webext-ublock-origin-firefox
       - nethack-console
       - zsh
       - tmux
       - screen
       - curl
+      - git-gui
+      - git-cola
+      - kdiff3
+      - thonny
     state: latest
+    update_cache: yes
 
 - name: Set up additional groups for students
-  debug:
-    msg: TODO: add fix
+  block:
+    - name: create user@.service.d
+      file:
+        path:  /etc/systemd/system/user@.service.d
+        state: directory
+    - name: override groups
+      template:
+        src: systemd_group_override.conf
+        dest: /etc/systemd/system/user@.service.d/override.conf
 
 - name: Set default keyboard layout to SI
-  debug:
-    msg: TODO: add fix
+  template:
+    src: default_keyboard
+    dest: /etc/default/keyboard
+
+- name: Set time to local RTC
+  shell: "timedatectl set-local-rtc 1 --adjust-system-clock"
+
+- name: Fix WoL on Intel
+  template:
+    src: intel-wol.rules
+    dest: /etc/udev/rules.d/79-wol.rules
+
diff --git a/roles/linroom/templates/default_keyboard b/roles/linroom/templates/default_keyboard
new file mode 100644
index 0000000..7477e81
--- /dev/null
+++ b/roles/linroom/templates/default_keyboard
@@ -0,0 +1,10 @@
+# KEYBOARD CONFIGURATION FILE
+
+# Consult the keyboard(5) manual page.
+
+XKBMODEL="pc105"
+XKBLAYOUT="si"
+XKBVARIANT=""
+XKBOPTIONS=""
+
+BACKSPACE="guess"
diff --git a/roles/linroom/templates/intel-wol.rules b/roles/linroom/templates/intel-wol.rules
new file mode 100644
index 0000000..8baa58e
--- /dev/null
+++ b/roles/linroom/templates/intel-wol.rules
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="net", NAME=="e*", RUN+="/sbin/ethtool -s $name wol g"
diff --git a/roles/linroom/templates/systemd_group_override.conf b/roles/linroom/templates/systemd_group_override.conf
new file mode 100644
index 0000000..6b0eec2
--- /dev/null
+++ b/roles/linroom/templates/systemd_group_override.conf
@@ -0,0 +1,2 @@
+[Service] 
+SupplementaryGroups=wireshark kvm dialout libvirt vboxusers ubridge