diff --git a/config.toml b/config.toml
index 0b0b014..e025c69 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,4 @@
-theme = "flexoki_light"
+theme = "dark_plus"
 
 [editor]
 line-number = "relative"
@@ -12,12 +12,13 @@ right = ["register", "position", "position-percentage"]
 [keys.normal]
 esc = ["collapse_selection", "keep_primary_selection"]
 K = "hover"
-H = "goto_next_buffer"
-L = "goto_previous_buffer"
+L = "goto_next_buffer"
+H = "goto_previous_buffer"
 '0' = "goto_line_start"
 q = ":reflow"
 
 [keys.normal.space]
+w = ":w"
 q = ":quit"
 f = "file_picker_in_current_directory"
 F = "file_picker"
diff --git a/languages.toml b/languages.toml
index 8e3d5ab..f4c9fd0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1,3 +1,4 @@
+
 [language-server.ltex-lsp]
 command = "ltex-ls"
 
@@ -11,3 +12,10 @@ language-servers = [ "ltex-lsp" ]
 [[language]]
 name = "python"
 language-servers = ["jedi-lsp"]
+
+[[language]]
+name = "arduino"
+scope = "source.arduino"
+injection-regex = "arduino"
+file-types = ["ino"]
+grammar = "cpp"
diff --git a/runtime/grammars/arduino.so b/runtime/grammars/arduino.so
new file mode 100755
index 0000000..fb6062c
Binary files /dev/null and b/runtime/grammars/arduino.so differ
diff --git a/runtime/grammars/cpp.so b/runtime/grammars/cpp.so
index 07deee5..eebfe2d 100755
Binary files a/runtime/grammars/cpp.so and b/runtime/grammars/cpp.so differ
diff --git a/runtime/grammars/sources/arduino b/runtime/grammars/sources/arduino
new file mode 160000
index 0000000..db929fc
--- /dev/null
+++ b/runtime/grammars/sources/arduino
@@ -0,0 +1 @@
+Subproject commit db929fc6822b9b9e1211678d508f187894ce0345