diff --git a/Cargo.toml b/Cargo.toml
index e59996f..9476300 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,16 +3,16 @@ name = "rs"
 version = "0.1.0"
 
 [dependencies]
-bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
+bitflags = "1.2.*"
+clap = { version = "2.33.*", default-features = false }
 maplit = "1.0.*"
-regex = "1.1.*"
+regex = "1.3.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
 
 [dependencies.cairo-rs]
-version = "0.5.*"
+version = "0.8.*"
 
 [dependencies.cairo-sys-rs]
 version = ""
@@ -33,7 +33,7 @@ version = ""
 features = ["v2_44"]
 
 [dependencies.gtk]
-version = "0.5.*"
+version = "0.8.*"
 features = ["v3_22"]
 
 [dependencies.gtk-sys]
diff --git a/src/layout.rs b/src/layout.rs
index 09fc4f7..a56b8c3 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -99,8 +99,8 @@ pub mod c {
 
     impl Bounds {
         pub fn contains(&self, point: &Point) -> bool {
-            (point.x > self.x && point.x < self.x + self.width
-                && point.y > self.y && point.y < self.y + self.height)
+            point.x > self.x && point.x < self.x + self.width
+                && point.y > self.y && point.y < self.y + self.height
         }
     }
 
diff --git a/src/popover.rs b/src/popover.rs
index 96d3a97..4f85f0e 100644
--- a/src/popover.rs
+++ b/src/popover.rs
@@ -13,7 +13,7 @@ use ::resources;
 
 use gio::ActionMapExt;
 use gio::SettingsExt;
-use gio::SimpleActionExt;
+use gtk::prelude::BuilderExtManual;
 use glib::translate::FromGlibPtrNone;
 use glib::variant::ToVariant;
 use gtk::PopoverExt;
@@ -154,7 +154,7 @@ fn get_settings(schema_name: &str) -> Option<gio::Settings> {
 fn set_layout(kind: String, name: String) {
     let settings = get_settings("org.gnome.desktop.input-sources");
     if let Some(settings) = settings {
-        let inputs = settings.get_value("sources").unwrap();
+        let inputs = settings.get_value("sources");
         let current = (kind.clone(), name.clone());
         let inputs = variants::get_tuples(inputs).into_iter()
             .filter(|t| t != &current);
@@ -308,7 +308,7 @@ pub fn show(
     let settings = get_settings("org.gnome.desktop.input-sources");
     let inputs = settings
         .map(|settings| {
-            let inputs = settings.get_value("sources").unwrap();
+            let inputs = settings.get_value("sources");
             variants::get_tuples(inputs)
         })
         .unwrap_or_else(|| Vec::new());
diff --git a/src/style.rs b/src/style.rs
index 153431a..2d7d539 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -99,13 +99,13 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
             name: {
                 settings.get_property("gtk-theme-name")
                     .or_print(logging::Problem::Surprise, "No theme name")
-                    .and_then(|value| value.get::<String>())
+                    .and_then(|value| value.get::<String>().unwrap())
                     .unwrap_or(DEFAULT_THEME_NAME.into())
             },
             variant: {
                 settings.get_property("gtk-application-prefer-dark-theme")
                     .or_print(logging::Problem::Surprise, "No settings key")
-                    .and_then(|value| value.get::<bool>())
+                    .and_then(|value| value.get::<bool>().unwrap())
                     .and_then(|dark_preferred| match dark_preferred {
                         true => Some("dark".into()),
                         false => None,