diff --git a/.config/rofi/config b/.config/rofi/config
deleted file mode 100644
index 33d2a5d..0000000
--- a/.config/rofi/config
+++ /dev/null
@@ -1,95 +0,0 @@
-// vi: ft=css
-
-configuration {
-    modi:               "drun,run,window";
-    matching:           "glob";
-    drun-match-fields:   "all";
-    /*display-drun:     "Apps";*/
-    /*display-window:   "Window";*/
-    show-icons:         true;
-
-    // continous scrolling
-    scroll-method: 1;
-
-    // Automatically select when only one item is left
-    auto-select: true;
-}
-
-* {
-    lines: 5;
-    columns: 1;
-    background-color: #00000090;
-    // background-color: #00000065;
-    border-color: #00000000;
-    text-color: #EFEFEF;
-    font: "Hack 20";
-}
-
-#window {
-    border: 0;
-    border-radius: 4px;
-    padding: 30;
-    width: 40%;
-    height: 60%;
-}
-
-#scrollbar {
-    handle-color: #00a0e6;
-    border-color: #00a0e6;
-}
-
-#mainbox {
-    background-color: #00000000;
-    children: [inputbar, listview];
-    spacing: 10px;
-    /*margin: 20%;*/
-    padding: 7px 0;
-    border: 1px;
-    border-color: @base0D;
-}
-
-#listview {
-    background-color: #00000000;
-    fixed-height: 0;
-    border: 0px;
-    spacing: 5px;
-    scrollbar: true;
-    padding: 10px 10px 0px;
-}
-
-#element {
-    background-color: #00000000;
-    border: 0;
-    border-radius: 15px;
-    padding: 3 0  3 4 ;
-}
-
-#element selected {
-    background-color: #00a0e6;
-    text-color: #EFEFEF;
-}
-
-#inputbar {
-    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-    background-color: #00000000;
-}
-
-#case-indicator {
-    background-color: #00000000;
-    spacing:    0;
-}
-#entry {
-    background-color: #00000000;
-    spacing:    0;
-}
-#prompt {
-    background-color: #00000000;
-    spacing:    0;
-}
-
-#textbox-prompt-colon {
-    background-color: #00000000;
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
-}
diff --git a/.config/rofi/config b/.config/rofi/config
new file mode 120000
index 0000000..5d70a42
--- /dev/null
+++ b/.config/rofi/config
@@ -0,0 +1 @@
+config.rasi
\ No newline at end of file
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 169f522..faaf771 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,95 +1,98 @@
 // vi: ft=css
 
 configuration {
-    modi:               "window,drun";
-    matching:           "glob";
-    drun-match-fields:   "all";
-    /*display-drun:     "Apps";*/
-    /*display-window:   "Window";*/
-    show-icons:         true;
+	modi: "drun,run,window";
+	matching: "fuzzy";
+	show-icons: true;
+	drun-match-fields: "all";
+	drun-show-actions: true;
+	/* continous scrolling */
+	scroll-method: 1;
+	auto-select: true;
 
-    // continous scrolling
-    scroll-method:      1;
+	/* Overwrite conflicting bindings */
+	kb-accept-entry: "Control+m,Return,KP_Enter";
+	kb-remove-to-eol: "";
+	kb-remove-char-back: "BackSpace,Shift+BackSpace";
+	/* Add Vim like bindings */
+	kb-mode-previous: "Control+h,Shift+Left,Control+ISO_Left_Tab";
+	kb-row-down: "Control+j,Down,Control+n";
+	kb-row-up: "Control+k,Up,Control+p,ISO_Left_Tab";
+	kb-mode-next: "Control+l,Shift+Right,Control+Tab";
 }
- 
+
 * {
-    lines: 5;
-    columns: 1;
-    background-color: #00000090;
-    // background-color: #00000065;
-    border-color: #00000000;
-    text-color: #EFEFEF;
-    font: "Hack 20";
+	columns: 1;
+	background-color: #00000065;
+	border-color: #00000000;
+	text-color: #EFEFEF;
 }
- 
+
 #window {
-    border: 0;
-    border-radius: 4px;
-    padding: 30;
-    width: 40%;
-    height: 60%;
+	border: 0;
+	border-radius: 4px;
+	padding: 30;
+	width: 40%;
+	height: 60%;
 }
 
 #scrollbar {
-    handle-color: #00a0e6;
-    border-color: #00a0e6;
+	handle-color: #00a0e6;
+	border-color: #00a0e6;
 }
 
 #mainbox {
-    background-color: #00000000;
-    children: [inputbar, listview];
-    spacing: 10px;
-    /*margin: 20%;*/
-    padding: 7px 0;
-    border: 1px;
-    border-color: @base0D;
-}
- 
- 
-#listview {
-    background-color: #00000000;
-    fixed-height: 0;
-    border: 0px;
-    spacing: 5px;
-    scrollbar: true;
-    padding: 10px 10px 0px;
-}
- 
-#element {
-    background-color: #00000000;
-    border: 0;
-    border-radius: 15px;
-    padding: 3 0  3 4 ;
-}
- 
-#element selected {
-    background-color: #00a0e6;
-    text-color: #EFEFEF;
-}
- 
- 
-#inputbar {
-    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-    background-color: #00000000;
-}
- 
-#case-indicator {
-    background-color: #00000000;
-    spacing:    0;
-}
-#entry {
-    background-color: #00000000;
-    spacing:    0;
-}
-#prompt {
-    background-color: #00000000;
-    spacing:    0;
-}
- 
-#textbox-prompt-colon {
-    background-color: #00000000;
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
+	background-color: #00000000;
+	children: [inputbar, listview];
+	spacing: 10px;
+	/*margin: 20%;*/
+	padding: 7px 0;
+	border: 1px;
+	border-color: @base0D;
 }
 
+#listview {
+	background-color: #00000000;
+	fixed-height: 0;
+	border: 0px;
+	spacing: 5px;
+	scrollbar: true;
+	padding: 10px 10px 0px;
+}
+
+#element {
+	background-color: #00000000;
+	border: 0;
+	border-radius: 15px;
+	padding: 3 0  3 4 ;
+}
+
+#element selected {
+	background-color: #00a0e6;
+	text-color: #EFEFEF;
+}
+
+#inputbar {
+	children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+	background-color: #00000000;
+}
+
+#case-indicator {
+	background-color: #00000000;
+	spacing:	0;
+}
+#entry {
+	background-color: #00000000;
+	spacing:	0;
+}
+#prompt {
+	background-color: #00000000;
+	spacing:	0;
+}
+
+#textbox-prompt-colon {
+	background-color: #00000000;
+	expand:	 false;
+	str:		":";
+	margin:	 0px 0.3em 0em 0em ;
+}