diff --git a/src/exa.rs b/src/exa.rs
index cac078d..82c1eb3 100644
--- a/src/exa.rs
+++ b/src/exa.rs
@@ -6,7 +6,7 @@ extern crate unicode;
 
 use std::os;
 use std::io::fs;
-use std::io::FileType::TypeDirectory;
+use std::io::FileType;
 use std::iter::AdditiveIterator;
 use std::str::StrVector;
 
@@ -17,7 +17,8 @@ use column::Alignment::Left;
 use options::{Options, View};
 use unix::Unix;
 
-use ansi_term::{Plain, strip_formatting};
+use ansi_term::Style::Plain;
+use ansi_term::strip_formatting;
 
 pub mod column;
 pub mod dir;
@@ -49,7 +50,7 @@ fn exa(opts: &Options) {
         let path = Path::new(file);
         match fs::stat(&path) {
             Ok(stat) => {
-                if !opts.list_dirs && stat.kind == TypeDirectory {
+                if !opts.list_dirs && stat.kind == FileType::Directory {
                     dirs.push(file.clone());
                 }
                 else {
diff --git a/src/file.rs b/src/file.rs
index 602e401..f87e4a1 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -1,7 +1,9 @@
 use std::io::{fs, IoResult};
 use std::io;
 
-use ansi_term::{ANSIString, Colour, Plain, Style, Red, Green, Yellow, Blue, Purple, Cyan, Fixed};
+use ansi_term::{ANSIString, Colour, Style};
+use ansi_term::Style::Plain;
+use ansi_term::Colour::{Red, Green, Yellow, Blue, Purple, Cyan, Fixed};
 
 use column::Column;
 use column::Column::*;
@@ -128,7 +130,7 @@ impl<'a> File<'a> {
             },
 
             Blocks => {
-                if self.stat.kind == io::TypeFile || self.stat.kind == io::TypeSymlink {
+                if self.stat.kind == io::FileType::RegularFile || self.stat.kind == io::FileType::Symlink {
                     Cyan.paint(self.stat.unstable.blocks.to_string().as_slice()).to_string()
                 }
                 else {
@@ -159,7 +161,7 @@ impl<'a> File<'a> {
     pub fn file_name(&self) -> String {
         let name = self.name.as_slice();
         let displayed_name = self.file_colour().paint(name);
-        if self.stat.kind == io::TypeSymlink {
+        if self.stat.kind == io::FileType::Symlink {
             match fs::readlink(&self.path) {
                 Ok(path) => {
                 	let target_path = match self.dir {
@@ -210,7 +212,7 @@ impl<'a> File<'a> {
     fn file_size(&self, use_iec_prefixes: bool) -> String {
         // Don't report file sizes for directories. I've never looked
         // at one of those numbers and gained any information from it.
-        if self.stat.kind == io::TypeDirectory {
+        if self.stat.kind == io::FileType::Directory {
             GREY.paint("-").to_string()
         }
         else {
@@ -227,12 +229,12 @@ impl<'a> File<'a> {
 
     fn type_char(&self) -> ANSIString {
         return match self.stat.kind {
-            io::TypeFile         => Plain.paint("."),
-            io::TypeDirectory    => Blue.paint("d"),
-            io::TypeNamedPipe    => Yellow.paint("|"),
-            io::TypeBlockSpecial => Purple.paint("s"),
-            io::TypeSymlink      => Cyan.paint("l"),
-            io::TypeUnknown      => Plain.paint("?"),
+            io::FileType::RegularFile  => Plain.paint("."),
+            io::FileType::Directory    => Blue.paint("d"),
+            io::FileType::NamedPipe    => Yellow.paint("|"),
+            io::FileType::BlockSpecial => Purple.paint("s"),
+            io::FileType::Symlink      => Cyan.paint("l"),
+            io::FileType::Unknown      => Plain.paint("?"),
         }
     }
 
@@ -241,7 +243,7 @@ impl<'a> File<'a> {
     }
 
     fn has_multiple_links(&self) -> bool {
-        self.stat.kind == io::TypeFile && self.stat.unstable.nlink > 1
+        self.stat.kind == io::FileType::RegularFile && self.stat.unstable.nlink > 1
     }
 
     fn permissions_string(&self) -> String {
diff --git a/src/filetype.rs b/src/filetype.rs
index b57a0eb..72864fa 100644
--- a/src/filetype.rs
+++ b/src/filetype.rs
@@ -4,7 +4,9 @@ use self::FileType::*;
 use std::io;
 use std::ascii::AsciiExt;
 
-use ansi_term::{Plain, Style, Red, Green, Yellow, Blue, Cyan, Fixed};
+use ansi_term::Style;
+use ansi_term::Style::Plain;
+use ansi_term::Colour::{Red, Green, Yellow, Blue, Cyan, Fixed};
 
 pub enum FileType {
     Normal, Directory, Executable, Immediate, Compiled, Symlink, Special,
@@ -79,13 +81,13 @@ pub trait HasType {
 impl<'a> HasType for File<'a> {
     fn get_type(&self) -> FileType {
         let name = self.name.as_slice();
-        if self.stat.kind == io::TypeDirectory {
+        if self.stat.kind == io::FileType::Directory {
             return Directory;
         }
-        else if self.stat.kind == io::TypeSymlink {
+        else if self.stat.kind == io::FileType::Symlink {
             return Symlink;
         }
-        else if self.stat.kind == io::TypeBlockSpecial || self.stat.kind == io::TypeNamedPipe || self.stat.kind == io::TypeUnknown {
+        else if self.stat.kind == io::FileType::BlockSpecial || self.stat.kind == io::FileType::NamedPipe || self.stat.kind == io::FileType::Unknown {
             return Special;
         }
         else if self.stat.perm.contains(io::USER_EXECUTE) {