diff --git a/data.RES b/data.RES
index a2a7cfa..a38ff2b 100644
Binary files a/data.RES and b/data.RES differ
diff --git a/main.pas b/main.pas
index 718fedd..d5352a7 100644
--- a/main.pas
+++ b/main.pas
@@ -6199,6 +6199,7 @@ if node = NIL then exit;
 { disable shortcuts, to be used in editbox. Shortcuts need to be re-activated,
 { but when the node text is left unchanged, no event is notified, so we got to
 { use timerEvent to do the work. }
+copyURL1.ShortCut:=0;
 remove1.ShortCut:=0;
 Paste1.ShortCut:=0;
 
@@ -8042,6 +8043,7 @@ var
     begin
     remove1.ShortCut:=TextToShortCut('Del');
     Paste1.ShortCut:=TextToShortCut('Ctrl+V');
+    copyURL1.ShortCut:=TextToShortCut('Ctrl+C');
     end;
 
   with optionsFrm do
@@ -12620,7 +12622,8 @@ MIMEtypes:=toSA([
   '*.avi', 'video/x-msvideo',
   '*.txt', 'text/plain',
   '*.css', 'text/css',
-  '*.js',  'text/javascript'
+  '*.js',  'text/javascript',
+  '*.mkv', 'video/x-matroska'
 ]);
 
 systemimages:=getSystemimages();
diff --git a/todo.txt b/todo.txt
index 69fc7f1..5500529 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,15 +1,11 @@
 * consider letting comment "protected" files. Can it really cause harm? 
 * flag to enable lnk files in a folder (disabled by default)
-experiment session login in place of http authentication
-+ add mkv mime type http://www.rejetto.com/forum/html-templates/online-video-mkv-player/msg1061237/?topicseen#msg1061237
 + sign exe http://www.rejetto.com/forum/hfs-~-http-file-server/'unsafe'/msg1061437/#msg1061437
 cache reReplace
-- comments are not updated when moving or renaming files http://www.rejetto.com/forum/bug-reports/descript-ion-and-comment-not-cleaned-up-after-moving-file/
 + hash&salt passwords
 - setInterval > setTimeout
 + target=_blank as an option on links
 - an unsaved VFS will be asked twice if a restart is caused by an update
-- while renaming a file, CTRL+C/V doesn't work on the text but is handled by the context menu action
 + more macros http://www.rejetto.com/forum/index.php/topic,10631.0.html
 - long folder names are overflowing the tree-box http://www.rejetto.com/forum/index.php/topic,10631.0.html
 + {.vfs delete.}
diff --git a/whatsnew.txt b/whatsnew.txt
index 20f2555..6b89420 100644
--- a/whatsnew.txt
+++ b/whatsnew.txt
@@ -20,13 +20,15 @@ propaganda
 + {.set cfg.}
 + cache for jquery and template sections
 + new template commands: base64, base64decode, md5, sha1
-+ hfs.diff.*.tpl in exe's folder
++ *.diff.tpl in exe's folder
++ default mime-type for mkv
 - fixed template handling of section names with both '+' and '=' present
 - fixed LNK files to deleted items
 - fixed comments files were not updated upon deletion of files
 - fixed "requesting" forever with empty cookies http://rejetto.com/forum/index.php?topic=13112.0
 - fixed double "Content-Length" header on compressed pages
 - fixed log text base color not matching system settings http://rejetto.com/forum/index.php?topic=13233.0
+- fixed while renaming a file in the GUI, CTRL+C/V didn't work on the text
 
 VER 2.3m
 propaganda