diff --git a/roles/linroom/tasks/7zip.yml b/roles/linroom/tasks/7zip.yml
new file mode 100644
index 0000000..94c08d4
--- /dev/null
+++ b/roles/linroom/tasks/7zip.yml
@@ -0,0 +1,4 @@
+- name: Install 7zip
+  apt:
+    name: 7zip
+    state: latest
diff --git a/roles/linroom/tasks/chrome.yml b/roles/linroom/tasks/chrome.yml
new file mode 100644
index 0000000..21a141a
--- /dev/null
+++ b/roles/linroom/tasks/chrome.yml
@@ -0,0 +1,4 @@
+- name: Do NOT install Chrome
+  apt:
+    name: chromium
+    state: latest
diff --git a/roles/linroom/tasks/firefox.yml b/roles/linroom/tasks/firefox.yml
new file mode 100644
index 0000000..c80124a
--- /dev/null
+++ b/roles/linroom/tasks/firefox.yml
@@ -0,0 +1,22 @@
+- name: Add Firefox not-a-snap repository
+  block:
+    - name: Pin Firefox PPA package priority
+      template:
+        src: mozilla-firefox-apt-preferences
+        dest: /etc/apt/preferences.d/mozilla-firefox
+    - name: Enable Firefox unattended upgrades
+      template:
+        src: mozilla-firefox-unattended-upgrades 
+        dest: /etc/apt/apt.conf.d/51unattended-upgrades-firefox
+    - name: Add Firefox PPA
+      apt_repository:
+        repo: ppa:mozillateam/ppa
+        state: present
+        update_cache: True
+        validate_certs: False
+
+- name: Install Firefox
+  apt:
+    name:
+      - firefox
+    state: latest
diff --git a/roles/linroom/tasks/fri_base.yml b/roles/linroom/tasks/fri_base.yml
index 9e7d160..99eca59 100644
--- a/roles/linroom/tasks/fri_base.yml
+++ b/roles/linroom/tasks/fri_base.yml
@@ -1,19 +1,8 @@
-- name: Add Firefox not-a-snap repository
-  block:
-    - name: Pin Firefox PPA package priority
-      template:
-        src: mozilla-firefox-apt-preferences
-        dest: /etc/apt/preferences.d/mozilla-firefox
-    - name: Enable Firefox unattended upgrades
-      template:
-        src: mozilla-firefox-unattended-upgrades 
-        dest: /etc/apt/apt.conf.d/51unattended-upgrades-firefox
-    - name: Add Firefox PPA
-      apt_repository:
-        repo: ppa:mozillateam/ppa
-        state: present
-        update_cache: True
-        validate_certs: False
+- name: Install firefox
+  - include_tasks: firefox.yml
+
+- name: Install 7zip
+  - include_tasks: 7zip.yml
 
 - name: Install generally useful packages
   apt:
@@ -148,6 +137,12 @@
 - name: Set time to local RTC
   shell: "timedatectl set-local-rtc 1 --adjust-system-clock"
 
-- name: Enable Wake-on-LAN
-  import_tasks: wake-on-lan.yml
+- name: Install ethtool
+  apt:
+    name: ethtool
+    state: latest
 
+- name: Add udev rule to enable wake-on-lan for ethernet interfaces
+  copy:
+    dest: /etc/udev/rules.d/
+    src: 99-wakeonlan.rules
diff --git a/roles/linroom/tasks/wake-on-lan.yml b/roles/linroom/tasks/settings.yml
similarity index 100%
rename from roles/linroom/tasks/wake-on-lan.yml
rename to roles/linroom/tasks/settings.yml
diff --git a/roles/linroom/tasks/winidea.yml b/roles/linroom/tasks/winidea.yml
index b5d0827..543373a 100644
--- a/roles/linroom/tasks/winidea.yml
+++ b/roles/linroom/tasks/winidea.yml
@@ -1 +1,5 @@
-# TODO install WinIDEA
+- name: Install WinIdea snap
+  community.general.snap:
+    name:
+      - winidea
+    classic: true