diff --git a/servo/components/fallible/Cargo.toml b/servo/components/fallible/Cargo.toml
index 6c825285b8f5..f3cf1e9640b2 100644
--- a/servo/components/fallible/Cargo.toml
+++ b/servo/components/fallible/Cargo.toml
@@ -10,5 +10,5 @@ name = "fallible"
 path = "lib.rs"
 
 [dependencies]
-smallvec = "1.0"
 hashbrown = "0.7"
+smallvec = "1.0"
diff --git a/servo/components/malloc_size_of/Cargo.toml b/servo/components/malloc_size_of/Cargo.toml
index ca7dd9488a7d..1b2a66e97053 100644
--- a/servo/components/malloc_size_of/Cargo.toml
+++ b/servo/components/malloc_size_of/Cargo.toml
@@ -10,6 +10,8 @@ path = "lib.rs"
 
 [features]
 servo = [
+    "accountable-refcell",
+    "content-security-policy",
     "crossbeam-channel",
     "hyper",
     "hyper_serde",
@@ -19,24 +21,22 @@ servo = [
     "string_cache",
     "time",
     "url",
+    "uuid",
     "webrender_api",
     "xml5ever",
-    "content-security-policy",
-    "uuid",
-    "accountable-refcell",
 ]
 
 [dependencies]
 accountable-refcell = { version = "0.2.0", optional = true }
 app_units = "0.7"
-content-security-policy = {version = "0.3.0", features = ["serde"], optional = true}
-crossbeam-channel = { version = "0.3", optional = true }
+content-security-policy = { version = "0.4.0", features = ["serde"], optional = true }
+crossbeam-channel = { version = "0.4", optional = true }
 cssparser = "0.27"
 euclid = "0.20"
 hashbrown = "0.7"
 hyper = { version = "0.12", optional = true }
 hyper_serde = { version = "0.11", optional = true }
-keyboard-types = {version = "0.4.3", optional = true}
+keyboard-types = { version = "0.4.3", optional = true }
 selectors = { path = "../selectors" }
 serde = { version = "1.0.27", optional = true }
 serde_bytes = { version = "0.11", optional = true }
@@ -47,7 +47,7 @@ string_cache = { version = "0.8", optional = true }
 thin-slice = "0.1.0"
 time = { version = "0.1.17", optional = true }
 url = { version = "2.0", optional = true }
+uuid = { version = "0.8", features = ["v4"], optional = true }
+void = "1.0.2"
 webrender_api = { git = "https://github.com/servo/webrender", optional = true }
 xml5ever = { version = "0.16", optional = true }
-void = "1.0.2"
-uuid = {version = "0.8", features = ["v4"], optional = true}
diff --git a/servo/components/selectors/Cargo.toml b/servo/components/selectors/Cargo.toml
index 21077f426c64..a3e6db922a7f 100644
--- a/servo/components/selectors/Cargo.toml
+++ b/servo/components/selectors/Cargo.toml
@@ -1,10 +1,8 @@
 [package]
-
 name = "selectors"
 version = "0.22.0"
 authors = ["The Servo Project Developers"]
 documentation = "https://docs.rs/selectors/"
-
 description = "CSS Selectors matching for Rust"
 repository = "https://github.com/servo/servo"
 readme = "README.md"
@@ -24,8 +22,8 @@ bitflags = "1.0"
 matches = "0.1"
 cssparser = "0.27"
 derive_more = "0.99"
-log = "0.4"
 fxhash = "0.2"
+log = "0.4"
 phf = "0.8"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }
diff --git a/servo/components/servo_arc/Cargo.toml b/servo/components/servo_arc/Cargo.toml
index 3581210c2f1b..f72654230f98 100644
--- a/servo/components/servo_arc/Cargo.toml
+++ b/servo/components/servo_arc/Cargo.toml
@@ -11,10 +11,10 @@ name = "servo_arc"
 path = "lib.rs"
 
 [features]
-servo = ["serde"]
 gecko_refcount_logging = []
+servo = ["serde"]
 
 [dependencies]
-nodrop = {version = "0.1.8"}
-serde = {version = "1.0", optional = true}
+nodrop = { version = "0.1.8" }
+serde = { version = "1.0", optional = true }
 stable_deref_trait = "1.0.0"
diff --git a/servo/components/style/README.md b/servo/components/style/README.md
index 70670a5f96b2..96457e1b30f6 100644
--- a/servo/components/style/README.md
+++ b/servo/components/style/README.md
@@ -1,6 +1,6 @@
 servo-style
 ===========
 
-Style system for Servo, using [rust-cssparser](https://github.com/mozilla-servo/rust-cssparser) for parsing.
+Style system for Servo, using [rust-cssparser](https://github.com/servo/rust-cssparser) for parsing.
 
  * [Documentation](https://github.com/servo/servo/blob/master/docs/components/style.md).
diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index 1f3f3e9ddb1e..50e93ab25e65 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -15,17 +15,17 @@ gecko = []
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.27"
 bitflags = "1.0"
+cssparser = "0.27"
 euclid = "0.20"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 selectors = { path = "../selectors" }
 serde = "1.0"
-webrender_api = {git = "https://github.com/servo/webrender", optional = true}
-servo_atoms = {path = "../atoms", optional = true}
 servo_arc = { path = "../servo_arc" }
+servo_atoms = { path = "../atoms", optional = true }
 servo_url = { path = "../url", optional = true }
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
+webrender_api = { git = "https://github.com/servo/webrender", optional = true }