diff --git a/.vim/autoload/airline/themes/barak.vim b/.vim/autoload/airline/themes/barak.vim
new file mode 100644
index 0000000..ed5b873
--- /dev/null
+++ b/.vim/autoload/airline/themes/barak.vim
@@ -0,0 +1,58 @@
+" vim-airline companion theme of Ubaryd
+" (https://github.com/Donearm/Ubaryd)
+
+" Normal mode
+let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
+let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
+let s:N3 = [ '#b88853' , '#363946' , 137, 237 ] " toffee & darkgravel
+let s:N4 = [ '#363946' , 237 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#fade3e' , 232 , 221 ] " blackestgravel & warmcorn
+let s:I2 = [ '#c7b386' , '#45413b' , 252 , 238 ] " bleaksand & deepgravel
+let s:I3 = [ '#f4cf86' , '#242321' , 222 , 235 ] " lighttannedskin & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1c1b1a' , '#9a4820' , 233 , 88 ] " blackgravel & warmadobe
+let s:V2 = [ '#000000' , '#88633f' , 16 , 95 ] " coal & cappuccino
+let s:V3 = [ '#88633f' , '#c7b386' , 95 , 252 ] " cappuccino & bleaksand
+let s:V4 = [ '#c14c3d' , 160 ] " tannedumbrella
+
+" Replace mode
+let s:RE = [ '#c7915b' , 173 ] " nut
+
+" Paste mode
+let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
+
+let s:file = [ '#ff7400' , '' , 196 , '' , '' ]
+let s:IA = [ '#767986', '#363946', 244, 237, '' ]	
+
+let g:airline#themes#barak#palette = {}
+let g:airline#themes#barak#palette.inactive = {
+      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
+
+
+let g:airline#themes#barak#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#barak#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#barak#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#barak#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#barak#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#barak#palette.replace = copy(airline#themes#barak#palette.insert)
+let g:airline#themes#barak#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#barak#palette.replace_modified = g:airline#themes#barak#palette.insert_modified
+
+
+let g:airline#themes#barak#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#barak#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+let g:airline#themes#barak#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index 527d980..7cc399a 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit 527d98028bb00167acf9acd89f7129c229c26025
+Subproject commit 7cc399a017a0f20c230a50a4f05d58ab7ef9dca4
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
index c985499..ccb00be 160000
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit c98549913c19b9db632bc214bc4266a17fa103ae
+Subproject commit ccb00be717d36276514ed660f6f6b6d3413b1fad
diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script
index 0e38ef9..83c06f7 160000
--- a/.vim/bundle/vim-coffee-script
+++ b/.vim/bundle/vim-coffee-script
@@ -1 +1 @@
-Subproject commit 0e38ef90446a0f1f2294b6225c9c97dbc2810b45
+Subproject commit 83c06f7a351b9140988bfe6d3e651a63d3c504c0
diff --git a/.vimrc b/.vimrc
index 2a28b44..0e4a708 100644
--- a/.vimrc
+++ b/.vimrc
@@ -194,7 +194,12 @@ set noshowmode
 let g:airline_enable_branch = 1
 let g:airline_enable_syntastic = 1
 let g:airline_enable_tagbar = 1
-let g:airline_theme="ubaryd"
+let g:airline_theme="barak"
+let g:airline_left_sep = ''
+let g:airline_right_sep = ''
+let g:airline#extensions#syntastic#enabled = 1
+let g:airline#extensions#hunks#non_zero_only = 1
+let g:airline#extensions#whitespace#enabled = 0
 
 " * CtrlP
 let g:ctrlp_map = ',t'