diff --git a/.bash_profile b/.bash_profile
index 0cb078f..ae2ece5 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,10 +1,5 @@
-# If .bash_profile exists, bash doesn't read .profile
-if [[ -f $HOME/.profile ]]; then
-  . $HOME/.profile
-fi
-
-# If the shell is interactive and .bashrc exists, get the aliases and functions
-if [[ $- == *i* && -f $HOME/.bashrc ]]; then
+# We just source .bashrc so we don't need to manage two files.
+if [[ -f $HOME/.bashrc ]]; then
     . $HOME/.bashrc
 fi
 
diff --git a/.bashrc b/.bashrc
index c4ad8c4..f886ad7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -121,3 +121,8 @@ fi
 if [ -x /usr/bin/mint-fortune ]; then
      /usr/bin/mint-fortune
 fi
+
+# Add users bin directory to the PATH
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
diff --git a/.hyper.js b/.hyper.js
index 6f6671b..c806aa8 100644
--- a/.hyper.js
+++ b/.hyper.js
@@ -10,24 +10,15 @@ module.exports = {
 
     foregroundColor: '#C5C8C6',
 
-    backgroundColor: '#1D1F21',
+    backgroundColor: '#000',
 
     borderColor: '#373B41',
-    
-    // Hide the tab bar
-    css: `
-	.header_header {
-	  display: none;
-	}
 
-	.terms_terms {
-	  margin-top: 0;
-	}
-    `,
+    css: "",
 
-    termCSS: '',
+    termCSS: "",
 
-    padding: '12px 14px',
+    padding: "12px",
 
     colors: [
       "#1d1f21",
@@ -49,9 +40,9 @@ module.exports = {
       "#c5c8c6"
     ],
 
-    shell: '',
+    shell: "",
 
-    shellArgs: ['--login'],
+    shellArgs: ["--login"],
 
     env: {},
 
@@ -66,11 +57,9 @@ module.exports = {
   },
 
   plugins: [
-    //"hyperterm-tomorrow-night"
+    "hyper-tomorrow-night",
+    "hyper-hide-tabs"
   ],
 
-  // in development, you can create a directory under
-  // `~/.hyperterm_plugins/local/` and include it here
-  // to load it and avoid it being `npm install`ed
   localPlugins: []
 };
diff --git a/.profile b/.profile
deleted file mode 100644
index c9db459..0000000
--- a/.profile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
diff --git a/.xinitrc b/.xinitrc
index 727203e..5e2f06d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,6 +3,9 @@ xset s off
 xset -dpms
 xset s noblank
 
+# Load dconf
+cat "$HOME/dotfiles/dconf/config" | dconf load /
+
 # Start ibus
 ibus-daemon -d --xim
 
diff --git a/dconf/config b/dconf/config
new file mode 100644
index 0000000..8e734bf
--- /dev/null
+++ b/dconf/config
@@ -0,0 +1,25 @@
+[org/gtk/settings/file-chooser]
+sort-column='name'
+sidebar-width=148
+window-position=(164, 379)
+show-size-column=true
+show-hidden=false
+window-size=(830, 622)
+sort-directories-first=true
+date-format='regular'
+sort-order='ascending'
+location-mode='path-bar'
+
+[desktop/ibus/general]
+engines-order=['xkb:ch::ger', 'mozc-jp']
+embed-preedit-text=true
+use-system-keyboard-layout=true
+use-global-engine=true
+preload-engines=['xkb:ch::ger', 'mozc-jp']
+version='1.5.11'
+
+[desktop/ibus/general/hotkey]
+triggers=['<Super>space']
+
+[desktop/ibus/panel]
+use-custom-font=true
diff --git a/install.sh b/install.sh
index 683d171..5233672 100644
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,6 @@ ln -s "$DIR/.gitconfig" "$HOME/.gitconfig"
 ln -s "$DIR/.bash_profile" "$HOME/.bash_profile"
 ln -s "$DIR/.bashrc" "$HOME/.bashrc"
 ln -s "$DIR/.aliases" "$HOME/.aliases"
-ln -s "$DIR/.profile" "$HOME/.bashrc"
 ln -s "$DIR/.xinitrc" "$HOME/.xinitrc"
 ln -s "$DIR/.Xresources" "$HOME/.Xresources"
 ln -s "$DIR/.config/i3" "$HOME/.config/i3"