diff --git a/conf/gvimrc b/conf/gvimrc
deleted file mode 100644
index 604013f..0000000
--- a/conf/gvimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-colorscheme elflord
-set guifont=Monospace\ 11
diff --git a/conf/vim/vimrc b/conf/vim/vimrc
new file mode 100644
index 0000000..8ca7792
--- /dev/null
+++ b/conf/vim/vimrc
@@ -0,0 +1,15 @@
+" Add to ~/.vimrc:
+" source $LWS/conf/vim/vimrc
+
+function! SourceLws(filename)
+    let conf = $LWS . "/" . a:filename
+    " echo conf
+    let command = "source " . conf
+    " echo command
+    exec command
+endfunction
+
+call SourceLws("conf/vim/vimrc.pivo")
+
+colorscheme elflord
+set guifont=Monospace\ 11
diff --git a/conf/vimrc.pivo b/conf/vim/vimrc.pivo
similarity index 95%
rename from conf/vimrc.pivo
rename to conf/vim/vimrc.pivo
index 6e81403..ec79a05 100644
--- a/conf/vimrc.pivo
+++ b/conf/vim/vimrc.pivo
@@ -30,7 +30,7 @@ set scrolloff=0
 " svetle modry komentar
 highlight Normal guibg=black guifg=white ctermbg=black ctermfg=white
 " mapuje v prikazovem rezimu klavesy na jine kvuli spatne klavesnici
-set langmap=ì2,¹3,è4,ø5,¾6,ý7,á8,í9,é0,\":,-/,_?
+set langmap=�2,�3,�4,�5,�6,�7,�8,�9,�0,\":,-/,_?
 " editovany soubor se pri kazde prilezitosti uklada
 set autowrite
 " vytvaret zalohy souboru
@@ -44,7 +44,7 @@ set confirm
 " kolik se ma zachovavat informaci do dalsiho spusteni
 set viminfo='50,\"500
 " pamatuje si pozici kurzoru z posledni editace
-au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"z." | endif 
+au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"z." | endif
 " neposkakuje v textu pri zapisu hledaneho slova
 set noincsearch
 " zapni zvyrazneni hledanych slov
@@ -67,9 +67,9 @@ set timeoutlen=300
 set backspace=2
 " po napsani "dts" v insert modu vlozi aktualni datum a cas
 " http://vim.wikia.com/wiki/Insert_current_date_or_time
-:inoremap dts =strftime("%A %-d.%-m.%Y %H:%M")
+:inoremap dts =strftime("%A %-d.%-m.%Y %H:%M")
 " jen cas
-:inoremap tss =strftime("[%H:%M] ")
+:inoremap tss =strftime("[%H:%M] ")
 
 " Poznamky
 " / - normalni hledani
@@ -83,12 +83,12 @@ set backspace=2
 " Prevod na taby
 " :set noexpandtab
 " :retab
-" 
+"
 " Zobraz taby a konce radku
 " :set list
 " Zobraz cisla radek
 " :set number
-" 
+"
 " Docasne zrusi zvyrazneni vyhledavani
 " :nohls
 "
@@ -96,5 +96,5 @@ set backspace=2
 " napise <STRONG></STRONG> a kurzor umisti doprostred
 " makro se aktivuje napsanim ,bb v editacnim rezimu
 " imap ,bb <STRONG></STRONG><Esc>F<i
-" 
+"