diff --git a/.github/labeler.yml b/.github/labeler.yml
index 3d4fb9eab1..f9a441cae9 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -2,6 +2,130 @@ version: 1
 appendOnly: true
 
 labels:
+  - label: 'enhancement'
+    type: 'issue'
+    body: "([Ee]nhance(d|ment)|[Ii]mprove(ment|d))"
+  - label: 'enhancement'
+    type: 'issue'
+    title: "([Ee]nhance(d|ment)|[Ii]mprove(ment|d))"
+  - label: 'feature'
+    type: 'issue'
+    title: "([Ff]eature|[Ss]uggestion)"
+  - label: 'packaging'
+    type: 'issue'
+    body: "([Pp]ackage|AUR)"
+  - label: 'question'
+    type: 'issue'
+    body: "([Ww](ondering|ant(ed)? to ask|ould like to (know|understand)))"
+
+  - label: 'priority: low'
+    type: 'issue'
+    body: "low priority"
+
+  - label: 'display: console'
+    type: 'pull_request'
+    files:
+      - src/display-console.cc
+      - src/display-console.hh
+  - label: 'display: file'
+    type: 'pull_request'
+    files:
+      - src/display-file.cc
+      - src/display-file.hh
+  - label: 'display: http'
+    type: 'pull_request'
+    files:
+      - src/display-http.cc
+      - src/display-http.hh
+  - label: 'display: ncurses'
+    type: 'pull_request'
+    files:
+      - src/nc.cc
+      - src/nc.h
+      - src/display-ncurses.cc
+      - src/display-ncurses.hh
+  - label: 'display: wayland'
+    type: 'pull_request'
+    files:
+      - src/wl.cc
+      - src/wl.h
+      - src/wlr-layer-shell-unstable-v1.xml
+      - src/display-wayland.cc
+      - src/display-wayland.hh
+  - label: 'display: wayland'
+    type: 'issue'
+    title: "[Ww]ayland"
+  
+  - label: 'display: x11'
+    type: 'pull_request'
+    files:
+      - src/x11-color.cc
+      - src/x11-color.h
+      - src/x11.cc
+      - src/x11.h
+      - src/display-x11.cc
+      - src/display-x11.hh
+  - label: 'display: x11'
+    type: 'issue'
+    title: "[Xx]11"
+
+  - label: 'os: linux'
+    type: 'pull_request'
+    files:
+      - src/linux.cc
+      - src/linux.h
+  - label: 'os: linux'
+    type: 'issue'
+    title: "[Ll]inux"
+  - label: 'os: dragonfly'
+    type: 'pull_request'
+    files:
+      - src/dragonfly.cc
+      - src/dragonfly.h
+  - label: 'os: dragonfly'
+    type: 'issue'
+    body: "[Dd]ragon[Ff]ly"
+  - label: 'os: freebsd'
+    type: 'pull_request'
+    files:
+      - src/freebsd.cc
+      - src/freebsd.h
+  - label: 'os: dragonfly'
+    type: 'issue'
+    body: "[Ff]ree\\s?(BSD|bsd)"
+  - label: 'os: netbsd'
+    type: 'pull_request'
+    files:
+      - src/netbsd.cc
+      - src/netbsd.h
+  - label: 'os: netbsd'
+    type: 'issue'
+    body: "[Nn]et\\s?(BSD|bsd)"
+  - label: 'os: openbsd'
+    type: 'pull_request'
+    files:
+      - src/openbsd.cc
+      - src/openbsd.h
+  - label: 'os: openbsd'
+    type: 'issue'
+    body: "[Oo]pen\\s?(BSD|bsd)"
+  - label: 'os: solaris'
+    type: 'pull_request'
+    files:
+      - src/solaris.cc
+      - src/solaris.h
+  - label: 'os: solaris'
+    type: 'issue'
+    body: "[Ss](olaris|OLARIS)"
+  - label: 'os: haiku'
+    type: 'pull_request'
+    files:
+      - src/haiku.cc
+      - src/haiku.h
+  - label: 'os: haiku'
+    type: 'issue'
+    body: "[Hh](aiku|AIKU)"
+
   - label: 'documentation'
     type: 'pull_request'
     files:
@@ -10,7 +134,7 @@ labels:
       - data/conky*.conf
   - label: 'documentation'
     type: 'issue'
-    title: "[Dd]ocument(ation)?"
+    title: "[Dd]ocument(ation)?" # can be mentioned but unrelated
 
   - label: 'extras'
     type: 'pull_request'
@@ -36,12 +160,6 @@ labels:
       - web/*
       - web/**/*
 
-  - label: 'appimage'
-    type: 'pull_request'
-    files:
-      - appimage/*
-      - appimage/**/*
-
   - label: 'appimage'
     type: 'issue'
     body: "(appimage|AppImage|Appimage)"
@@ -66,6 +184,12 @@ labels:
       - web/package-lock.json
       - cmake/ConkyPlatformChecks.cmake
 
+  - label: 'appimage'
+    type: 'pull_request'
+    files:
+      - appimage/*
+      - appimage/**/*
+
   - label: 'audio'
     type: 'pull_request'
     files:
@@ -85,10 +209,9 @@ labels:
       - src/xmms2.h
       - src/pulseaudio.cc
       - src/pulseaudio.h
-
   - label: 'audio'
     type: 'issue'
-    body: "([Aa]udacious|CMUS|cmus|MPD|mpd|[Mm]ixer|xmms2|XMMS2|[Pp]ulse[Aa]udio)"
+    title: "([Aa]udio|[Aa]udacious|CMUS|cmus|MPD|libmpd|[Mm]ixer|xmms2|XMMS2|[Pp]ulse[Aa]udio|[Mm]usic|[Ss]ong)" # can be in config
   
   - label: 'power'
     type: 'pull_request'
@@ -99,53 +222,9 @@ labels:
       - src/bsdapm.h
       - src/smapi.cc
       - src/smapi.h
-
-  - label: 'display: console'
-    type: 'pull_request'
-    files:
-      - src/display-console.cc
-      - src/display-console.hh
-  - label: 'display: file'
-    type: 'pull_request'
-    files:
-      - src/display-file.cc
-      - src/display-file.hh
-  - label: 'display: http'
-    type: 'pull_request'
-    files:
-      - src/display-http.cc
-      - src/display-http.hh
-  - label: 'display: ncurses'
-    type: 'pull_request'
-    files:
-      - src/nc.cc
-      - src/nc.h
-      - src/display-ncurses.cc
-      - src/display-ncurses.hh
-  - label: 'display: wayland'
-    type: 'pull_request'
-    files:
-      - src/wl.cc
-      - src/wl.h
-      - src/wlr-layer-shell-unstable-v1.xml
-      - src/display-wayland.cc
-      - src/display-wayland.hh
-  - label: 'display: wayland'
-    type: 'issue'
-    title: "[Ww]ayland"
-  
-  - label: 'display: x11'
-    type: 'pull_request'
-    files:
-      - src/x11-color.cc
-      - src/x11-color.h
-      - src/x11.cc
-      - src/x11.h
-      - src/display-x11.cc
-      - src/display-x11.hh
-  - label: 'display: x11'
+  - label: 'power'
     type: 'issue'
-    title: "[Xx]11"
+    title: "([Bb]attery|[Cc]harged)" # can be in config
 
   - label: 'build system'
     type: 'pull_request'
@@ -161,11 +240,23 @@ labels:
     type: 'issue'
     title: "([Cc]airo)" # can be in config
 
+  - label: 'sensors'
+    type: 'pull_request'
+    files:
+      - src/hddtemp.cc
+      - src/hddtemp.h
+  - label: 'disk io'
+    type: 'issue'
+    title: "(temperature|temp)" # can be in config
+
   - label: 'disk io'
     type: 'pull_request'
     files:
       - src/diskio.cc
       - src/diskio.h
+  - label: 'disk io'
+    type: 'issue'
+    title: "(HDD|hdd|SSD|ssd|[Dd](isk|rive) space|filesystem)" # can be in config
 
   - label: 'cpu'
     type: 'pull_request'
@@ -178,7 +269,7 @@ labels:
       - src/top.h
   - label: 'cpu'
     type: 'issue'
-    title: "(CPU|cpu)"
+    title: "(CPU|cpu)" # can be in config
 
   - label: 'lua'
     type: 'pull_request'
@@ -193,64 +284,18 @@ labels:
       - src/lua-config.hh
   - label: 'lua'
     type: 'issue'
-    title: "[Ll](ua|UA)"
+    title: "[Ll](ua|UA)" # can be in config
 
-  - label: 'os: linux'
+  - label: 'mail'
     type: 'pull_request'
     files:
-      - src/linux.cc
-      - src/linux.h
-  - label: 'os: linux'
+      - src/mail.cc
+      - src/mail.h
+      - src/mboxscan.cc
+      - src/mboxscan.h
+  - label: 'mail'
     type: 'issue'
-    title: "[Ll]inux"
-  - label: 'os: dragonfly'
-    type: 'pull_request'
-    files:
-      - src/dragonfly.cc
-      - src/dragonfly.h
-  - label: 'os: dragonfly'
-    type: 'issue'
-    body: "[Dd]ragon[Ff]ly"
-  - label: 'os: freebsd'
-    type: 'pull_request'
-    files:
-      - src/freebsd.cc
-      - src/freebsd.h
-  - label: 'os: dragonfly'
-    type: 'issue'
-    body: "[Ff]ree\\s?(BSD|bsd)"
-  - label: 'os: netbsd'
-    type: 'pull_request'
-    files:
-      - src/netbsd.cc
-      - src/netbsd.h
-  - label: 'os: netbsd'
-    type: 'issue'
-    body: "[Nn]et\\s?(BSD|bsd)"
-  - label: 'os: openbsd'
-    type: 'pull_request'
-    files:
-      - src/openbsd.cc
-      - src/openbsd.h
-  - label: 'os: openbsd'
-    type: 'issue'
-    body: "[Oo]pen\\s?(BSD|bsd)"
-  - label: 'os: solaris'
-    type: 'pull_request'
-    files:
-      - src/solaris.cc
-      - src/solaris.h
-  - label: 'os: solaris'
-    type: 'issue'
-    body: "[Ss](olaris|OLARIS)"
-  - label: 'os: haiku'
-    type: 'pull_request'
-    files:
-      - src/haiku.cc
-      - src/haiku.h
-  - label: 'os: haiku'
-    type: 'issue'
-    body: "[Hh](aiku|AIKU)"
+    title: "(e?mail|[Mm][Bb](ox|OX))" # can be in config
 
   - label: 'mouse events'
     type: 'pull_request'
@@ -274,7 +319,7 @@ labels:
       - src/read_tcpip.h
   - label: 'networking'
     type: 'issue'
-    body: "(network|IP address|download|upload)"
+    title: "(network|IP address|download|upload)" # can be in config
 
   - label: 'nvidia'
     type: 'pull_request'
@@ -283,7 +328,7 @@ labels:
       - src/nvidia.h
   - label: 'nvidia'
     type: 'issue'
-    body: "[Nn](vidia|VIDIA)"
+    title: "[Nn](vidia|VIDIA)" # can be in config
 
   - label: 'rendering'
     type: 'pull_request'
@@ -292,10 +337,21 @@ labels:
       - src/text_object.h
       - src/specials.cc
       - src/specials.h
+  - label: 'rendering'
+    type: 'issue'
+    title: "([Xx](ft|FT))"
+  - label: 'rendering'
+    type: 'issue'
+    body: "(incorrect|bad|wrong)(ly)? (size|align|position)(ed|ment)"
+  - label: 'rendering'
+    type: 'issue'
+    body: "(flicker(ing)?|font icons?|[Xx](ft|FT))"
 
   - label: 'text'
     type: 'pull_request'
     files:
+      - src/core.cc
+      - src/core.h
       - src/text_object.cc
       - src/text_object.h
       - src/template.cc
@@ -307,3 +363,10 @@ labels:
   - label: 'text'
     type: 'issue'
     body: "\\$\\w+ variable"
+
+  - label: 'build system'
+    type: 'issue'
+    title: "([Cc]?(CM|cm)ake|([Mm]ake|[Bb]uild) error|compil(e|ation))"
+  - label: 'build system'
+    type: 'issue'
+    body: "([Cc]?(CM|cm)ake|([Mm]ake|[Bb]uild) error|compil(e|ation))"