diff --git a/README.md b/README.md
index 60c7ef5..28be126 100644
--- a/README.md
+++ b/README.md
@@ -108,12 +108,6 @@ tar -xvzf cointop_x.x.x_linux_amd64.tar.gz cointop
 sudo mv cointop /usr/local/bin/cointop
 ```
 
-### Docker
-
-```bash
-docker run -it cointop/cointop
-```
-
 ### Homebrew (macOS)
 
 cointop is available via [Homebrew](https://formulae.brew.sh/formula/cointop) for macOS:
@@ -128,27 +122,21 @@ Run
 cointop
 ```
 
-### Flatpak (Linux)
-
-cointop is available as a [Flatpak](https://flatpak.org/) package via the [Flathub](https://flathub.org/apps/details/com.github.miguelmota.Cointop) registry.
+### Snap (Ubuntu)
 
-Add the flathub repository (if not done so already)
+cointop is available as a [snap](https://snapcraft.io/cointop) for Linux users.
 
 ```bash
-sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+sudo snap install cointop --stable
 ```
 
-Install cointop flatpak
+Running snap:
 
 ```bash
-sudo flatpak install flathub com.github.miguelmota.Cointop
+sudo snap run cointop
 ```
 
-Run cointop flatpak
-
-```bash
-flatpak run com.github.miguelmota.Cointop
-```
+Note: snaps don't work in Windows WSL. See this [issue thread](https://forum.snapcraft.io/t/windows-subsystem-for-linux/216).
 
 ### Copr (Fedora)
 
@@ -188,23 +176,29 @@ Using [yay](https://github.com/Jguer/yay)
 yay -S cointop
 ```
 
-### Snap (Ubuntu)
+### Flatpak (Linux)
 
-cointop is available as a [snap](https://snapcraft.io/cointop) for Linux users.
+cointop is available as a [Flatpak](https://flatpak.org/) package via the [Flathub](https://flathub.org/apps/details/com.github.miguelmota.Cointop) registry.
+
+Add the flathub repository (if not done so already)
 
 ```bash
-sudo snap install cointop --stable
+sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 ```
 
-Running snap:
+Install cointop flatpak
 
 ```bash
-sudo snap run cointop
+sudo flatpak install flathub com.github.miguelmota.Cointop
 ```
 
-Note: snaps don't work in Windows WSL. See this [issue thread](https://forum.snapcraft.io/t/windows-subsystem-for-linux/216).
+Run cointop flatpak
+
+```bash
+flatpak run com.github.miguelmota.Cointop
+```
 
-### FreeBSD
+### FreshPorts (FreeBSD / OpenBSD)
 
 cointop is available as a [FreshPort](https://www.freshports.org/finance/cointop/) package.
 
@@ -222,6 +216,14 @@ go get -u github.com/miguelmota/cointop
 
 You'll need additional font support for Windows. Please see the [wiki](https://github.com/miguelmota/cointop/wiki/Windows-Command-Prompt-and-WSL-Font-Support) for instructions.
 
+### Docker
+
+cointop is available on [Docker Hub](https://hub.docker.com/r/cointop/cointop).
+
+```bash
+docker run -it cointop/cointop
+```
+
 ### Binaries
 
 You can find pre-built binaries on the [releases](https://github.com/miguelmota/cointop/releases) page.
diff --git a/cointop/ssh/server.go b/cointop/ssh/server.go
index 431192e..889863f 100644
--- a/cointop/ssh/server.go
+++ b/cointop/ssh/server.go
@@ -1,5 +1,3 @@
-//+build !windows
-
 package ssh
 
 import (