diff --git a/Cargo.lock b/Cargo.lock
index cc607ad..b7dc143 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
  "bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "cortex-m-rt 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cortex-m-rt 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rtfm 0.3.4 (git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5)",
  "cortex-m-semihosting 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "embedded-hal 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -22,25 +22,31 @@ dependencies = [
  "vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "backtrace"
-version = "0.3.9"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.24"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -58,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cc"
-version = "1.0.25"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -78,22 +84,22 @@ dependencies = [
 
 [[package]]
 name = "cortex-m-rt"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cortex-m-rt-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cortex-m-rt-macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cortex-m-rt-macros"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -102,7 +108,7 @@ version = "0.3.4"
 source = "git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5#493f71943a0d983d636f89135a88dd141b5e80d5"
 dependencies = [
  "cortex-m 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "cortex-m-rt 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cortex-m-rt 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rtfm-macros 0.3.2 (git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5)",
  "rtfm-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "untagged-option 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -113,7 +119,7 @@ name = "cortex-m-rtfm-macros"
 version = "0.3.2"
 source = "git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5#493f71943a0d983d636f89135a88dd141b5e80d5"
 dependencies = [
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "rtfm-syntax 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -144,27 +150,27 @@ dependencies = [
 
 [[package]]
 name = "failure"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "failure_derive"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.44"
+version = "0.2.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -239,7 +245,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -247,7 +253,7 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -278,7 +284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "cortex-m-rt 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cortex-m-rt 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -305,7 +311,7 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "0.15.22"
+version = "0.15.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -320,7 +326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -373,23 +379,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum aligned 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d39da9b88ae1a81c03c9c082b8db83f1d0e93914126041962af61034ab44c4a5"
-"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a3caf393d93b2d453e80638d0674597020cef3382ada454faacd43d1a55a735a"
 "checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
-"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum cortex-m 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dab2164a0fc216781a47fc343347365112ae6917421d3fa4bac6faf0fbaaaec7"
-"checksum cortex-m-rt 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bc046658f47b647e264e30aac150f7546ab52ac293cdee8ab153f95abb3630e3"
-"checksum cortex-m-rt-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6c794cb1efa87e9a1f31fe6ac5d620f7d08f4e001d7d697ccfdb788c20c330c"
+"checksum cortex-m-rt 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f69d2beca37acc3776c17201c9d1f8904fb9139fa3a4d2cf28c8436a07b21a88"
+"checksum cortex-m-rt-macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d7ae692573e0acccb1579fef1abf5a5bf1d2f3f0149a22b16870ec9309aee25f"
 "checksum cortex-m-rtfm 0.3.4 (git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5)" = "<none>"
 "checksum cortex-m-rtfm-macros 0.3.2 (git+https://github.com/hdhoang/cortex-m-rtfm?branch=v0.3-with-cortex-m-v0.5)" = "<none>"
 "checksum cortex-m-semihosting 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d1dc2abec1a772e8bb697cad17d5710f180043caf8939820f0f6ba4b7ae2a4b5"
 "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
 "checksum embedded-hal 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9880e55238830314d41d88f1ac7a819d495799c3cc3bc392cc172bab26428c33"
-"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
-"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
-"checksum libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)" = "10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311"
+"checksum failure 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e945b93ec214c6e97b520ec6c5d80267fc97af327658ee5b9f35984626e51fbf"
+"checksum failure_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c395a14ab27b42704e85bf2435c5c51f334ad7a96e16fe23c6e63a1cad6cc12"
+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
 "checksum nb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "69f380b5fe9fab8c0d7a6a99cda23e2cc0463bedb2cbc3aada0813b98496ecdc"
 "checksum panic-abort 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c14a66511ed17b6a8b4256b868d7fd207836d891db15eea5195dbcaf87e630f"
 "checksum panic-semihosting 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a647d81e7b00f69deac766cd96d69fc11c95c18657d2448b539ae93e4c558689"
@@ -401,14 +408,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rtfm-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ba440da895db782b3e459c39316133e36ee13c60a836bb99f7df4940beb441"
 "checksum rtfm-syntax 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "820448648d3adb35aadaeaccf8536eae97008ca47f36078a0791878402cae6bd"
-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum stm32l1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c213236e5dad14da3c96fb08c4eb395fefd38d6dd9d1373a89c2eb314b69b781"
 "checksum stm32l151-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97bdc4d7c7b912c360bc1dc3114a4ec1620991b64c08ffe701e5cd934d7817c5"
 "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
-"checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7"
+"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum untagged-option 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89553f60895e868761e18120e72077da22920614562d2f4fe98fa707fbb12fe6"
diff --git a/Cargo.toml b/Cargo.toml
index 2065f5b..4de5bf8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "anne-key"
 description = "Firmware for Anne Pro Keyboard"
 repository = "https://github.com/ah-/anne-key"
@@ -14,10 +15,17 @@ bit_field = "0.9.0"
 cortex-m = "0.5.8"
 cortex-m-rt = "0.6.5"
 cortex-m-semihosting = "0.3.1"
-cortex-m-rtfm = { git = "https://github.com/hdhoang/cortex-m-rtfm", branch = "v0.3-with-cortex-m-v0.5" }
 nb = "0.1.1"
 vcell = "0.1.0"
-stm32l151-hal = "0.5.0"
+
+[dependencies.rtfm]
+package = "cortex-m-rtfm"
+git = "https://github.com/hdhoang/cortex-m-rtfm"
+branch = "v0.3-with-cortex-m-v0.5"
+
+[dependencies.hal]
+package = "stm32l151-hal"
+version = "0.5.0"
 
 [dependencies.embedded-hal]
 features = ["unproven"]
diff --git a/rust-toolchain b/rust-toolchain
index 2ac19a8..bc0fd71 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2018-12-06
+nightly-2019-01-01
diff --git a/src/action.rs b/src/action.rs
index b06f45d..17a0ecd 100644
--- a/src/action.rs
+++ b/src/action.rs
@@ -1,4 +1,4 @@
-use keycodes::KeyCode;
+use crate::keycodes::KeyCode;
 
 #[allow(dead_code)]
 #[derive(Copy, Clone, PartialEq)]
diff --git a/src/bluetooth.rs b/src/bluetooth.rs
index b82e589..9ba5d9c 100644
--- a/src/bluetooth.rs
+++ b/src/bluetooth.rs
@@ -4,8 +4,8 @@ use super::led::Led;
 use super::protocol::{BleOp, KeyboardOp, LedOp, MacroOp, Message, MsgType, SystemOp};
 use super::serial::bluetooth_usart::BluetoothUsart;
 use super::serial::{DmaUsart, Serial, Transfer};
+use crate::debug::UnwrapLog;
 use core::marker::Unsize;
-use debug::UnwrapLog;
 use nb;
 use rtfm::Threshold;
 
@@ -104,7 +104,7 @@ where
 
     pub fn handle_message(
         &mut self,
-        message: &Message,
+        message: &Message<'_>,
         led: &mut Led<BUFFER>,
         keyboard: &mut Keyboard,
     ) {
diff --git a/src/clock.rs b/src/clock.rs
index 0207da2..7a9d509 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -1,5 +1,5 @@
 use cortex_m;
-use stm32l151;
+use stm32l1::stm32l151;
 
 pub fn init_clock(p: &stm32l151::Peripherals) {
     p.USB.usb_cntr.modify(|_, w| w.pdwn().clear_bit());
diff --git a/src/keyboard.rs b/src/keyboard.rs
index 1cd69ab..4781905 100644
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@@ -1,16 +1,16 @@
-use action::Action;
+use crate::action::Action;
+use crate::bluetooth::Bluetooth;
+use crate::debug::UnwrapLog;
+use crate::hidreport::HidReport;
+use crate::keycodes::KeyCode;
+use crate::keymatrix::{KeyState, COLUMNS, ROWS};
+use crate::layout::LAYERS;
+use crate::layout::LAYER_BT;
+use crate::led::Led;
+use crate::usb::Usb;
 use bit_field::{BitArray, BitField};
-use bluetooth::Bluetooth;
 use core::marker::Unsize;
-use debug::UnwrapLog;
-use hidreport::HidReport;
-use keycodes::KeyCode;
-use keymatrix::{KeyState, COLUMNS, ROWS};
-use layout::LAYERS;
-use layout::LAYER_BT;
-use led::Led;
-use stm32l151::SCB;
-use usb::Usb;
+use stm32l1::stm32l151::SCB;
 
 pub struct Keyboard {
     layers: Layers,
diff --git a/src/keymatrix.rs b/src/keymatrix.rs
index 6b85451..972de9d 100644
--- a/src/keymatrix.rs
+++ b/src/keymatrix.rs
@@ -3,7 +3,7 @@ use embedded_hal::digital::{InputPin, OutputPin};
 use hal::gpio::gpioa::*;
 use hal::gpio::gpiob::*;
 use hal::gpio::{Input, Output};
-use stm32l151::SYST;
+use stm32l1::stm32l151::SYST;
 
 pub const ROWS: usize = 5;
 pub const COLUMNS: usize = 14;
diff --git a/src/layout.rs b/src/layout.rs
index 2244315..ba382cf 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -1,7 +1,7 @@
-use action::Action;
-use action::Action::*;
-use keycodes::KeyCode::*;
-use keymatrix::{COLUMNS, ROWS};
+use crate::action::Action;
+use crate::action::Action::*;
+use crate::keycodes::KeyCode::*;
+use crate::keymatrix::{COLUMNS, ROWS};
 
 /*
   ,-----------------------------------------------------------------------------.
diff --git a/src/led.rs b/src/led.rs
index 28eb0ea..21944fc 100644
--- a/src/led.rs
+++ b/src/led.rs
@@ -2,15 +2,15 @@ use super::keymatrix::KeyState;
 use super::protocol::{LedOp, Message, MsgType};
 use super::serial::led_usart::LedUsart;
 use super::serial::{Serial, Transfer};
-use bluetooth::BluetoothMode;
+use crate::bluetooth::BluetoothMode;
+use crate::keycodes::KeyIndex;
 use core::marker::Unsize;
 use embedded_hal::digital::OutputPin;
 use hal::gpio::gpioc::PC15;
 use hal::gpio::{Input, Output};
-use keycodes::KeyIndex;
 use nb;
 use rtfm::Threshold;
-use stm32l151::SYST;
+use stm32l1::stm32l151::SYST;
 
 pub enum LedMode {
     _Off,
@@ -204,7 +204,7 @@ where
         self.set_keys(payload)
     }
 
-    pub fn handle_message(&mut self, message: &Message) {
+    pub fn handle_message(&mut self, message: &Message<'_>) {
         match message.msg_type {
             MsgType::Led => {
                 match LedOp::from(message.operation) {
diff --git a/src/main.rs b/src/main.rs
index 3ee6a32..f88e2ad 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,20 +5,10 @@
 #![no_main]
 #![no_std]
 
-extern crate bare_metal;
-extern crate bit_field;
-extern crate cortex_m;
-extern crate cortex_m_rtfm as rtfm;
-extern crate cortex_m_semihosting;
-extern crate embedded_hal;
-extern crate nb;
 #[cfg(not(feature = "use_semihosting"))]
 extern crate panic_abort;
 #[cfg(feature = "use_semihosting")]
 extern crate panic_semihosting;
-extern crate stm32l1;
-use stm32l1::stm32l151;
-extern crate stm32l151_hal as hal;
 
 #[macro_use]
 mod debug;
@@ -41,17 +31,17 @@ use hal::dma::DmaExt;
 use hal::gpio::GpioExt;
 use rtfm::{app, Threshold};
 
-use bluetooth::Bluetooth;
-use keyboard::Keyboard;
-use keymatrix::KeyMatrix;
-use led::Led;
-use serial::bluetooth_usart::BluetoothUsart;
-use serial::led_usart::LedUsart;
-use serial::Serial;
-use usb::Usb;
+use crate::bluetooth::Bluetooth;
+use crate::keyboard::Keyboard;
+use crate::keymatrix::KeyMatrix;
+use crate::led::Led;
+use crate::serial::bluetooth_usart::BluetoothUsart;
+use crate::serial::led_usart::LedUsart;
+use crate::serial::Serial;
+use crate::usb::Usb;
 
 app! {
-    device: stm32l151,
+    device: stm32l1::stm32l151,
 
     resources: {
         static KEYBOARD: Keyboard = Keyboard::new();
@@ -60,9 +50,9 @@ app! {
         static BLUETOOTH: Bluetooth<[u8; 0x80]>;
         static LED_BUFFERS: [[u8; 0x80]; 2] = [[0; 0x80]; 2];
         static LED: Led<[u8; 0x80]>;
-        static SCB: stm32l151::SCB;
-        static SYST: stm32l151::SYST;
-        static EXTI: stm32l151::EXTI;
+        static SCB: stm32l1::stm32l151::SCB;
+        static SYST: stm32l1::stm32l151::SYST;
+        static EXTI: stm32l1::stm32l151::EXTI;
         static USB: Usb;
     },
 
@@ -124,7 +114,7 @@ app! {
 }
 
 #[allow(clippy::needless_pass_by_value)]
-fn init(mut p: init::Peripherals, r: init::Resources) -> init::LateResources {
+fn init(mut p: init::Peripherals, r: init::Resources<'_>) -> init::LateResources {
     // re-locate vector table to 0x80004000 because bootloader uses 0x80000000
     unsafe { p.core.SCB.vtor.write(0x4000) };
 
diff --git a/src/serial/bluetooth_usart.rs b/src/serial/bluetooth_usart.rs
index 5750b36..53e45c1 100644
--- a/src/serial/bluetooth_usart.rs
+++ b/src/serial/bluetooth_usart.rs
@@ -2,7 +2,7 @@ use embedded_hal::digital::OutputPin;
 use hal::dma::dma1::{C6, C7};
 use hal::gpio::gpioa::{PA1, PA2, PA3};
 use hal::gpio::{Alternate, Input, Output};
-use stm32l151::{RCC, USART2};
+use stm32l1::stm32l151::{RCC, USART2};
 
 use super::DmaUsart;
 
diff --git a/src/serial/led_usart.rs b/src/serial/led_usart.rs
index e6b213c..3ece291 100644
--- a/src/serial/led_usart.rs
+++ b/src/serial/led_usart.rs
@@ -2,7 +2,7 @@ use super::DmaUsart;
 use hal::dma::dma1::{C2, C3};
 use hal::gpio::gpiob::{PB10, PB11};
 use hal::gpio::{Alternate, Input};
-use stm32l151::{RCC, USART3};
+use stm32l1::stm32l151::{RCC, USART3};
 
 pub struct LedUsart {
     _pb10: PB10<Alternate>,
diff --git a/src/usb/hid.rs b/src/usb/hid.rs
index ab8c6c4..8d5eb0a 100644
--- a/src/usb/hid.rs
+++ b/src/usb/hid.rs
@@ -1,6 +1,6 @@
 use super::pma::PMA;
-use stm32l151::USB;
-use usb::usb_ext::UsbEpExt;
+use crate::usb::usb_ext::UsbEpExt;
+use stm32l1::stm32l151::USB;
 
 pub struct UsbHid {
     pub report: [u8; 8],
diff --git a/src/usb/mod.rs b/src/usb/mod.rs
index c9ef118..5071cb7 100644
--- a/src/usb/mod.rs
+++ b/src/usb/mod.rs
@@ -7,13 +7,13 @@ pub mod usb_ext;
 use core::cmp::min;
 use rtfm::Threshold;
 
-use stm32l151;
+use stm32l1::stm32l151;
 
 use self::constants::{UsbDescriptorType, UsbDeviceState, UsbRequest};
 use self::pma::PMA;
 use self::usb_ext::UsbEpExt;
-use hidreport::HidReport;
-use usb::hid::UsbHid;
+use crate::hidreport::HidReport;
+use crate::usb::hid::UsbHid;
 
 const MAX_PACKET_SIZE: u32 = 64;
 
diff --git a/src/usb/pma.rs b/src/usb/pma.rs
index 2f7f864..ae8b62b 100644
--- a/src/usb/pma.rs
+++ b/src/usb/pma.rs
@@ -1,4 +1,4 @@
-extern crate vcell;
+use vcell;
 
 use self::vcell::VolatileCell;
 use bare_metal::Peripheral;
diff --git a/src/usb/usb_ext.rs b/src/usb/usb_ext.rs
index 4e5d7bc..22892fd 100644
--- a/src/usb/usb_ext.rs
+++ b/src/usb/usb_ext.rs
@@ -1,4 +1,4 @@
-use stm32l151::usb::{USB_EP0R, USB_EP1R};
+use stm32l1::stm32l151::usb::{USB_EP0R, USB_EP1R};
 
 pub trait UsbEpExt {
     fn toggle_tx_out(&self);