diff --git a/src/wayland/keyboard.rs b/src/wayland/keyboard.rs
index a3de4a5..9dbc424 100644
--- a/src/wayland/keyboard.rs
+++ b/src/wayland/keyboard.rs
@@ -60,21 +60,21 @@ impl VirtualKeyboard {
         let lower = &sym.name().unwrap()[3..];
         let upper = &Part::modify_shift(sym).name().unwrap()[3..];
 
-        write!(self.keymap, "    key <I{:03}> {{ [ {}, {} ] }};\n",
-               keycode, lower, upper).unwrap();
+        writeln!(self.keymap, "    key <I{:03}> {{ [ {}, {} ] }};",
+                 keycode, lower, upper).unwrap();
 
         if sym == Keysym::Shift_L {
-            write!(self.keymap,
-                   "    modifier_map Shift {{ <I{:03}> }};\n",
-                   keycode).unwrap();
+            writeln!(self.keymap,
+                     "    modifier_map Shift {{ <I{:03}> }};",
+                     keycode).unwrap();
         } else if sym == Keysym::Control_L {
-            write!(self.keymap,
-                   "    modifier_map Control {{ <I{:03}> }};\n",
-                   keycode).unwrap();
+            writeln!(self.keymap,
+                     "    modifier_map Control {{ <I{:03}> }};",
+                     keycode).unwrap();
         } else if sym == Keysym::Alt_L {
-            write!(self.keymap,
-                   "    modifier_map Mod1 {{ <I{:03}> }};\n",
-                   keycode).unwrap();
+            writeln!(self.keymap,
+                     "    modifier_map Mod1 {{ <I{:03}> }};",
+                     keycode).unwrap();
         }
     }
 }
@@ -151,8 +151,8 @@ impl Keyboard for VirtualKeyboard {
                        .create(true).truncate(true)
                        .open(path).unwrap();
 
-        self.keymap.write(b"xkb_keymap {\n").unwrap();
-        self.keymap.write(b"  xkb_symbols \"ufkbd\" {\n").unwrap();
+        self.keymap.write_all(b"xkb_keymap {\n").unwrap();
+        self.keymap.write_all(b"  xkb_symbols \"ufkbd\" {\n").unwrap();
 
         self.keycodes.clear();
         for row in layout.rows() {
@@ -173,31 +173,31 @@ impl Keyboard for VirtualKeyboard {
             }
         }
 
-        self.keymap.write(b"  };\n").unwrap();
-        self.keymap.write(b"\n").unwrap();
-        self.keymap.write(b"  xkb_keycodes \"ufkbd\" {\n").unwrap();
-        self.keymap.write(b"    minimum = 8;\n").unwrap();
-        self.keymap.write(b"    maximum = 255;\n").unwrap();
+        self.keymap.write_all(b"  };\n").unwrap();
+        self.keymap.write_all(b"\n").unwrap();
+        self.keymap.write_all(b"  xkb_keycodes \"ufkbd\" {\n").unwrap();
+        self.keymap.write_all(b"    minimum = 8;\n").unwrap();
+        self.keymap.write_all(b"    maximum = 255;\n").unwrap();
 
         for i in 8..keycode {
-            write!(self.keymap, "    <I{:03}> = {};\n", i, i).unwrap();
+            writeln!(self.keymap, "    <I{:03}> = {};", i, i).unwrap();
         }
 
-        self.keymap.write(b"    indicator 1 = \"Caps Lock\";\n").unwrap();
-        self.keymap.write(b"  };\n").unwrap();
-        self.keymap.write(b"\n").unwrap();
-        self.keymap.write(b"  xkb_types \"ufkbd\" {\n").unwrap();
-        self.keymap.write(b"    type \"TWO_LEVEL\" {\n").unwrap();
-        self.keymap.write(b"        modifiers = Shift;\n").unwrap();
-        self.keymap.write(b"        map[Shift] = Level2;\n").unwrap();
-        self.keymap.write(b"        level_name[Level1] = \"Base\";\n").unwrap();
-        self.keymap.write(b"        level_name[Level2] = \"Shift\";\n").unwrap();
-        self.keymap.write(b"    };\n").unwrap();
-        self.keymap.write(b"  };\n").unwrap();
-        self.keymap.write(b"\n").unwrap();
-        self.keymap.write(b"  xkb_compatibility \"ufkbd\" {\n").unwrap();
-        self.keymap.write(b"  };\n").unwrap();
-        self.keymap.write(b"};\n").unwrap();
+        self.keymap.write_all(b"    indicator 1 = \"Caps Lock\";\n").unwrap();
+        self.keymap.write_all(b"  };\n").unwrap();
+        self.keymap.write_all(b"\n").unwrap();
+        self.keymap.write_all(b"  xkb_types \"ufkbd\" {\n").unwrap();
+        self.keymap.write_all(b"    type \"TWO_LEVEL\" {\n").unwrap();
+        self.keymap.write_all(b"        modifiers = Shift;\n").unwrap();
+        self.keymap.write_all(b"        map[Shift] = Level2;\n").unwrap();
+        self.keymap.write_all(b"        level_name[Level1] = \"Base\";\n").unwrap();
+        self.keymap.write_all(b"        level_name[Level2] = \"Shift\";\n").unwrap();
+        self.keymap.write_all(b"    };\n").unwrap();
+        self.keymap.write_all(b"  };\n").unwrap();
+        self.keymap.write_all(b"\n").unwrap();
+        self.keymap.write_all(b"  xkb_compatibility \"ufkbd\" {\n").unwrap();
+        self.keymap.write_all(b"  };\n").unwrap();
+        self.keymap.write_all(b"};\n").unwrap();
 
         if self.mod_state != 0 {
             self.vk.modifiers(0, 0, 0, 0);