diff --git a/INSTALL.md b/INSTALL.md
index 07662fc7..a70eb2dc 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -92,8 +92,8 @@ in this example [yay](https://github.com/Jguer/yay) for the release version:
 The equivalent `-dev` or `-devel` packages are needed, if your distro
 splits development headers into their own packages.
 
-To enable X11-specific features, **libX11** and **libXScrnSaver** / **libXss**
-are needed.
+To enable X11-specific features on Linux,
+**libX11** and **libXScrnSaver** / **libXss** are needed.
 The requirements can be disabled by adding `CONFIG+=no-x11` to the
 `qmake mirage.pro` command.
 
@@ -282,7 +282,7 @@ make
 sudo make install
 ```
 
-To compile without the X11-specific dependencies and features,
+To compile without the X11-specific dependencies and features on Linux,
 run `qmake mirage.pro CONFIG+=no-x11` instead of `qmake mirage.pro`.
 
 If everything went fine, run `mirage` to start.
diff --git a/TODO.md b/TODO.md
index 79414920..cf625848 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,20 +1,16 @@
 # TODO
 
 - global presence control
-- idlemanager: what if setPresence call fails due to network?
-- fix power level control button layout when apply button is loading
+- retrieve last seen time for offline members on hover/in profile/automatically
 
-- joining new DM → not loading past events the first time?
 - fix HLabeledItem disabled opacity
   (visible for the topic area in room settings)
-
-- mark accounts as offline when closing mirage
-- retrieve last seen time for offline members on hover/in profile/automatically
-- retry if media retrieval request ends up with a 404
 - fix members not synced bug
 - fix local unread counters order
-- member profile: if no devices show up, warn about no E2E rooms shared or
-  no E2E-aware devices for that member
+- fix power level control button layout when apply button is loading
+
+- @room?
+- publish room or alias control
 
 - open context menus centered on touch screens 
 - auto-idle for Windows and OSX 
@@ -24,6 +20,9 @@
 
 - General change/upload avatar component for account and room settings
 - Refactor EventList.qml
+- Implement different delegate for different types of events in QML, instead
+  of having only one doing everything with untranslatable content texts
+  from Python
 
 ## Issues
 
diff --git a/src/utils.h b/src/utils.h
index ee4d52cd..63ac957a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -11,9 +11,9 @@
 #include <QObject>
 #include <QUuid>
 
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
     #ifndef NO_X11
-    #define USE_UNIX_AUTOAWAY
+    #define USE_LINUX_AUTOAWAY
     #include <X11/extensions/scrnsaver.h>
     #endif
 #endif
@@ -54,7 +54,7 @@ public slots:
         #ifdef Q_OS_DARWIN
         return -1;
 
-        #elif defined(USE_UNIX_AUTOAWAY)
+        #elif defined(USE_LINUX_AUTOAWAY)
         Display *display = XOpenDisplay(NULL);
         if (! display) return -1;