diff --git a/_data/os.yml b/_data/os.yml
index 05852e40..bd1cbb75 100644
--- a/_data/os.yml
+++ b/_data/os.yml
@@ -1,3 +1,21 @@
+# desktop
+
+bsd:
+  name: BSD
+  icon: "fa-brands fa-freebsd"
+
+linux:
+  name: GNU/Linux
+  icon: "fa-brands fa-linux"
+
+macos:
+  name: macOS
+  icon: "fa-brands fa-apple"
+
+windows:
+  name: Windows
+  icon: "fa-brands fa-windows"
+
 # mobile
 android:
   name: Android
diff --git a/_data/sw_clients.yml b/_data/sw_clients.yml
index 019874b9..acb6fcbc 100644
--- a/_data/sw_clients.yml
+++ b/_data/sw_clients.yml
@@ -3,6 +3,8 @@
     - name: AdiIRC
       # ref: https://dev.adiirc.com/projects/adiirc/wiki/IRCv3
       link: https://www.adiirc.com
+      os:
+        - windows
       support:
         stable:
           account-notify:
@@ -37,6 +39,10 @@
     - name: Ambassador
       # ref: JSIRCV3_SUPPORTED_CAPS in https://github.com/Ascrod/ambassador/blob/7d2b260f1a069e2d11718c576d694f9343c096be/ambassador/js/lib/irc.js
       link: https://github.com/Ascrod/ambassador/
+      os:
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify:
@@ -98,6 +104,8 @@
       # ref: handleCapWithParameters() in https://github.com/colloquy/colloquy/blob/main/Chat%20Core/MVIRCChatConnection.m
       # https://github.com/colloquy/colloquy/blob/4c47cfbaf686e1ac18937e5727b240d7df60d06d/Chat%20Core/MVIRCChatConnection.m#L2036
       link: http://www.colloquy.info
+      os:
+        - macos
       support:
         stable:
           account-notify:
@@ -148,6 +156,11 @@
       # ref: supported_caps in https://github.com/hexchat/hexchat/blob/v2.16.1/src/common/inbound.c#L1715
       # inbound_005 in https://github.com/hexchat/hexchat/blob/v2.16.1/src/common/modes.c#L923
       link: https://hexchat.github.io
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify:
@@ -176,6 +189,8 @@
     - name: IceChat
       # ref: CapREQ() in https://github.com/icechat/IceChat/blob/9.53P/src/IceChat/IRCConnection/ParseIRCData.cs
       link: https://icechat.net
+      os:
+        - windows
       support:
         stable:
           account-notify:
@@ -199,6 +214,11 @@
       # ref: CAP_ in https://github.com/irssi/irssi/blob/1.4.3/src/irc/core/irc-servers.h#L17
       # WHOX_ in https://github.com/irssi/irssi/blob/1.4.3/src/irc/core/channels-query.c#L55-L57
       link: https://irssi.org
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify:
@@ -223,6 +243,11 @@
       # ref: Server::initCapablityNames() in https://github.com/KDE/konversation/blob/v21.04.0/src/irc/server.cpp
       # https://github.com/KDE/konversation/blob/a8ac257a30d0c56635a35b12bdb59c45b5868c37/src/irc/inputfilter.cpp#L1283
       link: https://konversation.kde.org
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify:
@@ -245,6 +270,11 @@
       # ref: cap_add() in https://github.com/kvirc/KVIrc/blob/5.0.0/src/kvirc/kernel/KviIrcConnection.cpp
       # https://github.com/kvirc/KVIrc/blob/5.0.0/src/kvirc/kernel/KviIrcConnection.cpp#L1997-L1999
       link: https://www.kvirc.net
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify: Git
@@ -264,6 +294,8 @@
     - name: LimeChat
       # ref: https://github.com/psychs/limechat/blob/2.42/Classes/IRC/IRCClient.m#L3681
       link: http://limechat.net/mac/
+      os:
+        - macos
       support:
         stable:
           cap-3.1:
@@ -275,6 +307,8 @@
       # ref: https://www.mirc.com/news.html
       #      https://www.mirc.com/versions.txt
       link: https://www.mirc.com
+      os:
+        - windows
       support:
         stable:
           account-notify:
@@ -311,6 +345,11 @@
       # ref: irc{CAP,EchoMessage,MultiPrefix,SASL,ServerTime,WatchMonitor}.jsm files in
       #      https://github.com/mozilla/releases-comm-central/tree/219c6396225f9c262cef4fe7766f5c31cefe2a05/chat/protocols/irc
       link: https://www.thunderbird.net/
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           cap-notify: 72.0+
@@ -329,6 +368,11 @@
       # ref: knownCaps in https://github.com/quassel/quassel/blob/0.14.0/src/common/irccap.h
       # https://github.com/quassel/quassel/blob/da9c1c9fcf25f9dbd9acb96e6c8d1ff148e55986/src/core/corenetwork.cpp#L1475-L1488
       link: https://www.quassel-irc.org
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           account-notify:
@@ -380,6 +424,11 @@
     - name: Srain
       # ref: https://srain.silverrainz.me/support.html
       link: https://srain.silverrainz.me
+      os:
+        - bsd
+        - linux
+        - macos
+        - windows
       support:
         stable:
           cap-notify:
@@ -396,6 +445,10 @@
     - name: Swirc
       # ref: https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md
       link: https://www.nifty-networks.net/swirc/
+      os:
+        - bsd
+        - linux
+        - windows
       support:
         stable:
           account-notify:
@@ -412,6 +465,8 @@
       # ref: isCapabilitySupported in https://github.com/Codeux-Software/Textual/blob/55498fb845baf9efe1df93bc4e463edbe5c2057f/Sources/App/Classes/IRC/IRCClient.m
       # ref: https://github.com/Codeux-Software/Textual/blob/v6.0.1/Classes/IRC/IRCClient.m#L4590
       link: https://www.codeux.com/textual
+      os:
+        - macos
       support:
         stable:
           away-notify:
@@ -433,6 +488,10 @@
       # ref: https://weechat.org/files/changelog/ChangeLog-devel.html or
       # https://github.com/weechat/weechat/blob/v3.7.1/doc/en/weechat_user.en.adoc#irc_ircv3_support
       link: https://weechat.org
+      os:
+        - bsd
+        - linux
+        - macos
       support:
         stable:
           account-notify:
diff --git a/_data/validation/sw_list.types.yaml b/_data/validation/sw_list.types.yaml
index 28f1067c..0b54ca76 100644
--- a/_data/validation/sw_list.types.yaml
+++ b/_data/validation/sw_list.types.yaml
@@ -38,9 +38,12 @@ software:
           required: false
           values:
             - android
+            - bsd
             - ios
-            - windows-phone
             - linux
+            - macos
+            - windows
+            - windows-phone
         support:
           type: mapofmultis
           types:
diff --git a/css/partials/_swtable.scss b/css/partials/_swtable.scss
index 5dc21add..d8c875b0 100644
--- a/css/partials/_swtable.scss
+++ b/css/partials/_swtable.scss
@@ -215,7 +215,6 @@
 
   .os-support {
     text-align: right;
-    margin-left: .5em;
     float: right;
   }
 }
@@ -322,15 +321,21 @@ tr.popup-above .support .hover-popup > div:after {
 .os-support-windows-phone {
   color: #229eda;
 }
-.os-support-ios {
+.os-support-ios, .os-support-macos {
   color: #444;
 }
 .os-support-android {
   color: #9fc234;
 }
+.os-support-windows {
+  color: #4d75b3;
+}
 .os-support-linux {
   color: #222;
 }
+.os-support-bsd {
+  color: #a42f2f;
+}
 
 @media only screen and (max-width: 500px)  {
   .support-table {