diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc
index 2a3facd58b8..6610c76b43a 100644
--- a/reactos/subsys/system/cmd/En.rc
+++ b/reactos/subsys/system/cmd/En.rc
@@ -559,5 +559,8 @@ STRING_ERROR_BADCOMMAND,           "Bad command or filename\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Out of memory error.\n"
 STRING_ERROR_CANNOTPIPE,           "Error!  Cannot pipe!  Cannot open temporary file!\n"
 STRING_ERROR_D_PAUSEMSG,           "Press any key to continue . . ."
-STRING_ERROR_DRIVER_NOT_READY      "Drive not ready"
+STRING_ERROR_DRIVER_NOT_READY,     "Drive not ready"
+
+STRING_ERROR_WRONG_DATE,           "Invalid date."
+STRING_SET_ERROR                   "CMD: Not in environment '%s'\n"
 }
diff --git a/reactos/subsys/system/cmd/alias.c b/reactos/subsys/system/cmd/alias.c
index 8eb1695bf0f..76e0c3db748 100644
--- a/reactos/subsys/system/cmd/alias.c
+++ b/reactos/subsys/system/cmd/alias.c
@@ -236,8 +236,7 @@ VOID DestroyAlias (VOID)
 
 /* specified routines */
 VOID ExpandAlias (LPTSTR cmd, INT maxlen)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	unsigned n = 0,
 		m,
 		i,
@@ -280,9 +279,8 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
 			{
 				m = _tcslen (ptr->lpSubst);
 				if ((int)(_tcslen (cmd) - len + m - n) > maxlen)
-				{
-					LoadString(GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg, RC_STRING_MAX_SIZE);
-					ConErrPrintf(szMsg);
+				{					
+					ConErrResPuts(STRING_ALIAS_ERROR);
 
 					/* the parser won't cause any problems with an empty line */
 					cmd[0] = _T('\0');
@@ -305,14 +303,12 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
 
 
 INT CommandAlias (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR ptr;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{	
+		ConOutResPuts(STRING_ALIAS_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/attrib.c b/reactos/subsys/system/cmd/attrib.c
index 650a58a81d4..a622d3b6cf7 100644
--- a/reactos/subsys/system/cmd/attrib.c
+++ b/reactos/subsys/system/cmd/attrib.c
@@ -188,8 +188,7 @@ ChangeAttribute (LPTSTR pszPath, LPTSTR pszFile, DWORD dwMask,
 
 
 INT CommandAttrib (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR *arg;
 	INT    argc, i;
 	TCHAR  szPath[MAX_PATH];
@@ -205,9 +204,8 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param)
 
 	/* print help */
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_ATTRIB_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/batch.c b/reactos/subsys/system/cmd/batch.c
index e2ad269bd89..6d6f35702d4 100644
--- a/reactos/subsys/system/cmd/batch.c
+++ b/reactos/subsys/system/cmd/batch.c
@@ -216,8 +216,7 @@ VOID ExitBatch (LPTSTR msg)
  */
 
 BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	HANDLE hFile;
 
 	hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL,
@@ -230,9 +229,8 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
 #endif
 
 	if (hFile == INVALID_HANDLE_VALUE)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf(szMsg);
+	{		
+		ConErrResPuts(STRING_BATCH_ERROR);
 		return FALSE;
 	}
 
diff --git a/reactos/subsys/system/cmd/beep.c b/reactos/subsys/system/cmd/beep.c
index 39d78c71d04..c175b40dbba 100644
--- a/reactos/subsys/system/cmd/beep.c
+++ b/reactos/subsys/system/cmd/beep.c
@@ -32,12 +32,9 @@
 
 INT cmd_beep (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-                LoadString(GetModuleHandle(NULL), STRING_BEEP_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{                
+		ConOutResPuts(STRING_BEEP_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/call.c b/reactos/subsys/system/cmd/call.c
index 4429eb2471e..2d5d02e383c 100644
--- a/reactos/subsys/system/cmd/call.c
+++ b/reactos/subsys/system/cmd/call.c
@@ -42,17 +42,15 @@
  */
 
 INT cmd_call (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPBATCH_CONTEXT n = NULL;
 
 #ifdef _DEBUG
 	DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param);
 #endif
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CALL_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_CALL_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/chcp.c b/reactos/subsys/system/cmd/chcp.c
index 7d992e17198..e87bb5d3b16 100644
--- a/reactos/subsys/system/cmd/chcp.c
+++ b/reactos/subsys/system/cmd/chcp.c
@@ -28,9 +28,8 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
 
 	/* print help */
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CHCP_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_CHCP_HELP);
 		return 0;
 	}
 
@@ -40,7 +39,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
 	if (args == 0)
 	{
 		/* display active code page number */
-		LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, InputCodePage);
 		return 0;
 	}
@@ -48,7 +47,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
 	if (args >= 2)
 	{
 		/* too many parameters */
-		LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, param);
 		return 1;
 	}
@@ -61,16 +60,15 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
 
 	if (uNewCodePage == 0)
 	{
-		LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, arg[0]);
 		freep (arg);
 		return 1;
 	}
 
 	if (!SetConsoleCP(uNewCodePage))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR4, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf(szMsg);
+	{		
+		ConErrResPuts(STRING_CHCP_ERROR4);
 	}
 	else
 	{
diff --git a/reactos/subsys/system/cmd/choice.c b/reactos/subsys/system/cmd/choice.c
index f2721861c35..16f44835383 100644
--- a/reactos/subsys/system/cmd/choice.c
+++ b/reactos/subsys/system/cmd/choice.c
@@ -123,13 +123,12 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
 	TCHAR Ch;
 	DWORD amount,clk;
 
-	LoadString(GetModuleHandle(NULL), STRING_CHOICE_OPTION, Options, 2);
+	LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, Options, 2);
 	lpOptions = Options;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CHOICE_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{				
+		ConOutResPuts(STRING_CHOICE_HELP);
 		return 0;
 	}
 
@@ -168,9 +167,8 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
 					lpOptions = &arg[i][2];
 
 				if (_tcslen (lpOptions) == 0)
-				{
-					LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR, szMsg, RC_STRING_MAX_SIZE);
-					ConErrPuts(szMsg);
+				{					
+					ConErrResPuts(STRING_CHOICE_ERROR);
 					freep (arg);
 					return 1;
 				}
@@ -199,9 +197,8 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
 				}
 
 				if (*s != _T(','))
-				{
-					LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, szMsg, RC_STRING_MAX_SIZE);
-					ConErrPuts(szMsg);
+				{					
+					ConErrResPuts(STRING_CHOICE_ERROR_TXT);
 					freep (arg);
 					return 1;
 				}
@@ -212,7 +209,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
 			}
 			else if (arg[i][0] == _T('/'))
 			{
-				LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE);
+				LoadString(CMD_ModuleHandle, STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE);
 				ConErrPrintf(szMsg, arg[i]);
 				freep (arg);
 				return 1;
diff --git a/reactos/subsys/system/cmd/cls.c b/reactos/subsys/system/cmd/cls.c
index e96d33038a9..5ee749c7287 100644
--- a/reactos/subsys/system/cmd/cls.c
+++ b/reactos/subsys/system/cmd/cls.c
@@ -32,16 +32,14 @@
 #ifdef INCLUDE_CMD_CLS
 
 INT cmd_cls (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 	COORD coPos;
 	DWORD dwWritten;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CLS_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_CLS_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index aa697fa1fa4..695173203e1 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -155,6 +155,7 @@ OSVERSIONINFO osvi;
 HANDLE hIn;
 HANDLE hOut;
 HANDLE hConsole;
+HANDLE CMD_ModuleHandle;
 
 static NtQueryInformationProcessProc NtQueryInformationProcessPtr;
 static NtReadVirtualMemoryProc       NtReadVirtualMemoryPtr;
@@ -1074,37 +1075,28 @@ VOID RemoveBreakHandler (VOID)
 #if 0
 static VOID
 ShowCommands (VOID)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	/* print command list */
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP1, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPrintf(szMsg);
+{	
+	/* print command list */	
+	ConOutResPuts(STRING_CMD_HELP1);
 	PrintCommandList();
 
-	/* print feature list */
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP2, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+	/* print feature list */	
+	ConOutResPuts(STRING_CMD_HELP2);
 
-#ifdef FEATURE_ALIASES	
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP3, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+#ifdef FEATURE_ALIASES		
+	ConOutResPuts(STRING_CMD_HELP3);
 #endif
-#ifdef FEATURE_HISTORY
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP4, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+#ifdef FEATURE_HISTORY	
+	ConOutResPuts(STRING_CMD_HELP4);
 #endif
-#ifdef FEATURE_UNIX_FILENAME_COMPLETION
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP5, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+#ifdef FEATURE_UNIX_FILENAME_COMPLETION	
+	ConOutResPuts(STRING_CMD_HELP5);
 #endif
-#ifdef FEATURE_DIRECTORY_STACK
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP6, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+#ifdef FEATURE_DIRECTORY_STACK	
+	ConOutResPuts(STRING_CMD_HELP6);
 #endif
-#ifdef FEATURE_REDIRECTION
-	LoadString(GetModuleHandle(NULL), STRING_CMD_HELP7, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+#ifdef FEATURE_REDIRECTION	
+	ConOutResPuts(STRING_CMD_HELP7);
 #endif
 	ConOutChar(_T('\n'));
 }
@@ -1119,8 +1111,7 @@ ShowCommands (VOID)
  */
 static VOID
 Initialize (int argc, TCHAR* argv[])
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	TCHAR commandline[CMDLINE_LENGTH];
 	TCHAR ModuleName[_MAX_PATH + 1];
 	INT i;
@@ -1152,9 +1143,8 @@ Initialize (int argc, TCHAR* argv[])
 
 
 	if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CMD_HELP8, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_CMD_HELP8);
 		ExitProcess(0);
 	}
 	SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
@@ -1290,20 +1280,20 @@ Initialize (int argc, TCHAR* argv[])
 
 static VOID Cleanup (int argc, TCHAR *argv[])
 {
+#ifndef __REACTOS__
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
+#endif
 
 	/* run cmdexit.bat */
 	if (IsExistingFile (_T("cmdexit.bat")))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf(szMsg);
+	{		
+		ConErrResPuts(STRING_CMD_ERROR5);
 
 		ParseCommandLine (_T("cmdexit.bat"));
 	}
 	else if (IsExistingFile (_T("\\cmdexit.bat")))
-	{
-		LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf ((LPTSTR)szMsg);
+	{		
+		ConErrResPuts (STRING_CMD_ERROR5);
 		ParseCommandLine (_T("\\cmdexit.bat"));
 	}
 #ifndef __REACTOS__
@@ -1435,6 +1425,7 @@ int main (int argc, char *argv[])
 
   InputCodePage= GetConsoleCP();
   OutputCodePage = GetConsoleOutputCP();
+  CMD_ModuleHandle = GetModuleHandle(NULL);
 
   /* check switches on command-line */
   Initialize(argc, argv);
diff --git a/reactos/subsys/system/cmd/cmd.h b/reactos/subsys/system/cmd/cmd.h
index 71d27ade1f9..5bc2da4f7f9 100644
--- a/reactos/subsys/system/cmd/cmd.h
+++ b/reactos/subsys/system/cmd/cmd.h
@@ -124,6 +124,8 @@ VOID ParseCommandLine (LPTSTR);
 VOID AddBreakHandler (VOID);
 VOID RemoveBreakHandler (VOID);
 
+extern HANDLE CMD_ModuleHandle;
+
 
 /* Prototypes for CMDINPUT.C */
 VOID ReadCommand (LPTSTR, INT);
@@ -179,6 +181,8 @@ VOID  SetCursorXY (SHORT, SHORT);
 VOID GetScreenSize (PSHORT, PSHORT);
 VOID SetCursorType (BOOL, BOOL);
 
+VOID ConOutResPuts (UINT resID);
+VOID ConErrResPuts (UINT resID);
 
 /* Prototypes for COPY.C */
 INT cmd_copy (LPTSTR, LPTSTR);
diff --git a/reactos/subsys/system/cmd/color.c b/reactos/subsys/system/cmd/color.c
index 716eb86e80d..d311d5436dd 100644
--- a/reactos/subsys/system/cmd/color.c
+++ b/reactos/subsys/system/cmd/color.c
@@ -28,10 +28,7 @@
 
 static VOID ColorHelp (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_COLOR_HELP1, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+	ConOutResPuts(STRING_COLOR_HELP1);
 }
 
 
@@ -40,12 +37,11 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
 	DWORD dwWritten;
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 	COORD coPos;
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+	
 
 	if ((wColor & 0xF) == (wColor &0xF0) >> 4)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+	{		
+		ConErrResPuts(STRING_COLOR_ERROR1);
 	}
 	else
 	{
@@ -90,18 +86,17 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
 	}
 
 	if (StringToColor(&wColor, &rest) == FALSE)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+	{		
+		ConErrResPuts(STRING_COLOR_ERROR2);
 		return 1;
 	}
 
-	LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(szMsg, wColor);
 
 	if ((wColor & 0xF) == (wColor &0xF0) >> 4)
 	{
-		LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, wColor);
 		return 1;
 	}
diff --git a/reactos/subsys/system/cmd/console.c b/reactos/subsys/system/cmd/console.c
index 916cc45c829..550a41fe1fd 100644
--- a/reactos/subsys/system/cmd/console.c
+++ b/reactos/subsys/system/cmd/console.c
@@ -184,6 +184,14 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle)
 #endif
 }
 
+VOID ConOutResPuts (UINT resID)
+{
+  TCHAR szMsg[RC_STRING_MAX_SIZE];	
+  LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
+
+  ConPuts(szMsg, STD_OUTPUT_HANDLE);
+}
+
 VOID ConOutPuts (LPTSTR szText)
 {
 	ConPuts(szText, STD_OUTPUT_HANDLE);
@@ -238,7 +246,7 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
 	}
 	else
 	{
-		LoadString(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg);
 	}
 }
@@ -258,6 +266,13 @@ VOID ConErrChar (TCHAR c)
 }
 
 
+VOID ConErrResPuts (UINT resID)
+{
+	TCHAR szMsg[RC_STRING_MAX_SIZE];	
+    LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
+	ConPuts(szMsg, STD_ERROR_HANDLE);
+}
+
 VOID ConErrPuts (LPTSTR szText)
 {
 	ConPuts(szText, STD_ERROR_HANDLE);
diff --git a/reactos/subsys/system/cmd/copy.c b/reactos/subsys/system/cmd/copy.c
index 01be1cfadf6..83c1af578ea 100644
--- a/reactos/subsys/system/cmd/copy.c
+++ b/reactos/subsys/system/cmd/copy.c
@@ -295,15 +295,13 @@ DeleteFileList (LPFILES f)
 static INT
 Overwrite (LPTSTR fn)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	TCHAR inp[10];
 	LPTSTR p;
 	TCHAR szOptions[4];
 
-	LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szOptions, 4);
-
-	LoadString(GetModuleHandle(NULL), STRING_COPY_HELP1, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPrintf(szMsg);
+	LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, 4);
+	
+	ConOutResPuts(STRING_COPY_HELP1);
 	
 	ConInString(inp, 10);
 	ConOutPuts(_T(""));
@@ -347,7 +345,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
 						   NULL, OPEN_EXISTING, 0, NULL);
 	if (hFileSrc == INVALID_HANDLE_VALUE)
 	{
-		LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, source);
 		return 0;
 	}
@@ -375,7 +373,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
 	{
 		if (!_tcscmp (dest, source))
 		{
-			LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 			ConErrPrintf(szMsg, source);
 			
 			CloseHandle (hFileSrc);
@@ -450,10 +448,8 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
 
 		WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL);
 		if (dwWritten != dwRead)
-		{
-			
-			LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE);
-			ConErrPrintf(szMsg);
+		{						
+			ConErrResPuts(STRING_COPY_ERROR3);
 
 			free (buffer);
 			CloseHandle (hFileDest);
@@ -628,8 +624,7 @@ SetupCopy (LPFILES sources, TCHAR **p, BOOL bMultiple,
 
 
 INT cmd_copy (LPTSTR first, LPTSTR rest)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	TCHAR **p;
 	TCHAR drive_d[_MAX_DRIVE];
 	TCHAR dir_d[_MAX_DIR];
@@ -650,9 +645,8 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
 	DWORD dwFlags = 0;
 
 	if (!_tcsncmp (rest, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_COPY_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_COPY_HELP2);
 		return 1;
 	}
 
@@ -723,9 +717,8 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
 		copied = SetupCopy (sources, p, bMultiple, drive_d, dir_d, file_d, ext_d, &append, &dwFlags);
 	}
 	else if (bDestFound && bWildcards)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR4, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf(szMsg);
+	{		
+		ConErrResPuts(STRING_COPY_ERROR4);
 
 		DeleteFileList (sources);
 		freep (p);
diff --git a/reactos/subsys/system/cmd/date.c b/reactos/subsys/system/cmd/date.c
index 3bffcbdedd7..93a614e05aa 100644
--- a/reactos/subsys/system/cmd/date.c
+++ b/reactos/subsys/system/cmd/date.c
@@ -53,17 +53,17 @@ PrintDateString (VOID)
 	{
 		case 0: /* mmddyy */
 		default:
-			LoadString(GetModuleHandle(NULL), STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE);
 			ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
 			break;
 
 		case 1: /* ddmmyy */
-			LoadString(GetModuleHandle(NULL), STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE);
 			ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
 			break;
 
 		case 2: /* yymmdd */
-			LoadString(GetModuleHandle(NULL), STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE);
 			ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
 			break;
 	}
@@ -183,8 +183,7 @@ ParseDate (LPTSTR s)
 
 
 INT cmd_date (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR *arg;
 	INT    argc;
 	INT    i;
@@ -192,9 +191,8 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
 	INT    nDateString = -1;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DATE_HELP4, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{	
+		ConOutResPuts(STRING_DATE_HELP4);
 		return 0;
 	}
 
@@ -237,7 +235,8 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
 				freep (arg);
 				return 0;
 			}
-			ConErrPuts (_T("Invalid date."));
+			ConErrResPuts(STRING_ERROR_WRONG_DATE);
+			
 		}
 	}
 	else
@@ -247,9 +246,8 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
 			freep (arg);
 			return 0;
 		}
-
-		LoadString(GetModuleHandle(NULL), STRING_DATE_ERROR, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+		
+		ConErrResPuts(STRING_DATE_ERROR);
 	}
 
 	freep (arg);
diff --git a/reactos/subsys/system/cmd/del.c b/reactos/subsys/system/cmd/del.c
index 09cf6fc8ca0..14baa4b7aef 100644
--- a/reactos/subsys/system/cmd/del.c
+++ b/reactos/subsys/system/cmd/del.c
@@ -111,9 +111,8 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 	LONG ch;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DEL_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPrintf(szMsg);
+	{		
+		ConOutResPuts(STRING_DEL_HELP1);
 		return 0;
 	}
 
@@ -187,7 +186,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 			{
 				if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT)))
 				{
-					LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
+					LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
 
 					res = FilePromptYN (szMsg);
 					if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@@ -243,10 +242,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 						/* ask for deleting */
 						if (dwFlags & DEL_PROMPT) 
 						{
-							LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
+							LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
 							ConErrPrintf(szMsg, szFullPath);
 							
-							LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
+							LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
 							res = FilePromptYN ((LPTSTR)szMsg);
 
 							if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@@ -257,7 +256,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 
 						if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
 						{
-							LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
+							LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
 							ConErrPrintf(szMsg, szFullPath);
 						}
 
@@ -313,10 +312,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 					// Don't ask if the file doesn't exist, the following code will make the error-msg
 					if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE))
 					{
-						LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
+						LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
 						ConErrPrintf(szMsg, szFullPath);
 
-						LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
+						LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
 						res = FilePromptYN ((LPTSTR)szMsg);
 
 						if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@@ -330,7 +329,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 #endif
 					if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
 					{
-						LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
+						LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
 						ConErrPrintf(szMsg, szFullPath);
 					}
 
@@ -384,11 +383,11 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
 	{
 		if (dwFiles < 2)
 		{
-			LoadString(GetModuleHandle(NULL), STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
 		}
 		else
 		{
-			LoadString(GetModuleHandle(NULL), STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
 		}
 
 		ConOutPrintf(szMsg, dwFiles);
diff --git a/reactos/subsys/system/cmd/delay.c b/reactos/subsys/system/cmd/delay.c
index 00c2fe873b8..580bdc5263e 100644
--- a/reactos/subsys/system/cmd/delay.c
+++ b/reactos/subsys/system/cmd/delay.c
@@ -16,15 +16,13 @@
 
 
 INT CommandDelay (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	DWORD val;
 	DWORD mul=1000;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DELAY_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_DELAY_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c
index b1850ea4b9f..925938d7982 100644
--- a/reactos/subsys/system/cmd/dir.c
+++ b/reactos/subsys/system/cmd/dir.c
@@ -216,9 +216,7 @@ static ULARGE_INTEGER recurse_bytes;
  */
 static VOID DirHelp(VOID)
 {
-  TCHAR szMsg[RC_STRING_MAX_SIZE];
-  LoadString(GetModuleHandle(NULL), STRING_DIR_HELP1, szMsg, RC_STRING_MAX_SIZE);
-  ConOutPuts(szMsg);
+  ConOutResPuts(STRING_DIR_HELP1);
 }
 
 
@@ -839,17 +837,17 @@ PrintDirectoryHeader(LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
   /* print drive info */
   if (szVolName[0] != _T('\0'))
     {
-      LoadString(GetModuleHandle(NULL), STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE);
+      LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE);
       ConOutPrintf((LPTSTR)szMsg, szRootName[0], szVolName);
     }
   else
     {
-      LoadString(GetModuleHandle(NULL), STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE);
+      LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE);
       ConOutPrintf(szMsg, szRootName[0]);
     }
 
   /* print the volume serial number if the return was successful */
-  LoadString(GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
+  LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
   ConOutPrintf((LPTSTR)szMsg,
                HIWORD(dwSerialNr),
                LOWORD(dwSerialNr));
@@ -1086,7 +1084,7 @@ PrintSummary(LPTSTR szPath,
 	{
 		ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
 
-		LoadString(GetModuleHandle(NULL), STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg,ulFiles, szBuffer);
 	}
 
@@ -1094,7 +1092,7 @@ PrintSummary(LPTSTR szPath,
 	szRoot[0] = szPath[0];
 	GetUserDiskFreeSpace(szRoot, &uliFree);
 	ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
-	LoadString(GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf((LPTSTR)szMsg,ulDirs, szBuffer);
 
 	return 0;
@@ -1430,7 +1428,7 @@ DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[],	/* [IN] Files' Info */
 	   and if we are in recursive mode... we must have results */
 	if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0)))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, szTemp);
 	}
 
@@ -1782,7 +1780,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE];
 	if (!(lpFlags->bBareFormat) && (dwCount > 0))
 	{
 		ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator);
-		LoadString(GetModuleHandle(NULL), STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg,dwCountFiles, szBytes);
 	}
 
diff --git a/reactos/subsys/system/cmd/dirstack.c b/reactos/subsys/system/cmd/dirstack.c
index b34d5027999..c45f70e1c9b 100644
--- a/reactos/subsys/system/cmd/dirstack.c
+++ b/reactos/subsys/system/cmd/dirstack.c
@@ -136,16 +136,14 @@ INT GetDirectoryStackDepth (VOID)
  * pushd command
  */
 INT CommandPushd (LPTSTR first, LPTSTR rest)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	TCHAR curPath[MAX_PATH];
 	TCHAR newPath[MAX_PATH];
 	BOOL  bChangePath = FALSE;
 
 	if (!_tcsncmp (rest, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_DIRSTACK_HELP1);
 		return 0;
 	}
 
@@ -171,13 +169,11 @@ INT CommandPushd (LPTSTR first, LPTSTR rest)
  */
 INT CommandPopd (LPTSTR first, LPTSTR rest)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	TCHAR szPath[MAX_PATH];
 
 	if (!_tcsncmp(rest, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_DIRSTACK_HELP2);
 		return 0;
 	}
 
@@ -197,14 +193,12 @@ INT CommandPopd (LPTSTR first, LPTSTR rest)
  * dirs command
  */
 INT CommandDirs (LPTSTR first, LPTSTR rest)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPDIRENTRY lpDir;
 
 	if (!_tcsncmp(rest, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_DIRSTACK_HELP3);
 		return 0;
 	}
 
@@ -212,9 +206,8 @@ INT CommandDirs (LPTSTR first, LPTSTR rest)
 	lpDir = lpStackBottom;
 
 	if (lpDir == NULL)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_DIRSTACK_HELP4);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/echo.c b/reactos/subsys/system/cmd/echo.c
index c1ecc5fbddb..3c296c2249a 100644
--- a/reactos/subsys/system/cmd/echo.c
+++ b/reactos/subsys/system/cmd/echo.c
@@ -39,9 +39,8 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_ECHO_HELP4);
 		return 0;
 	}
 
@@ -62,7 +61,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
 			ConOutPuts (param);
 		else
 		{
-			LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE);
 			ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF);
 		}
 	}
@@ -73,16 +72,14 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
 
 INT CommandEchos (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
 #ifdef _DEBUG
 	DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param);
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_ECHO_HELP1);
 		return 0;
 	}
 
@@ -95,16 +92,14 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
 
 INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
 #ifdef _DEBUG
 	DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param);
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_ECHO_HELP2);
 		return 0;
 	}
 
@@ -126,16 +121,14 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
 
 INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
 #ifdef _DEBUG
 	DebugPrintf (_T("CommandEchoserr '%s' : '%s'\n"), cmd, param);
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP3, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts((LPTSTR)szMsg);
+	{		
+		ConOutResPuts(STRING_ECHO_HELP3);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/error.c b/reactos/subsys/system/cmd/error.c
index 354e707cce3..30b0c6883f3 100644
--- a/reactos/subsys/system/cmd/error.c
+++ b/reactos/subsys/system/cmd/error.c
@@ -23,22 +23,6 @@
 #include "precomp.h"
 #include "resource.h"
 
-/*
-#define PARAMETERF_ERROR	_T("Parameter format not correct - %c\n")
-#define INVALID_SWITCH		_T("Invalid switch - /%c\n")
-#define TOO_MANY_PARAMETERS	_T("Too many parameters - %s\n")
-#define PATH_NOT_FOUND		_T("Path not found\n")
-#define FILE_NOT_FOUND		_T("File not found\n")
-#define REQ_PARAM_MISSING	_T("Required parameter missing\n")
-#define INVALID_DRIVE		_T("Invalid drive specification\n")
-#define INVALID_PARAM_FORMAT	_T("Invalid parameter format - %s\n")
-#define BADCOMMAND		_T("Bad command or filename\n")
-#define OUT_OF_MEMORY		_T("Out of memory error.\n")
-#define CANNOTPIPE		_T("Error!  Cannot pipe!  Cannot open temporary file!\n")
-
-#define D_PAUSEMSG		_T("Press any key to continue . . .")
-*/
-
 
 VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
 {
@@ -71,7 +55,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
 	}
 	else
 	{
-		LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg, dwErrorCode);
 		return;
 	}
@@ -81,19 +65,19 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
 	switch (dwErrorCode)
 	{
 		case ERROR_FILE_NOT_FOUND:
-			LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
 			break;
 
 		case ERROR_PATH_NOT_FOUND:
-			LoadString(GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
 			break;
 
 		case ERROR_NOT_READY:
-			LoadString(GetModuleHandle(NULL), STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE);
 			break;
 
 		default:
-			LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 			ConErrPrintf(szMsg);
 			return;
 	}
@@ -109,7 +93,7 @@ VOID error_parameter_format(TCHAR ch)
 {
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(szMsg, ch);
 }
 
@@ -118,7 +102,7 @@ VOID error_invalid_switch (TCHAR ch)
 {
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(szMsg, ch);
 }
 
@@ -127,26 +111,20 @@ VOID error_too_many_parameters (LPTSTR s)
 {
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(szMsg, s);
 }
 
 
 VOID error_path_not_found (VOID)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+{	
+	ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND);
 }
 
 
 VOID error_file_not_found (VOID)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+{	
+	ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND);
 }
 
 
@@ -154,62 +132,44 @@ VOID error_sfile_not_found (LPTSTR f)
 {
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(_T("%s - %s\n"), szMsg, f);
 }
 
 
 VOID error_req_param_missing (VOID)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+{	
+	ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
 }
 
 
 VOID error_invalid_drive (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+	ConErrResPuts(STRING_ERROR_INVALID_DRIVE);
 }
 
 
 VOID error_bad_command (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+	ConErrResPuts(STRING_ERROR_BADCOMMAND);	
 }
 
 
 VOID error_no_pipe (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+	ConErrResPuts(STRING_ERROR_CANNOTPIPE);	
 }
 
 
 VOID error_out_of_memory (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg);
+	ConErrResPuts(STRING_ERROR_OUT_OF_MEMORY);	
 }
 
 
 VOID error_invalid_parameter_format (LPTSTR s)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE);
-	ConErrPrintf(szMsg, s);
+	ConErrResPuts(STRING_ERROR_INVALID_PARAM_FORMAT);	
 }
 
 
@@ -217,7 +177,7 @@ VOID error_syntax (LPTSTR s)
 {
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 
 	if (s)
 		ConErrPrintf(_T("%s - %s\n"), szMsg, s);
@@ -228,10 +188,7 @@ VOID error_syntax (LPTSTR s)
 
 VOID msg_pause (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
-	LoadString(GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+	ConOutResPuts(STRING_ERROR_D_PAUSEMSG);	
 }
 
 /* EOF */
diff --git a/reactos/subsys/system/cmd/for.c b/reactos/subsys/system/cmd/for.c
index 06f128fd11b..45531724a1d 100644
--- a/reactos/subsys/system/cmd/for.c
+++ b/reactos/subsys/system/cmd/for.c
@@ -60,9 +60,8 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_FOR_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_FOR_HELP1);
 		return 0;
 	}
 
@@ -82,7 +81,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
 	/* Check next element is 'IN' */
 	if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2)))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FOR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		error_syntax(szMsg);
 		return 1;
 	}
@@ -94,7 +93,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
 	/* Folowed by a '(', find also matching ')' */
 	if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')')))))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FOR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 		error_syntax(szMsg);
 		return 1;
 	}
@@ -108,7 +107,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
 	/* Check DO follows */
 	if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2)))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
 		error_syntax(szMsg);
 		return 1;
 	}
@@ -120,7 +119,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
 	/* Check that command tail is not empty */
 	if (*pp == _T('\0'))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
 		error_syntax(szMsg);
 		return 1;
 	}
diff --git a/reactos/subsys/system/cmd/free.c b/reactos/subsys/system/cmd/free.c
index 44cf613aadc..48af102c207 100644
--- a/reactos/subsys/system/cmd/free.c
+++ b/reactos/subsys/system/cmd/free.c
@@ -75,7 +75,7 @@ PrintDiskInfo (LPTSTR szDisk)
 
 	if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':'))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(szMsg);
 		return;
 	}
@@ -86,7 +86,7 @@ PrintDiskInfo (LPTSTR szDisk)
 	if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial,
 	                           NULL, NULL, NULL, 0))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive);
 		return;
 	}
@@ -94,7 +94,7 @@ PrintDiskInfo (LPTSTR szDisk)
 	if (szVolume[0] == _T('\0'))
 	{
 		
-		LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 		_tcscpy (szVolume, szMsg);
 	}
 
@@ -106,7 +106,7 @@ PrintDiskInfo (LPTSTR szDisk)
 	if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
 	                       &dwBytPerSec, &dwFreeCl, &dwTotCl))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ConErrPrintf (_T("%s %s:\n"), szMsg, szDrive);
 		return;
 	}
@@ -121,23 +121,21 @@ PrintDiskInfo (LPTSTR szDisk)
 	ConvertULargeInteger (uliSize, szFree, 40);
 
 	
-	LoadString(GetModuleHandle(NULL), STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(szMsg, szDrive, szVolume, szSerial, szTotal, szUsed, szFree);
 }
 
 
 INT CommandFree (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR szParam;
 	TCHAR  szDefPath[MAX_PATH];
 	INT argc, i;
 	LPTSTR *arg;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_FREE_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_FREE_HELP2);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/goto.c b/reactos/subsys/system/cmd/goto.c
index c7ce8cbcf7a..9aa6eff517f 100644
--- a/reactos/subsys/system/cmd/goto.c
+++ b/reactos/subsys/system/cmd/goto.c
@@ -49,8 +49,8 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
 
 	if (!_tcsncmp (param, _T("/?"), 2))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_GOTO_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+		LoadString(CMD_ModuleHandle, STRING_GOTO_HELP1, szMsg, RC_STRING_MAX_SIZE);
+		ConOutResPuts(STRING_GOTO_HELP1);
 		return 0;
 	}
 
@@ -62,7 +62,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
 
 	if (*param == _T('\0'))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_GOTO_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		ExitBatch(szMsg);
 		return 1;
 	}
@@ -95,7 +95,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
 			return 0;
 	}
 
-	LoadString(GetModuleHandle(NULL), STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 	ConErrPrintf(szMsg, param);
 	ExitBatch(NULL);
 
diff --git a/reactos/subsys/system/cmd/if.c b/reactos/subsys/system/cmd/if.c
index b0a235b15ee..f1b2940477a 100644
--- a/reactos/subsys/system/cmd/if.c
+++ b/reactos/subsys/system/cmd/if.c
@@ -39,7 +39,6 @@
 
 INT cmd_if (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	INT x_flag = 0; /* when set cause 'then' clause to be executed */
 	LPTSTR pp;
 
@@ -48,9 +47,8 @@ INT cmd_if (LPTSTR cmd, LPTSTR param)
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_IF_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_IF_HELP1);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/internal.c b/reactos/subsys/system/cmd/internal.c
index 91496e665a8..a93969f760e 100644
--- a/reactos/subsys/system/cmd/internal.c
+++ b/reactos/subsys/system/cmd/internal.c
@@ -153,8 +153,7 @@ VOID FreeLastPath (VOID)
  *
  */
 INT cmd_chdir (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR dir;		/* pointer to the directory to change to */
 	LPTSTR lpOldPath;
 	LPTSTR endofstring; /* pointer to the null character in the directory to change to */
@@ -164,9 +163,8 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
 	  but on the other hand paths are generally not very long*/
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_CD_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_CD_HELP);
 		return 0;
 	}
 
@@ -272,16 +270,14 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
  */
 INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	LPTSTR dir;		/* pointer to the directory to change to */
 	LPTSTR place;	/* used to search for the \ when no space is used */
 	LPTSTR *p = NULL;
 	INT argc;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_MKDIR_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_MKDIR_HELP);
 		return 0;
 	}
 
@@ -315,9 +311,8 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
 	}
 
 	if (!dir)
-	{
-                LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf (szMsg);
+	{               
+		ConErrResPuts (STRING_ERROR_REQ_PARAM_MISSING);
 		return 1;
 	}
 
@@ -346,8 +341,7 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
  *
  */
 INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR dir;		/* pointer to the directory to change to */
 	LPTSTR place;	/* used to search for the \ when no space is used */
 
@@ -355,9 +349,8 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
 	INT argc;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_RMDIR_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_RMDIR_HELP);
 		return 0;
 	}
 
@@ -390,9 +383,8 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
 	}
 
 	if (!dir)
-	{
-                LoadString(GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPrintf(szMsg);
+	{        
+		ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
 		return 1;
 	}
 
@@ -421,12 +413,9 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
  */
 INT CommandExit (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_EXIT_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_EXIT_HELP);
 		return 0;
 	}
 
@@ -442,12 +431,9 @@ INT CommandExit (LPTSTR cmd, LPTSTR param)
  */
 INT CommandRem (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_REM_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_REM_HELP);
 	}
 
 	return 0;
diff --git a/reactos/subsys/system/cmd/label.c b/reactos/subsys/system/cmd/label.c
index d71b379888d..a77c5faf0ff 100644
--- a/reactos/subsys/system/cmd/label.c
+++ b/reactos/subsys/system/cmd/label.c
@@ -38,9 +38,8 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
 
 	/* print help */
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPrintf(szMsg);
+	{		
+		ConOutResPuts(STRING_LABEL_HELP1);
 		return 0;
 	}
 
@@ -93,23 +92,23 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
 	/* print drive info */	
 	if (szOldLabel[0] != _T('\0'))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_LABEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, _totupper(szRootPath[0]), szOldLabel);
 	}
 	else
 	{
-		LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_LABEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, _totupper(szRootPath[0]));
 	}
 
 	/* print the volume serial number */
-	LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_LABEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
 
 	if (szLabel[0] == _T('\0'))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP5, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPrintf(szMsg);
+		LoadString(CMD_ModuleHandle, STRING_LABEL_HELP5, szMsg, RC_STRING_MAX_SIZE);
+		ConOutResPuts(STRING_LABEL_HELP5);
 
 		ConInString(szLabel, 80);
 	}
diff --git a/reactos/subsys/system/cmd/locale.c b/reactos/subsys/system/cmd/locale.c
index 3182b20f8b4..0bca71f3236 100644
--- a/reactos/subsys/system/cmd/locale.c
+++ b/reactos/subsys/system/cmd/locale.c
@@ -74,6 +74,6 @@ VOID PrintTime (VOID)
 	GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,
 	              szTime, sizeof(szTime));
 
-	LoadString(GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(_T("%s: %s\n"), szMsg, szTime);
 }
diff --git a/reactos/subsys/system/cmd/memory.c b/reactos/subsys/system/cmd/memory.c
index de821a05222..7127b0ff5bd 100644
--- a/reactos/subsys/system/cmd/memory.c
+++ b/reactos/subsys/system/cmd/memory.c
@@ -67,9 +67,8 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param)
 	TCHAR szAvailVirtual[20];
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_MEMMORY_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_MEMMORY_HELP1);
 		return 0;
 	}
 
@@ -85,7 +84,7 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param)
 	ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE);
 	ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE);
 
-	LoadString(GetModuleHandle(NULL), STRING_MEMMORY_HELP2, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_MEMMORY_HELP2, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(szMsg,
 	             szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile,
 	             szAvailPageFile, szTotalVirtual, szAvailVirtual);
diff --git a/reactos/subsys/system/cmd/misc.c b/reactos/subsys/system/cmd/misc.c
index 161dc4a6ed6..f576bb6ed37 100644
--- a/reactos/subsys/system/cmd/misc.c
+++ b/reactos/subsys/system/cmd/misc.c
@@ -436,12 +436,10 @@ HWND GetConsoleWindow (VOID)
 
 
 INT PagePrompt (VOID)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	INPUT_RECORD ir;
-
-	LoadString(GetModuleHandle(NULL), STRING_MISC_HELP1, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPrintf(szMsg);
+	
+	ConOutResPuts(STRING_MISC_HELP1);
 
 	RemoveBreakHandler ();
 	ConInDisable ();
@@ -491,7 +489,7 @@ INT FilePromptYN (LPTSTR szFormat, ...)
 	for (p = szIn; _istspace (*p); p++)
 		;
 
-	LoadString(GetModuleHandle(NULL), STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE);
 
 	if (_tcsncmp(p, &szMsg[0], 1) == 0)
 		return PROMPT_YES;
@@ -561,7 +559,7 @@ INT FilePromptYNA (LPTSTR szFormat, ...)
 	for (p = szIn; _istspace (*p); p++)
 		;
 
-	LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE);
+	LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE);
 
 	if (_tcsncmp(p, &szMsg[0], 1) == 0)
 		return PROMPT_YES;
diff --git a/reactos/subsys/system/cmd/move.c b/reactos/subsys/system/cmd/move.c
index 9ad3684a705..ec1e7821bcd 100644
--- a/reactos/subsys/system/cmd/move.c
+++ b/reactos/subsys/system/cmd/move.c
@@ -43,7 +43,7 @@ static INT Overwrite (LPTSTR fn)
 	TCHAR inp[10];
 	LPTSTR p;
 
-	LoadString(GetModuleHandle(NULL), STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(szMsg, fn);
 	ConInString(inp, 10);
 
@@ -91,9 +91,8 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
 		               "  /Y\n"
 		               "  /-Y\n"
 		               "..."));
-#else
-		LoadString(GetModuleHandle(NULL), STRING_MOVE_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+#else		
+		ConOutResPuts(STRING_MOVE_HELP2);
 #endif
 		return 0;
 	}
@@ -192,9 +191,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
 						if (!bNothing)
 						{
 							if (MoveFile (szSrcPath, szFullDestPath))
-								LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+								LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 							else
-								LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+								LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 							ConOutPrintf(szMsg);
 						}
 					}
@@ -215,9 +214,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
 							if (!bNothing)
 							{
 								if (MoveFile (szSrcPath, szDestPath))
-									LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+									LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 								else
-									LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+									LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 								ConOutPrintf(szMsg);
 							}
 						}
@@ -235,9 +234,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
 					if (!bNothing)
 					{
 						if (MoveFile (szSrcPath, szFullDestPath))
-							LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+							LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 						else
-							LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+							LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
 						ConOutPrintf(szMsg);
 					}
 				}
diff --git a/reactos/subsys/system/cmd/msgbox.c b/reactos/subsys/system/cmd/msgbox.c
index fd9cc65f450..fbb17c40dc8 100644
--- a/reactos/subsys/system/cmd/msgbox.c
+++ b/reactos/subsys/system/cmd/msgbox.c
@@ -25,8 +25,7 @@
 
 INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
+	
 	//used to parse command line
 	LPTSTR tmp;
 
@@ -44,9 +43,8 @@ INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
 	title = buff;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_MSGBOX_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_MSGBOX_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/path.c b/reactos/subsys/system/cmd/path.c
index d737bf880e3..cef6e4a3851 100644
--- a/reactos/subsys/system/cmd/path.c
+++ b/reactos/subsys/system/cmd/path.c
@@ -35,13 +35,11 @@
 
 
 INT cmd_path (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_PATH_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_PATH_HELP1);
 		return 0;
 	}
 
@@ -54,9 +52,8 @@ INT cmd_path (LPTSTR cmd, LPTSTR param)
 		pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
 		dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE);
 		if (dwBuffer == 0)
-		{
-			LoadString(GetModuleHandle(NULL), STRING_PATH_ERROR, szMsg, RC_STRING_MAX_SIZE);
-			ConErrPrintf(szMsg);
+		{			
+			ConErrResPuts(STRING_PATH_ERROR);
 			return 0;
 		}
 		else if (dwBuffer > ENV_BUFFER_SIZE)
diff --git a/reactos/subsys/system/cmd/pause.c b/reactos/subsys/system/cmd/pause.c
index faa3d6789b1..3527ebaf78a 100644
--- a/reactos/subsys/system/cmd/pause.c
+++ b/reactos/subsys/system/cmd/pause.c
@@ -36,17 +36,15 @@
  */
 
 INT cmd_pause (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 
 #ifdef _DEBUG
 	DebugPrintf (_T("cmd_pause: \'%s\' : \'%s\')\n"), cmd, param);
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_PAUSE_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_PAUSE_HELP1);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/prompt.c b/reactos/subsys/system/cmd/prompt.c
index 2d6e2b5789b..f7afc1aa24c 100644
--- a/reactos/subsys/system/cmd/prompt.c
+++ b/reactos/subsys/system/cmd/prompt.c
@@ -181,19 +181,15 @@ VOID PrintPrompt(VOID)
 
 INT cmd_prompt (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-
+	
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_PROMPT_HELP1);
 
-#ifdef FEATURE_DIRECTORY_STACK
-		LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
-#endif
-		LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP3, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+#ifdef FEATURE_DIRECTORY_STACK		
+		ConOutResPuts(STRING_PROMPT_HELP2);
+#endif		
+		ConOutResPuts(STRING_PROMPT_HELP3);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/ren.c b/reactos/subsys/system/cmd/ren.c
index 848f5a90e47..ed84137b347 100644
--- a/reactos/subsys/system/cmd/ren.c
+++ b/reactos/subsys/system/cmd/ren.c
@@ -61,9 +61,8 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
   WIN32_FIND_DATA f;
 
   if (!_tcsncmp(param, _T("/?"), 2))
-  {
-    LoadString(GetModuleHandle(NULL), STRING_REN_HELP1, szMsg, RC_STRING_MAX_SIZE);
-    ConOutPuts(szMsg);
+  {    
+    ConOutResPuts(STRING_REN_HELP1);
     return 0;
   }
 
@@ -238,7 +237,7 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
 		{
 		  if (!(dwFlags & REN_ERROR))
 		  {
-		    LoadString(GetModuleHandle(NULL), STRING_REN_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+		    LoadString(CMD_ModuleHandle, STRING_REN_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 		    ConErrPrintf(szMsg, GetLastError());
 		  }
 		}
@@ -251,9 +250,9 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
   if (!(dwFlags & REN_QUIET))
   {
     if (dwFiles == 1)
-      LoadString( GetModuleHandle(NULL), STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE);
+      LoadString( CMD_ModuleHandle, STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE);
     else
-      LoadString( GetModuleHandle(NULL), STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE);
+      LoadString( CMD_ModuleHandle, STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE);
     ConOutPrintf((LPTSTR)szMsg,dwFiles);
   }
 
diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h
index a3e2328e050..b9f04c67ba8 100644
--- a/reactos/subsys/system/cmd/resource.h
+++ b/reactos/subsys/system/cmd/resource.h
@@ -14,6 +14,7 @@
 #define STRING_ERROR_CANNOTPIPE            110
 #define STRING_ERROR_D_PAUSEMSG            111
 #define STRING_ERROR_DRIVER_NOT_READY      112
+#define STRING_ERROR_WRONG_DATE            113 
 
 #define STRING_CHOICE_OPTION               200
 #define STRING_COPY_OPTION                 201
@@ -63,6 +64,7 @@
 #define STRING_TIME_ERROR1                 348
 #define STRING_TYPE_ERROR1                 349
 #define STRING_WINDOW_ERROR1               350
+#define STRING_SET_ERROR                   351 
 
 
 
diff --git a/reactos/subsys/system/cmd/screen.c b/reactos/subsys/system/cmd/screen.c
index 5693fae1a76..b80b54604f7 100644
--- a/reactos/subsys/system/cmd/screen.c
+++ b/reactos/subsys/system/cmd/screen.c
@@ -18,15 +18,13 @@
 
 
 INT CommandScreen (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	SHORT x,y;
 	BOOL bSkipText = FALSE;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_SCREEN_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_SCREEN_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/set.c b/reactos/subsys/system/cmd/set.c
index 1ff7c166587..fb9ffac42b7 100644
--- a/reactos/subsys/system/cmd/set.c
+++ b/reactos/subsys/system/cmd/set.c
@@ -45,14 +45,13 @@
 
 
 INT cmd_set (LPTSTR cmd, LPTSTR param)
-{
+{	
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	LPTSTR p;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_SET_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_SET_HELP);
 		return 0;
 	}
 
@@ -105,7 +104,8 @@ INT cmd_set (LPTSTR cmd, LPTSTR param)
 		dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE);
 		if (dwBuffer == 0)
 		{
-			ConErrPrintf (_T("CMD: Not in environment \"%s\"\n"), param);
+			LoadString(CMD_ModuleHandle, STRING_SET_ERROR, szMsg, RC_STRING_MAX_SIZE);
+			ConErrPrintf (szMsg, param);
 			return 0;
 		}
 		else if (dwBuffer > ENV_BUFFER_SIZE)
diff --git a/reactos/subsys/system/cmd/shift.c b/reactos/subsys/system/cmd/shift.c
index e18a1b5f41c..84de13487a0 100644
--- a/reactos/subsys/system/cmd/shift.c
+++ b/reactos/subsys/system/cmd/shift.c
@@ -39,16 +39,14 @@
 
 INT cmd_shift (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
 #ifdef _DEBUG
 	DebugPrintf (_T("cmd_shift: (\'%s\', \'%s\')\n"), cmd, param);
 #endif
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_SHIFT_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_SHIFT_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/start.c b/reactos/subsys/system/cmd/start.c
index 433f6adce59..5c21a4733bc 100644
--- a/reactos/subsys/system/cmd/start.c
+++ b/reactos/subsys/system/cmd/start.c
@@ -19,15 +19,13 @@
 
 INT cmd_start (LPTSTR first, LPTSTR rest)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	TCHAR szFullName[MAX_PATH];
 	BOOL bWait = FALSE;
 	TCHAR *param;
 
 	if (_tcsncmp (rest, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_START_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_START_HELP1);
 		return 0;
 	}
 
@@ -74,9 +72,8 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
 #ifdef _DEBUG
 		DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest);
 #endif
-
-		LoadString(GetModuleHandle(NULL), STRING_START_ERROR1, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+		
+		ConErrResPuts(STRING_START_ERROR1);
 	}
 	else
 	{
diff --git a/reactos/subsys/system/cmd/time.c b/reactos/subsys/system/cmd/time.c
index 3a9e99c2003..f5f8abd7b70 100644
--- a/reactos/subsys/system/cmd/time.c
+++ b/reactos/subsys/system/cmd/time.c
@@ -131,8 +131,7 @@ static BOOL ParseTime (LPTSTR s)
 
 
 INT cmd_time (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR *arg;
 	INT    argc;
 	INT    i;
@@ -140,9 +139,8 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
 	INT    nTimeString = -1;
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_TIME_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_TIME_HELP1);
 		return 0;
 	}
 
@@ -173,9 +171,8 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
 		if (nTimeString == -1)
 		{
 			TCHAR  s[40];
-
-			LoadString(GetModuleHandle(NULL), STRING_TIME_HELP2, szMsg, RC_STRING_MAX_SIZE);
-			ConOutPrintf(szMsg);
+			
+			ConOutResPuts(STRING_TIME_HELP2);
 
 			ConInString (s, 40);
 
@@ -203,9 +200,8 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
 			/* force input the next time around. */
 			nTimeString = -1;
 		}
-
-		LoadString(GetModuleHandle(NULL), STRING_TIME_ERROR1, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+		
+		ConErrResPuts(STRING_TIME_ERROR1);
 	}
 
 	freep (arg);
diff --git a/reactos/subsys/system/cmd/timer.c b/reactos/subsys/system/cmd/timer.c
index 84b1217d03b..bd70285c2d6 100644
--- a/reactos/subsys/system/cmd/timer.c
+++ b/reactos/subsys/system/cmd/timer.c
@@ -47,7 +47,7 @@ PrintElapsedTime (DWORD time,INT format)
 	switch (format)
 	{
 	case 0:
-		LoadString(GetModuleHandle(NULL), STRING_TIMER_HELP1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_TIMER_HELP1, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, time);
 		break;
 
@@ -58,7 +58,7 @@ PrintElapsedTime (DWORD time,INT format)
 		time /=60;
 		m = time % 60;
 		h = time / 60;
-		LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString( CMD_ModuleHandle, STRING_TIMER_HELP2, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg,
 		             h, cTimeSeparator,
 		             m, cTimeSeparator,
@@ -104,7 +104,7 @@ INT CommandTimer (LPTSTR cmd, LPTSTR param)
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
 	{
-		LoadString(GetModuleHandle(NULL), STRING_TIMER_HELP3, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_TIMER_HELP3, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, cTimeSeparator, cTimeSeparator, cDecimalSeparator);
 		return 0;
 	}
diff --git a/reactos/subsys/system/cmd/title.c b/reactos/subsys/system/cmd/title.c
index 93eb9e92524..250930d301c 100644
--- a/reactos/subsys/system/cmd/title.c
+++ b/reactos/subsys/system/cmd/title.c
@@ -16,8 +16,7 @@
 
 
 INT cmd_title (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 
 	/* Do nothing if no args */
 	if (*param == _T('\0'))
@@ -25,9 +24,8 @@ INT cmd_title (LPTSTR cmd, LPTSTR param)
 
 	/* Asking help? */
 	if (!_tcsncmp(param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_TITLE_HELP, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_TITLE_HELP);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/type.c b/reactos/subsys/system/cmd/type.c
index a187f798887..818886d9a5a 100644
--- a/reactos/subsys/system/cmd/type.c
+++ b/reactos/subsys/system/cmd/type.c
@@ -48,8 +48,7 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
 
 	if (!_tcsncmp (param, _T("/?"), 2))
 	{
-		LoadString(GetModuleHandle(NULL), STRING_TYPE_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+		ConOutResPuts(STRING_TYPE_HELP1);
 		return 0;
 	}
 
@@ -65,7 +64,7 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
 	{
 		if (_T('/') == argv[i][0])
 		{
-			LoadString(GetModuleHandle(NULL), STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+			LoadString(CMD_ModuleHandle, STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
 			ConErrPrintf(szMsg, argv[i] + 1);
 			continue;
 		}
diff --git a/reactos/subsys/system/cmd/ver.c b/reactos/subsys/system/cmd/ver.c
index 1f250dde45e..3d8731769a0 100644
--- a/reactos/subsys/system/cmd/ver.c
+++ b/reactos/subsys/system/cmd/ver.c
@@ -62,14 +62,12 @@ VOID ShortVersion (VOID)
  *
  */
 INT cmd_ver (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	INT i;
 
 	if (_tcsstr (param, _T("/?")) != NULL)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_VERSION_HELP1);
 		return 0;
 	}
 
@@ -80,9 +78,8 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
 	/* Basic copyright notice */
 	if (param[0] == _T('\0'))
 	{
-		ConOutPuts(_T("\n"SHELLINFO));
-		LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+		ConOutPuts(_T("\n"SHELLINFO));		
+		ConOutResPuts(STRING_VERSION_HELP2);
 	}
 	else
 	{
@@ -105,27 +102,21 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
 
 			if (_totupper (param[i]) == _T('W'))
 			{
-				/* Warranty notice */
-				LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP3, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPuts(szMsg);
+				/* Warranty notice */				
+				ConOutResPuts(STRING_VERSION_HELP3);
 			}
 			else if (_totupper (param[i]) == _T('R'))
 			{
-				/* Redistribution notice */
-				LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP4, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPuts(szMsg);
+				/* Redistribution notice */				
+				ConOutResPuts(STRING_VERSION_HELP4);
 			}
 			else if (_totupper (param[i]) == _T('C'))
 			{
-				/* Developer listing */
-				LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP6, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPrintf(szMsg);
-				LoadString(GetModuleHandle(NULL), STRING_FREEDOS_DEV, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPrintf(szMsg);
-				LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP7, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPrintf(szMsg);
-				LoadString(GetModuleHandle(NULL), STRING_REACTOS_DEV, szMsg, RC_STRING_MAX_SIZE);
-				ConOutPrintf(szMsg);
+				/* Developer listing */				
+				ConOutResPuts(STRING_VERSION_HELP6);				
+				ConOutResPuts(STRING_FREEDOS_DEV);				
+				ConOutResPuts(STRING_VERSION_HELP7);
+                ConOutResPuts(STRING_REACTOS_DEV); 				
 			}
 			else
 			{
@@ -134,9 +125,8 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
 			}
 		}
 	}
-
-	LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP5, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPuts(szMsg);
+	
+	ConOutResPuts(STRING_VERSION_HELP5);
 	return 0;
 }
 
diff --git a/reactos/subsys/system/cmd/verify.c b/reactos/subsys/system/cmd/verify.c
index 0ac13efe257..63a055038d5 100644
--- a/reactos/subsys/system/cmd/verify.c
+++ b/reactos/subsys/system/cmd/verify.c
@@ -33,15 +33,14 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param)
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_VERIFY_HELP1);
 		return 0;
 	}
 
 	if (!*param)
 	{
-		LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf((LPTSTR)szMsg, bVerify ? D_ON : D_OFF);
 	}
 	else if (_tcsicmp (param, D_OFF) == 0)
@@ -49,9 +48,8 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param)
 	else if (_tcsicmp (param, D_ON) == 0)
 		bVerify = TRUE;
 	else
-	{
-		LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP3, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_VERIFY_HELP3);
 	}
 
 	return 0;
diff --git a/reactos/subsys/system/cmd/vol.c b/reactos/subsys/system/cmd/vol.c
index 45bf0f4cdd8..7956442ccb0 100644
--- a/reactos/subsys/system/cmd/vol.c
+++ b/reactos/subsys/system/cmd/vol.c
@@ -50,32 +50,30 @@ PrintVolumeHeader (LPTSTR pszRootPath)
 	/* print drive info */
 	if (szVolName[0] != '\0')
 	{
-		LoadString(GetModuleHandle(NULL), STRING_VOL_HELP1, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_VOL_HELP1, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, pszRootPath[0],szVolName);
 	}
 	else
 	{
-		LoadString(GetModuleHandle(NULL), STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE);
+		LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE);
 		ConOutPrintf(szMsg, pszRootPath[0]);
 	}
 
 	/* print the volume serial number */
-	LoadString(GetModuleHandle(NULL), STRING_VOL_HELP3, szMsg, RC_STRING_MAX_SIZE);
+	LoadString(CMD_ModuleHandle, STRING_VOL_HELP3, szMsg, RC_STRING_MAX_SIZE);
 	ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
 	return 0;
 }
 
 
 INT cmd_vol (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	TCHAR szRootPath[] = _T("A:\\");
 	TCHAR szPath[MAX_PATH];
 
 	if (!_tcsncmp (param, _T("/?"), 2))
-	{
-		LoadString(GetModuleHandle(NULL), STRING_VOL_HELP4, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_VOL_HELP4);
 		return 0;
 	}
 
diff --git a/reactos/subsys/system/cmd/window.c b/reactos/subsys/system/cmd/window.c
index 5c3254d0940..d9695143aef 100644
--- a/reactos/subsys/system/cmd/window.c
+++ b/reactos/subsys/system/cmd/window.c
@@ -175,13 +175,11 @@ static INT ServiceActivate (LPTSTR param, HWND hWnd)
 
 INT CommandWindow (LPTSTR cmd, LPTSTR param)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
 	HWND hwnd;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_WINDOW_HELP1, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_WINDOW_HELP1);
 		return 0;
 	}
 
@@ -192,15 +190,13 @@ INT CommandWindow (LPTSTR cmd, LPTSTR param)
 
 
 INT CommandActivate (LPTSTR cmd, LPTSTR param)
-{
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
+{	
 	LPTSTR str;
 	HWND hwnd;
 
 	if (_tcsncmp (param, _T("/?"), 2) == 0)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_WINDOW_HELP2, szMsg, RC_STRING_MAX_SIZE);
-		ConOutPuts(szMsg);
+	{		
+		ConOutResPuts(STRING_WINDOW_HELP2);
 		return 0;
 	}
 
@@ -219,9 +215,8 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
 
 	hwnd = FindWindow(NULL, param);
 	if (hwnd == NULL)
-	{
-		LoadString(GetModuleHandle(NULL), STRING_WINDOW_ERROR1, szMsg, RC_STRING_MAX_SIZE);
-		ConErrPuts(szMsg);
+	{		
+		ConErrResPuts(STRING_WINDOW_ERROR1);
 		return 1;
 	}