diff --git a/keyboard/README.md b/keyboard/README.md
index 7a71f3e..0265ec3 100644
--- a/keyboard/README.md
+++ b/keyboard/README.md
@@ -1,7 +1,6 @@
 # Keyboard layouts
 
 I base my 2 layouts on Portuguese Mac layout for both Windows and MacOS.
-Except for the positions of Win / Mac key everything else is the same across the different operative systems.
 
 ## PT+
 
diff --git a/keyboard/windows/PT+.klc b/keyboard/windows/PT+.klc
new file mode 100644
index 0000000..27d01bd
Binary files /dev/null and b/keyboard/windows/PT+.klc differ
diff --git a/keyboard/windows/README.md b/keyboard/windows/README.md
new file mode 100644
index 0000000..8b05e8d
--- /dev/null
+++ b/keyboard/windows/README.md
@@ -0,0 +1,93 @@
+# Installing Windows layout
+
+## Specifics for Windows
+
+At the moment only PT+ exists, as I have no need for PT-Dev on windows for now.
+
+You need to **install** and **add the layout as input srouce**.
+Optionally, if you like key placements and shortcuts Mac style (ex: CMD+C for copy) there are also instuctions for it.
+
+## Install the layouts
+
+1. Download the installer for windows from the latest release on GitHub
+
+1. Unzip and run the setup.exe
+
+## [Alternative] Install the layouts (with MSKLC)
+
+On Windows you can generate an installer from a `.klc` keyboard layout file.
+
+1. Install Microsoft Keyboard Layout Creator (MSKLC) - https://www.microsoft.com/en-us/download/details.aspx?id=102134
+
+1. Open MSKLC > Load Source File > Select the `.klc` file. You should see the layout open on MSKLC
+
+1. Project > Build DLL and Setup Package > "Yes" to open the directory where the installer was created
+
+1. Run the setup.exe
+
+    > If by any reason, it fails due to repeated name or some other detail, edit them Project > Properties and repeat
+    the previous step to make a new setup package
+
+## Add layout as input source
+
+1. Go to Language Settings (Settings > Time & Language > Language)
+
+1. Expand your current language > Options
+
+1. Add a keyboard > Scroll until you find it (sorted alphabetically)
+
+1. You can either remove the previous keyboard, or leave it there.
+Choose what you want to use on the Language Bar on the bottom right corner
+
+## [Optional] Add MacOS like shortcuts
+
+You may want to check https://medium.com/@chrisdhanaraj/mapping-your-macos-keybinds-to-windows-b6009c50065b where the author
+goes on a good explanation on how to remap Ctrl and Alt, and how to have the shortcuts. I made it a bit different,
+focused more on swapping Alt with Win key, and then adding the shortcuts, pick your poison.
+
+Also, with my approach, if you have a keyboard with Mac mode, you don't need to do the
+[Swap Alt and Windows key location](#optional-swap-alt-and-windows-key-location)
+
+1. Install AutoHotkey - https://www.autohotkey.com
+
+1. Add a shortcut for the mac-win-shortcuts.ahk on your [startup](https://www.autohotkey.com/docs/FAQ.htm#Startup).
+> Press Win+R to open the Run dialog, then enter shell:startup to open the startup folder.
+
+## [Optional] Swap Alt and Windows key location
+
+1. Install [Sharpkeys](https://github.com/randyrants/sharpkeys/releases)
+
+1. "Load keys" and select the provided `alt-win-swap.skl` OR click "Add" to add the new 4 mappings:
+
+    1. Special: Left Alt -> Special: Left Windows
+
+    1. Special: Left Windows -> Special: Left Alt
+
+    1. Special: Right Alt -> Special: Right Windows
+
+    1. Special: Right Windows -> Special: Right Alt
+
+2. Once you see the 4 mappings on the SharpKeys, press "Write to Registry" and reboot
+
+And with that, you should be done!
+
+## Undo Alt and Windows swap
+
+Follow the instructions of the previous section, but now "Delete All", and then "Write to Registry".
+
+## Delete Installed layouts
+
+1. Remove the keyboard from the input souce, the same way you added it at [Add layout as input source](#add-layout-as-input-source),
+but now click "Remove" on it
+
+1. Remove it from registry (regedit.exe)
+
+    1. Delete it from inside `Computer\HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layouts` (should be at the bottom)
+
+1. Remove the dlls with the matching name of that layout
+
+    1. `C:\Windows\System32`
+
+    1. `C:\Windows\SysWOW64`
+
+    1. Reboot for good measure, or if it fails to delete the .dll files
diff --git a/keyboard/windows/alt-win-swap.skl b/keyboard/windows/alt-win-swap.skl
new file mode 100644
index 0000000..fe405ce
Binary files /dev/null and b/keyboard/windows/alt-win-swap.skl differ
diff --git a/keyboard/windows/mac-win-shortcuts.ahk b/keyboard/windows/mac-win-shortcuts.ahk
new file mode 100644
index 0000000..7a8a5d5
--- /dev/null
+++ b/keyboard/windows/mac-win-shortcuts.ahk
@@ -0,0 +1,115 @@
+; Adds some mac like shortcuts, the original shortcuts still work
+
+; # Win
+; ! Alt
+; ^ Ctrl
+; + Shift
+
+; Undo - Win+z
+#z::
+Send, ^z
+return
+
+; Cut - Win+x
+#x::
+Send, ^x
+return
+
+; Copy - Win+c
+#c::
+Send, ^c
+return
+
+; Paste - Win+v
+#v::
+Send, ^v
+return
+
+; Find - Win+f
+#f::
+Send, ^f
+return
+
+; Save - Win+s
+#s::
+Send, ^s
+return
+
+; Switch Windows - Alt+Tab
+LWin & Tab::AltTab
+RWin & Tab::AltTab
+
+; Run command - Ctrl+r
+^r::
+Send, #r
+return
+
+; Refresh - Win+r
+#r::
+Send, {F5}
+return
+
+; New tab - Win+t
+#t::
+Send, ^t
+return
+
+; Re-open tab - Win+Shift+t
+#+t::
+Send, ^+t
+return
+
+; Close tab - Win+w
+#w::
+Send, ^w
+return
+
+; Close window - Win+q
+#q::
+Send, !{F4}
+return
+
+; Select all - Win+a
+#a::
+Send, ^a
+return
+
+; Home - Win+Left
+#Left::
+    Send {Home}
+Return
+
+; HomeShift - Win+Shift+Left
+#+Left::
+    Send +{Home}
+Return
+
+; End - Win+Right
+#Right::
+    Send {End}
+Return
+
+; EndShift - Win+Shift+Right
+#+Right::
+    Send +{End}
+Return
+
+; PgUp - Win+Up
+#Up::
+    Send {PgUp}
+Return
+
+; PgUpShift - Win+Shift+Up
+#+Up::
+    Send +{PgUp}
+Return
+
+; PgDn - Win+Down
+#Down::
+    Send {PgDn}
+Return
+
+; PgDnShift - Win+Shift+Down
+#+Down::
+    Send +{PgDn}
+Return