diff --git a/examples/barchart.rs b/examples/barchart.rs
index 65ad7cba..c9cd857c 100644
--- a/examples/barchart.rs
+++ b/examples/barchart.rs
@@ -2,18 +2,18 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{BarChart, Block, Borders, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{BarChart, Block, Borders, Widget};
+use tui::Terminal;
 
 struct App<'a> {
     size: Rect,
diff --git a/examples/block.rs b/examples/block.rs
index 95c0215a..69b14f75 100644
--- a/examples/block.rs
+++ b/examples/block.rs
@@ -5,11 +5,11 @@ use std::io;
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Block, Borders, Widget};
+use tui::Terminal;
 
 fn main() {
     let mut terminal = Terminal::new(MouseBackend::new().unwrap()).unwrap();
diff --git a/examples/canvas.rs b/examples/canvas.rs
index 9f219f04..724224e7 100644
--- a/examples/canvas.rs
+++ b/examples/canvas.rs
@@ -2,19 +2,19 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Widget};
-use tui::widgets::canvas::{Canvas, Line, Map, MapResolution};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::Color;
+use tui::widgets::canvas::{Canvas, Line, Map, MapResolution};
+use tui::widgets::{Block, Borders, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/examples/chart.rs b/examples/chart.rs
index 8c8aae5d..3964e440 100644
--- a/examples/chart.rs
+++ b/examples/chart.rs
@@ -5,18 +5,18 @@ mod util;
 use util::*;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget};
 use tui::layout::Rect;
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/examples/custom_widget.rs b/examples/custom_widget.rs
index 5be38938..786337d9 100644
--- a/examples/custom_widget.rs
+++ b/examples/custom_widget.rs
@@ -1,11 +1,11 @@
 extern crate tui;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::Widget;
 use tui::buffer::Buffer;
 use tui::layout::Rect;
 use tui::style::Style;
+use tui::widgets::Widget;
+use tui::Terminal;
 
 struct Label<'a> {
     text: &'a str,
diff --git a/examples/demo.rs b/examples/demo.rs
index 062038b0..8f70459b 100644
--- a/examples/demo.rs
+++ b/examples/demo.rs
@@ -7,20 +7,20 @@ extern crate tui;
 mod util;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, Item, List, Marker,
-                   Paragraph, Row, SelectableList, Sparkline, Table, Tabs, Widget};
-use tui::widgets::canvas::{Canvas, Line, Map, MapResolution};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::canvas::{Canvas, Line, Map, MapResolution};
+use tui::widgets::{Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, Item, List, Marker,
+                   Paragraph, Row, SelectableList, Sparkline, Table, Tabs, Widget};
+use tui::Terminal;
 
 use util::*;
 
diff --git a/examples/gauge.rs b/examples/gauge.rs
index 5531c871..68ae609a 100644
--- a/examples/gauge.rs
+++ b/examples/gauge.rs
@@ -2,18 +2,18 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Gauge, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Block, Borders, Gauge, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/examples/layout.rs b/examples/layout.rs
index 71ce68b5..291de0c2 100644
--- a/examples/layout.rs
+++ b/examples/layout.rs
@@ -4,16 +4,16 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
-use std::thread;
 use std::sync::mpsc;
+use std::thread;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
+use tui::widgets::{Block, Borders, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/examples/list.rs b/examples/list.rs
index 38f03edd..d5c21657 100644
--- a/examples/list.rs
+++ b/examples/list.rs
@@ -2,18 +2,18 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Item, List, SelectableList, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Block, Borders, Item, List, SelectableList, Widget};
+use tui::Terminal;
 
 struct App<'a> {
     size: Rect,
diff --git a/examples/paragraph.rs b/examples/paragraph.rs
index 812e1072..18cee5b1 100644
--- a/examples/paragraph.rs
+++ b/examples/paragraph.rs
@@ -5,11 +5,11 @@ use std::io;
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Paragraph, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Style};
+use tui::widgets::{Block, Paragraph, Widget};
+use tui::Terminal;
 
 fn main() {
     let mut terminal = Terminal::new(MouseBackend::new().unwrap()).unwrap();
diff --git a/examples/rustbox.rs b/examples/rustbox.rs
index 060afef0..364913af 100644
--- a/examples/rustbox.rs
+++ b/examples/rustbox.rs
@@ -1,14 +1,14 @@
 extern crate rustbox;
 extern crate tui;
 
-use std::error::Error;
 use rustbox::Key;
+use std::error::Error;
 
-use tui::Terminal;
 use tui::backend::RustboxBackend;
-use tui::widgets::{Block, Borders, Paragraph, Widget};
 use tui::layout::{Direction, Group, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Block, Borders, Paragraph, Widget};
+use tui::Terminal;
 
 fn main() {
     let mut terminal = Terminal::new(RustboxBackend::new().unwrap()).unwrap();
diff --git a/examples/sparkline.rs b/examples/sparkline.rs
index 99fb49c9..3ad5656e 100644
--- a/examples/sparkline.rs
+++ b/examples/sparkline.rs
@@ -5,18 +5,18 @@ mod util;
 use util::*;
 
 use std::io;
+use std::sync::mpsc;
 use std::thread;
 use std::time;
-use std::sync::mpsc;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Sparkline, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Style};
+use tui::widgets::{Block, Borders, Sparkline, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/examples/table.rs b/examples/table.rs
index a4f58275..b4b98451 100644
--- a/examples/table.rs
+++ b/examples/table.rs
@@ -6,11 +6,11 @@ use std::io;
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Row, Table, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Modifier, Style};
+use tui::widgets::{Block, Borders, Row, Table, Widget};
+use tui::Terminal;
 
 struct App<'a> {
     size: Rect,
diff --git a/examples/tabs.rs b/examples/tabs.rs
index 6d64bf5d..4748079a 100644
--- a/examples/tabs.rs
+++ b/examples/tabs.rs
@@ -8,11 +8,11 @@ use std::io;
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Tabs, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Style};
+use tui::widgets::{Block, Borders, Tabs, Widget};
+use tui::Terminal;
 
 struct App<'a> {
     size: Rect,
diff --git a/examples/user_input.rs b/examples/user_input.rs
index f13ec132..271280a5 100644
--- a/examples/user_input.rs
+++ b/examples/user_input.rs
@@ -13,17 +13,17 @@ extern crate termion;
 extern crate tui;
 
 use std::io;
-use std::thread;
 use std::sync::mpsc;
+use std::thread;
 
 use termion::event;
 use termion::input::TermRead;
 
-use tui::Terminal;
 use tui::backend::MouseBackend;
-use tui::widgets::{Block, Borders, Item, List, Paragraph, Widget};
 use tui::layout::{Direction, Group, Rect, Size};
 use tui::style::{Color, Style};
+use tui::widgets::{Block, Borders, Item, List, Paragraph, Widget};
+use tui::Terminal;
 
 struct App {
     size: Rect,
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index ef0ad172..c6a73b3f 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -11,7 +11,7 @@ pub use self::rustbox::RustboxBackend;
 #[cfg(feature = "termion")]
 mod termion;
 #[cfg(feature = "termion")]
-pub use self::termion::{MouseBackend, RawBackend, TermionBackend, AlternateScreenBackend};
+pub use self::termion::{AlternateScreenBackend, MouseBackend, RawBackend, TermionBackend};
 
 pub trait Backend {
     fn draw<'a, I>(&mut self, content: I) -> Result<(), io::Error>
diff --git a/src/backend/termion.rs b/src/backend/termion.rs
index fd331104..b6f93002 100644
--- a/src/backend/termion.rs
+++ b/src/backend/termion.rs
@@ -157,33 +157,33 @@ where
 }
 
 macro_rules! termion_fg {
-    ($color:ident) => (
+    ($color:ident) => {
         format!("{}", termion::color::Fg(termion::color::$color))
-    );
+    };
 }
 
 macro_rules! termion_fg_rgb {
-    ($r:expr, $g:expr, $b:expr) => (
+    ($r:expr, $g:expr, $b:expr) => {
         format!("{}", termion::color::Fg(termion::color::Rgb($r, $g, $b)))
-    );
+    };
 }
 
 macro_rules! termion_bg {
-    ($color:ident) => (
+    ($color:ident) => {
         format!("{}", termion::color::Bg(termion::color::$color))
-    );
+    };
 }
 
 macro_rules! termion_bg_rgb {
-    ($r:expr, $g:expr, $b:expr) => (
+    ($r:expr, $g:expr, $b:expr) => {
         format!("{}", termion::color::Bg(termion::color::Rgb($r, $g, $b)))
-    );
+    };
 }
 
 macro_rules! termion_modifier {
-    ($style:ident) => (
+    ($style:ident) => {
         format!("{}", termion::style::$style)
-    );
+    };
 }
 
 impl Color {
diff --git a/src/layout.rs b/src/layout.rs
index ccf323a6..182adca5 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -1,12 +1,12 @@
 use std::cmp::{max, min};
 use std::collections::HashMap;
 
-use cassowary::{Constraint, Expression, Solver, Variable};
-use cassowary::WeightedRelation::*;
 use cassowary::strength::{REQUIRED, WEAK};
+use cassowary::WeightedRelation::*;
+use cassowary::{Constraint, Expression, Solver, Variable};
 
-use terminal::Terminal;
 use backend::Backend;
+use terminal::Terminal;
 
 #[derive(Debug, Hash, Clone, Copy, PartialEq, Eq)]
 pub enum Direction {
diff --git a/src/lib.rs b/src/lib.rs
index 8a46ab8a..7917fbd7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -161,12 +161,12 @@ extern crate log;
 extern crate unicode_segmentation;
 extern crate unicode_width;
 
-pub mod buffer;
-pub mod symbols;
 pub mod backend;
+pub mod buffer;
+pub mod layout;
+pub mod style;
+pub mod symbols;
 pub mod terminal;
 pub mod widgets;
-pub mod style;
-pub mod layout;
 
 pub use self::terminal::Terminal;
diff --git a/src/terminal.rs b/src/terminal.rs
index 86ca1d0f..1aa7f6bf 100644
--- a/src/terminal.rs
+++ b/src/terminal.rs
@@ -1,5 +1,5 @@
-use std::io;
 use std::collections::HashMap;
+use std::io;
 
 use backend::Backend;
 use buffer::Buffer;
diff --git a/src/widgets/barchart.rs b/src/widgets/barchart.rs
index 477eea9b..e493ccf5 100644
--- a/src/widgets/barchart.rs
+++ b/src/widgets/barchart.rs
@@ -2,11 +2,11 @@ use std::cmp::{max, min};
 
 use unicode_width::UnicodeWidthStr;
 
-use widgets::{Block, Widget};
 use buffer::Buffer;
 use layout::Rect;
 use style::Style;
 use symbols::bar;
+use widgets::{Block, Widget};
 
 /// Display multiple bars in a single widgets
 ///
diff --git a/src/widgets/block.rs b/src/widgets/block.rs
index 3279ddfa..678a9831 100644
--- a/src/widgets/block.rs
+++ b/src/widgets/block.rs
@@ -1,8 +1,8 @@
 use buffer::Buffer;
 use layout::Rect;
 use style::Style;
-use widgets::{Borders, Widget};
 use symbols::line;
+use widgets::{Borders, Widget};
 
 /// Base widget to be used with all upper level ones. It may be used to display a box border around
 /// the widget and/or add a title.
diff --git a/src/widgets/canvas/map.rs b/src/widgets/canvas/map.rs
index 2180aacc..b7476a54 100644
--- a/src/widgets/canvas/map.rs
+++ b/src/widgets/canvas/map.rs
@@ -1,7 +1,7 @@
-use widgets::canvas::Shape;
+use style::Color;
 use widgets::canvas::points::PointsIterator;
 use widgets::canvas::world::{WORLD_HIGH_RESOLUTION, WORLD_LOW_RESOLUTION};
-use style::Color;
+use widgets::canvas::Shape;
 
 #[derive(Clone, Copy)]
 pub enum MapResolution {
diff --git a/src/widgets/canvas/mod.rs b/src/widgets/canvas/mod.rs
index 220bea99..61c9e519 100644
--- a/src/widgets/canvas/mod.rs
+++ b/src/widgets/canvas/mod.rs
@@ -1,16 +1,16 @@
-mod points;
 mod line;
 mod map;
+mod points;
 mod world;
 
-pub use self::points::Points;
 pub use self::line::Line;
 pub use self::map::{Map, MapResolution};
+pub use self::points::Points;
 
-use style::{Color, Style};
 use buffer::Buffer;
-use widgets::{Block, Widget};
 use layout::Rect;
+use style::{Color, Style};
+use widgets::{Block, Widget};
 
 pub const DOTS: [[u16; 2]; 4] = [
     [0x0001, 0x0008],
diff --git a/src/widgets/chart.rs b/src/widgets/chart.rs
index 35a15188..1e1fe774 100644
--- a/src/widgets/chart.rs
+++ b/src/widgets/chart.rs
@@ -2,12 +2,12 @@ use std::cmp::max;
 
 use unicode_width::UnicodeWidthStr;
 
-use widgets::{Block, Borders, Widget};
-use widgets::canvas::{Canvas, Points};
 use buffer::Buffer;
 use layout::Rect;
 use style::Style;
 use symbols;
+use widgets::canvas::{Canvas, Points};
+use widgets::{Block, Borders, Widget};
 
 /// An X or Y axis for the chart widget
 pub struct Axis<'a, L>
diff --git a/src/widgets/gauge.rs b/src/widgets/gauge.rs
index 07291e9a..1e4bd77a 100644
--- a/src/widgets/gauge.rs
+++ b/src/widgets/gauge.rs
@@ -1,9 +1,9 @@
 use unicode_width::UnicodeWidthStr;
 
-use widgets::{Block, Widget};
 use buffer::Buffer;
-use style::{Color, Style};
 use layout::Rect;
+use style::{Color, Style};
+use widgets::{Block, Widget};
 
 /// A widget to display a task progress.
 ///
diff --git a/src/widgets/list.rs b/src/widgets/list.rs
index 16f580d9..c13722bb 100644
--- a/src/widgets/list.rs
+++ b/src/widgets/list.rs
@@ -1,13 +1,13 @@
-use std::iter;
 use std::fmt::Display;
+use std::iter;
 use std::iter::Iterator;
 
 use unicode_width::UnicodeWidthStr;
 
 use buffer::Buffer;
-use widgets::{Block, Widget};
 use layout::Rect;
 use style::Style;
+use widgets::{Block, Widget};
 
 pub enum Item<'i, D: 'i> {
     Data(D),
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
index d3ff30ae..dc619c7f 100644
--- a/src/widgets/mod.rs
+++ b/src/widgets/mod.rs
@@ -1,29 +1,29 @@
-mod block;
-mod paragraph;
-mod list;
-mod gauge;
-mod sparkline;
-mod chart;
 mod barchart;
-mod tabs;
-mod table;
+mod block;
 pub mod canvas;
+mod chart;
+mod gauge;
+mod list;
+mod paragraph;
+mod sparkline;
+mod table;
+mod tabs;
 
-pub use self::block::Block;
-pub use self::paragraph::Paragraph;
-pub use self::list::{Item, List, SelectableList};
-pub use self::gauge::Gauge;
-pub use self::sparkline::Sparkline;
-pub use self::chart::{Axis, Chart, Dataset, Marker};
 pub use self::barchart::BarChart;
-pub use self::tabs::Tabs;
+pub use self::block::Block;
+pub use self::chart::{Axis, Chart, Dataset, Marker};
+pub use self::gauge::Gauge;
+pub use self::list::{Item, List, SelectableList};
+pub use self::paragraph::Paragraph;
+pub use self::sparkline::Sparkline;
 pub use self::table::{Row, Table};
+pub use self::tabs::Tabs;
 
+use backend::Backend;
 use buffer::Buffer;
 use layout::Rect;
-use terminal::Terminal;
-use backend::Backend;
 use style::Color;
+use terminal::Terminal;
 
 /// Bitflags that can be composed to set the visible borders essentially on the block widget.
 bitflags! {
diff --git a/src/widgets/paragraph.rs b/src/widgets/paragraph.rs
index 07d4005c..3355992e 100644
--- a/src/widgets/paragraph.rs
+++ b/src/widgets/paragraph.rs
@@ -1,10 +1,10 @@
 use unicode_segmentation::UnicodeSegmentation;
 use unicode_width::UnicodeWidthStr;
 
-use widgets::{Block, Widget};
 use buffer::Buffer;
 use layout::Rect;
 use style::{Color, Modifier, Style};
+use widgets::{Block, Widget};
 
 /// A widget to display some text. You can specify colors using commands embedded in
 /// the text such as "{[color] [text]}".
diff --git a/src/widgets/sparkline.rs b/src/widgets/sparkline.rs
index 25c84bac..5ac8c7b4 100644
--- a/src/widgets/sparkline.rs
+++ b/src/widgets/sparkline.rs
@@ -1,10 +1,10 @@
 use std::cmp::min;
 
-use layout::Rect;
 use buffer::Buffer;
-use widgets::{Block, Widget};
+use layout::Rect;
 use style::Style;
 use symbols::bar;
+use widgets::{Block, Widget};
 
 /// Widget to render a sparkline over one or more lines.
 ///
diff --git a/src/widgets/table.rs b/src/widgets/table.rs
index 30363a29..910d0e5a 100644
--- a/src/widgets/table.rs
+++ b/src/widgets/table.rs
@@ -2,9 +2,9 @@ use std::fmt::Display;
 use std::iter::Iterator;
 
 use buffer::Buffer;
-use widgets::{Block, Widget};
 use layout::Rect;
 use style::Style;
+use widgets::{Block, Widget};
 
 /// Holds data to be displayed in a Table widget
 pub enum Row<'i, D, I>
diff --git a/src/widgets/tabs.rs b/src/widgets/tabs.rs
index 56f1fc99..01bb44fe 100644
--- a/src/widgets/tabs.rs
+++ b/src/widgets/tabs.rs
@@ -1,10 +1,10 @@
 use unicode_width::UnicodeWidthStr;
 
-use widgets::{Block, Widget};
 use buffer::Buffer;
 use layout::Rect;
 use style::Style;
 use symbols::line;
+use widgets::{Block, Widget};
 
 /// A widget to display available tabs in a multiple panels context.
 ///