diff --git a/reactos/base/applications/regedit/clb/clb.rc b/reactos/base/applications/regedit/clb/clb.rc
index 52b19791902..0841a7ff3bf 100644
--- a/reactos/base/applications/regedit/clb/clb.rc
+++ b/reactos/base/applications/regedit/clb/clb.rc
@@ -8,7 +8,5 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"clb.dll\0"
 #include <reactos/version.rc>
 
-#include "clb_En.rc"
-#include "clb_Ja.rc"
-#include "clb_No.rc"
+#include "rsrc.rc"
 
diff --git a/reactos/base/applications/regedit/clb/clb_En.rc b/reactos/base/applications/regedit/clb/lang/En.rc
similarity index 100%
rename from reactos/base/applications/regedit/clb/clb_En.rc
rename to reactos/base/applications/regedit/clb/lang/En.rc
diff --git a/reactos/base/applications/regedit/clb/clb_Ja.rc b/reactos/base/applications/regedit/clb/lang/Ja.rc
similarity index 100%
rename from reactos/base/applications/regedit/clb/clb_Ja.rc
rename to reactos/base/applications/regedit/clb/lang/Ja.rc
diff --git a/reactos/base/applications/regedit/clb/clb_No.rc b/reactos/base/applications/regedit/clb/lang/No.rc
similarity index 100%
rename from reactos/base/applications/regedit/clb/clb_No.rc
rename to reactos/base/applications/regedit/clb/lang/No.rc
diff --git a/reactos/base/applications/regedit/clb/rsrc.rc b/reactos/base/applications/regedit/clb/rsrc.rc
new file mode 100644
index 00000000000..d6663c06609
--- /dev/null
+++ b/reactos/base/applications/regedit/clb/rsrc.rc
@@ -0,0 +1,36 @@
+/*
+ * Regedit resources
+ *
+ * Copyright 2002 Robert Dickenson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <windows.h>
+#include "resource.h"
+
+
+/* define language neutral resources */
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+/* include localised resources */
+
+
+#include "lang/En.rc"
+#include "lang/Ja.rc"
+#include "lang/No.rc"
+
+
diff --git a/reactos/base/applications/regedit/Cz.rc b/reactos/base/applications/regedit/lang/Cz.rc
similarity index 98%
rename from reactos/base/applications/regedit/Cz.rc
rename to reactos/base/applications/regedit/lang/Cz.rc
index 98945245fb0..5eac570e969 100644
--- a/reactos/base/applications/regedit/Cz.rc
+++ b/reactos/base/applications/regedit/lang/Cz.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/De.rc b/reactos/base/applications/regedit/lang/De.rc
similarity index 98%
rename from reactos/base/applications/regedit/De.rc
rename to reactos/base/applications/regedit/lang/De.rc
index 5521d1ac712..6c90815ec59 100644
--- a/reactos/base/applications/regedit/De.rc
+++ b/reactos/base/applications/regedit/lang/De.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/En.rc b/reactos/base/applications/regedit/lang/En.rc
similarity index 98%
rename from reactos/base/applications/regedit/En.rc
rename to reactos/base/applications/regedit/lang/En.rc
index da2f5031642..e77a31437a9 100644
--- a/reactos/base/applications/regedit/En.rc
+++ b/reactos/base/applications/regedit/lang/En.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Es.rc b/reactos/base/applications/regedit/lang/Es.rc
similarity index 98%
rename from reactos/base/applications/regedit/Es.rc
rename to reactos/base/applications/regedit/lang/Es.rc
index 9124836d953..804bee4e915 100644
--- a/reactos/base/applications/regedit/Es.rc
+++ b/reactos/base/applications/regedit/lang/Es.rc
@@ -22,6 +22,15 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Fr.rc b/reactos/base/applications/regedit/lang/Fr.rc
similarity index 96%
rename from reactos/base/applications/regedit/Fr.rc
rename to reactos/base/applications/regedit/lang/Fr.rc
index 37d0e2cd0a3..4296316afb1 100644
--- a/reactos/base/applications/regedit/Fr.rc
+++ b/reactos/base/applications/regedit/lang/Fr.rc
@@ -22,6 +22,15 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Hu.rc b/reactos/base/applications/regedit/lang/Hu.rc
similarity index 95%
rename from reactos/base/applications/regedit/Hu.rc
rename to reactos/base/applications/regedit/lang/Hu.rc
index dd6f8e52574..13f536032a7 100644
--- a/reactos/base/applications/regedit/Hu.rc
+++ b/reactos/base/applications/regedit/lang/Hu.rc
@@ -19,7 +19,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
 
 /*
  * Menu
diff --git a/reactos/base/applications/regedit/It.rc b/reactos/base/applications/regedit/lang/It.rc
similarity index 97%
rename from reactos/base/applications/regedit/It.rc
rename to reactos/base/applications/regedit/lang/It.rc
index 45c19c9db06..eda9ef63cf7 100644
--- a/reactos/base/applications/regedit/It.rc
+++ b/reactos/base/applications/regedit/lang/It.rc
@@ -22,6 +22,15 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Ja.rc b/reactos/base/applications/regedit/lang/Ja.rc
similarity index 98%
rename from reactos/base/applications/regedit/Ja.rc
rename to reactos/base/applications/regedit/lang/Ja.rc
index d44f464d6e6..4e7a060285e 100644
--- a/reactos/base/applications/regedit/Ja.rc
+++ b/reactos/base/applications/regedit/lang/Ja.rc
@@ -5,6 +5,15 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Nl.rc b/reactos/base/applications/regedit/lang/Nl.rc
similarity index 96%
rename from reactos/base/applications/regedit/Nl.rc
rename to reactos/base/applications/regedit/lang/Nl.rc
index 4d730649ed3..021eef2e0f4 100644
--- a/reactos/base/applications/regedit/Nl.rc
+++ b/reactos/base/applications/regedit/lang/Nl.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Pl.rc b/reactos/base/applications/regedit/lang/Pl.rc
similarity index 95%
rename from reactos/base/applications/regedit/Pl.rc
rename to reactos/base/applications/regedit/lang/Pl.rc
index 2ad093a1e73..1968edb2a82 100644
--- a/reactos/base/applications/regedit/Pl.rc
+++ b/reactos/base/applications/regedit/lang/Pl.rc
@@ -18,7 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
 
 /*
  * Menu
diff --git a/reactos/base/applications/regedit/Pt.rc b/reactos/base/applications/regedit/lang/Pt.rc
similarity index 97%
rename from reactos/base/applications/regedit/Pt.rc
rename to reactos/base/applications/regedit/lang/Pt.rc
index 95f717ede99..8c0546bf9fb 100644
--- a/reactos/base/applications/regedit/Pt.rc
+++ b/reactos/base/applications/regedit/lang/Pt.rc
@@ -21,6 +21,15 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Ru.rc b/reactos/base/applications/regedit/lang/Ru.rc
similarity index 96%
rename from reactos/base/applications/regedit/Ru.rc
rename to reactos/base/applications/regedit/lang/Ru.rc
index f2c664848f1..7044107f187 100644
--- a/reactos/base/applications/regedit/Ru.rc
+++ b/reactos/base/applications/regedit/lang/Ru.rc
@@ -18,7 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
 
 /*
  * Menu
diff --git a/reactos/base/applications/regedit/Si.rc b/reactos/base/applications/regedit/lang/Si.rc
similarity index 96%
rename from reactos/base/applications/regedit/Si.rc
rename to reactos/base/applications/regedit/lang/Si.rc
index e33ad4b8790..5d734da73d6 100644
--- a/reactos/base/applications/regedit/Si.rc
+++ b/reactos/base/applications/regedit/lang/Si.rc
@@ -18,7 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_SLOVENIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
 
 /*
  * Menu
diff --git a/reactos/base/applications/regedit/Sv.rc b/reactos/base/applications/regedit/lang/Sv.rc
similarity index 95%
rename from reactos/base/applications/regedit/Sv.rc
rename to reactos/base/applications/regedit/lang/Sv.rc
index a1078116d58..55ac6aeee7b 100644
--- a/reactos/base/applications/regedit/Sv.rc
+++ b/reactos/base/applications/regedit/lang/Sv.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/Uk.rc b/reactos/base/applications/regedit/lang/Uk.rc
similarity index 98%
rename from reactos/base/applications/regedit/Uk.rc
rename to reactos/base/applications/regedit/lang/Uk.rc
index d139982c378..911e30cc2c6 100644
--- a/reactos/base/applications/regedit/Uk.rc
+++ b/reactos/base/applications/regedit/lang/Uk.rc
@@ -20,6 +20,15 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
+ID_ACCEL ACCELERATORS
+{
+    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
+    "^F", ID_EDIT_FIND
+    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
+    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
+    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
+}
+
 /*
  * Menu
  */
diff --git a/reactos/base/applications/regedit/rsrc.rc b/reactos/base/applications/regedit/rsrc.rc
index 0c273a0a934..b4eecf7e1cf 100644
--- a/reactos/base/applications/regedit/rsrc.rc
+++ b/reactos/base/applications/regedit/rsrc.rc
@@ -18,17 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "windows.h"
+#include <windows.h>
 #include "resource.h"
 
-ID_ACCEL ACCELERATORS
-{
-    VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
-    "^F", ID_EDIT_FIND
-    VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT
-    VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT
-    VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT
-}
 
 /* define language neutral resources */
 
@@ -36,19 +28,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 
-#include "Cz.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Hu.rc"
-#include "Uk.rc"
+#include "lang/Cz.rc"
+#include "lang/De.rc"
+#include "lang/En.rc"
+#include "lang/Es.rc"
+#include "lang/Fr.rc"
+#include "lang/It.rc"
+#include "lang/Ja.rc"
+#include "lang/Nl.rc"
+#include "lang/Pl.rc"
+#include "lang/Pt.rc"
+#include "lang/Ru.rc"
+#include "lang/Si.rc"
+#include "lang/Sv.rc"
+#include "lang/Hu.rc"
+#include "lang/Uk.rc"