diff --git a/keymaps/intellij-idea-keymap.cson b/keymaps/intellij-idea-keymap.cson
index 31ede8a..e4c706d 100644
--- a/keymaps/intellij-idea-keymap.cson
+++ b/keymaps/intellij-idea-keymap.cson
@@ -1,12 +1,37 @@
-# The descriptions above the key bindings are the ones from the IntelliJ IDEA Max OS X Keymap
-
+# The descriptions above the key bindings are the ones from the IntelliJ IDEA Keymap
 # Use more specific selector than core key bindings
+
+################################################################################
+# Multi-platform                                                               #
+################################################################################
 'atom-workspace atom-text-editor:not([mini])':
 
   ###########
   # Editing #
   ###########
 
+  # Smart line join
+  'ctrl-shift-j': 'editor:join-lines'
+
+  ##############
+  # Navigation #
+  ##############
+
+  # Select current file or symbol in any view
+  'alt-f1': 'tree-view:reveal-active-file'
+
+
+################################################################################
+# Mac OS only                                                                  #
+################################################################################
+# https://resources.jetbrains.com/assets/products/intellij-idea/IntelliJIDEA_ReferenceCard_mac.pdf
+
+'.platform-darwin atom-workspace atom-text-editor:not([mini])':
+
+  ###########
+  # Editing #
+  ###########
+
   # Duplicate current line or selected block
   'cmd-d': 'editor:duplicate-lines'
 
@@ -19,9 +44,6 @@
   # Delete line at caret
   'cmd-backspace': 'editor:delete-line'
 
-  # Smart line join
-  'ctrl-shift-j': 'editor:join-lines'
-
   # Move line up
   'cmd-shift-up': 'editor:move-line-up'
 
@@ -46,7 +68,7 @@
   ##############
 
   # Go to class
-  'cmd-o': 'fuzzy-finder:toggle-buffer-finder'
+  'cmd-o': 'fuzzy-finder:toggle-file-finder'
 
   # Go to file
   'cmd-shift-o': 'fuzzy-finder:toggle-file-finder'
@@ -63,9 +85,6 @@
   # Recent files popup
   'cmd-e': 'fuzzy-finder:toggle-buffer-finder'
 
-  # Select current file or symbol in any view
-  'alt-f1': 'tree-view:reveal-active-file'
-
   ##################
   # Live Templates #
   ##################
@@ -82,3 +101,88 @@
 
   # Find action
   'cmd-shift-a': 'command-palette:toggle'
+
+################################################################################
+# Windows & Linux                                                              #
+################################################################################
+# https://resources.jetbrains.com/assets/products/intellij-idea/IntelliJIDEA_ReferenceCard.pdf
+
+'.platform-win32 atom-workspace atom-text-editor:not([mini]), .platform-linux atom-workspace atom-text-editor:not([mini])':
+
+  ###########
+  # Editing #
+  ###########
+
+  # Duplicate current line or selected block
+  'ctrl-d': 'editor:duplicate-lines'
+
+  # Select successively increasing code blocks
+  'ctrl-w': 'editor:select-to-next-subword-boundary'
+
+  # Decrease current selection to previous state
+  'ctrl-shift-w': 'editor:select-to-previous-subword-boundary'
+
+  # Delete line at caret
+  'shift-delete': 'editor:delete-line'
+  'ctrl-y': 'editor:delete-line'
+
+  # Move line up
+  'ctrl-shift-up': 'editor:move-line-up'
+
+  # Move line down
+  'ctrl-shift-down': 'editor:move-line-down'
+
+  ##################
+  # Search/Replace #
+  ##################
+
+  # Replace
+  'ctrl-r': 'find-and-replace:show'
+
+  # Find in path
+  'ctrl-shift-f': 'project-find:show'
+
+  # Replace in path
+  'ctrl-shift-r': 'project-find:show'
+
+  ##############
+  # Navigation #
+  ##############
+
+  # Go to class
+  'ctrl-n': 'fuzzy-finder:toggle-file-finder'
+
+  # Go to file
+  'ctrl-shift-n': 'fuzzy-finder:toggle-file-finder'
+
+  # Go to next editor tab
+  'alt-right': 'pane:show-next-item'
+
+  # Go to previous editor tab
+  'alt-left': 'pane:show-previous-item'
+
+  # Go to line
+  'ctrl-l': 'go-to-line:toggle'
+
+  # Recent files popup
+  'ctrl-e': 'fuzzy-finder:toggle-buffer-finder'
+
+  # Select current file or symbol in any view
+  'alt-f1': 'tree-view:reveal-active-file'
+
+  ##################
+  # Live Templates #
+  ##################
+
+  # Insert live templates
+  'ctrl-j': 'snippets:available'
+
+  ###########
+  # General #
+  ###########
+
+  # Open corresponding tool window
+  'ctrl-1': 'tree-view:toggle'
+
+  # Find action
+  'ctrl-shift-a': 'command-palette:toggle'