diff --git a/flake.lock b/flake.lock
index 4f463ec..9186be5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722495206,
-        "narHash": "sha256-kJ/MgnoLxuVVnGcVrnZuzZ2eUasKhD7SJG/HI8ugWVQ=",
+        "lastModified": 1726167369,
+        "narHash": "sha256-HESGBMdDP5NweNsfCmifXsmYg66EPRseEriIU9vbkog=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "43c433f2931b803dbe7853e0438ea0744ee48574",
+        "rev": "c7b929cfd422f37173be14f0787decb6b06aa34c",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1722515463,
-        "narHash": "sha256-6FVPz1WzHak65xJQg8tRjVyFEWMesGxfskKaCxDUnRk=",
+        "lastModified": 1725532428,
+        "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "8c25e871bba3f472e1569bbf6c0f52dcc34bf2a4",
+        "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2",
         "type": "github"
       },
       "original": {
diff --git a/whyfetch/__init__.py b/whyfetch/__init__.py
index 07ec668..414d3a2 100644
--- a/whyfetch/__init__.py
+++ b/whyfetch/__init__.py
@@ -26,11 +26,11 @@ def __main__():
 
     props: list[str] = [
         f"{d.username}@{d.hostname}",
-        f"kernel: {d.kernel}",
         f"os:     {d.os}",
+        f"kernel: {d.kernel}",
         f"shell:  {d.shell}",
         f"ram:    {d.ram}",
-        f"up:     {d.uptime}",
+        f"uptime: {d.uptime}",
         f"locale: {d.locale}",
         f"server: {d.display_server}",
     ]
@@ -42,17 +42,17 @@ def __main__():
         f"   {Colours.red}_.----._{Colours.white}    {Colours.magenta}{d.username}{Colours.white}@{Colours.magenta}{d.hostname}"
     )
     print(
-        f" {Colours.red}.'        '.{Colours.white}  {Colours.magenta}kernel:{Colours.white} {d.kernel}"
+        f" {Colours.red}.'        '.{Colours.white}  {Colours.magenta}os:{Colours.white}     {d.os}"
     )
     print(
-        f"{Colours.red}/{Colours.white}._   _.--._ {Colours.red}\\{Colours.white} {Colours.magenta}os:{Colours.white}     {d.os}"
+        f"{Colours.red}/{Colours.white}._   _.--._ {Colours.red}\\{Colours.white} {Colours.magenta}kernel:{Colours.white} {d.kernel}"
     )
     print(f"|_ '-' _.._ `| {Colours.magenta}shell:{Colours.white}  {d.shell}")
     print(
         f"{Colours.blue}\\{Colours.white} `---'    `-{Colours.blue}/{Colours.white} {Colours.magenta}ram:{Colours.white}    {d.ram}"
     )
     print(
-        f" {Colours.blue}'._      _.'{Colours.white}  {Colours.magenta}up:{Colours.white}     {d.uptime}"
+        f" {Colours.blue}'._      _.'{Colours.white}  {Colours.magenta}uptime:{Colours.white} {d.uptime}"
     )
     print(
         f"    {Colours.blue}'----'{Colours.white}     {Colours.magenta}locale:{Colours.white} {d.locale}"
diff --git a/whyfetch/data.py b/whyfetch/data.py
index b276acb..1e7be76 100644
--- a/whyfetch/data.py
+++ b/whyfetch/data.py
@@ -31,7 +31,7 @@ class Data:
             linux_res: dict[str, str] = pl.freedesktop_os_release()
             return linux_res["PRETTY_NAME"]
 
-        if ["FreeBSD", "OpenBSD", "NetBSD"] not in [ures.system]:
+        if ures.system in ["FreeBSD", "OpenBSD", "NetBSD"]:
             return ures.system
 
         if sys == "Darwin":
@@ -71,7 +71,7 @@ class Data:
         return tm.strftime("%H hours, %M minutes, %S seconds", current_uptime)
 
     def get_display_server(self) -> str:
-        if "Linux" == ures.system:
+        if ures.system in ["Linux", "FreeBSD", "OpenBSD", "NetBSD"]:
             return os.environ["XDG_SESSION_TYPE"]
         elif "Darwin" == ures.system:
             return "XQuartz"