diff --git a/Zenith-latest-2020-07-22-02_26_21.iso b/Zenith-latest-2020-07-22-04_01_05.iso
similarity index 99%
rename from Zenith-latest-2020-07-22-02_26_21.iso
rename to Zenith-latest-2020-07-22-04_01_05.iso
index b54621bc..e66289fc 100644
Binary files a/Zenith-latest-2020-07-22-02_26_21.iso and b/Zenith-latest-2020-07-22-04_01_05.iso differ
diff --git a/src/Compiler/AsmInit.CC b/src/Compiler/AsmInit.CC
index c9d006f2..beaa12fc 100755
--- a/src/Compiler/AsmInit.CC
+++ b/src/Compiler/AsmInit.CC
@@ -1,45 +1,53 @@
-U0 AsmParseInsFlags(CCompCtrl *cc,CInst *tmpins)
+U0 AsmParseInsFlags(CCompCtrl *cc, CInst *tmpins)
 {
 	I64 i;
-	while (TRUE) {
-		switch (cc->token) {
+	while (TRUE)
+	{
+		switch (cc->token)
+		{
 			case TK_IDENT:
-				if ((i=ListMatch(cc->cur_str,"NO\0CB\0CW\0CD\0CP\0IB\0IW\0ID\0"))>=0) {
-					tmpins->opcode_modifier=i;
+				if ((i = ListMatch(cc->cur_str, "NO\0CB\0CW\0CD\0CP\0IB\0IW\0ID\0")) >= 0)
+				{
+					tmpins->opcode_modifier = i;
 					break;
-				} else
+				}
+				else
 					return;
 			case TK_I64:
-				if (cc->cur_i64==16)
-					tmpins->flags|=IEF_OP_SIZE16;
-				else if (cc->cur_i64==32)
-					tmpins->flags|=IEF_OP_SIZE32;
+				if (cc->cur_i64 == 16)
+					tmpins->flags |= IEF_OP_SIZE16;
+				else if (cc->cur_i64 == 32)
+					tmpins->flags |= IEF_OP_SIZE32;
 				else
 					return;
 				break;
 			case '+':
-				tmpins->flags|=IEF_PLUS_OPCODE;
+				tmpins->flags |= IEF_PLUS_OPCODE;
 			case '/':
-				if (Lex(cc)==TK_I64 && cc->cur_i64<8)
-					tmpins->slash_val=cc->cur_i64;
-				else if (cc->token==TK_IDENT) {
-					if (!StrCompare(cc->cur_str,"R"))
-						tmpins->slash_val=SV_R_REG;
-					else if (!StrCompare(cc->cur_str,"I"))
-						tmpins->slash_val=SV_I_REG;
+				if (Lex(cc) == TK_I64 && cc->cur_i64 < 8)
+					tmpins->slash_val = cc->cur_i64;
+				else if (cc->token == TK_IDENT)
+				{
+					if (!StrCompare(cc->cur_str, "R"))
+						tmpins->slash_val = SV_R_REG;
+					else if (!StrCompare(cc->cur_str, "I"))
+						tmpins->slash_val = SV_I_REG;
 					else
 						return;
-				} else
+				}
+				else
 					return;
 				break;
-			case '!': tmpins->flags|=IEF_DONT_SWITCH_MODES;	break;
-			case '&': tmpins->flags|=IEF_DEFAULT; 			break;
-			case '%': tmpins->flags|=IEF_NOT_IN_64_BIT; 	break;
-			case '=': tmpins->flags|=IEF_48_REX;			break;
-			case '`': tmpins->flags|=IEF_REX_ONLY_R8_R15;	break;
-			case '^': tmpins->flags|=IEF_REX_XOR_LIKE;		break;
-			case '*': tmpins->flags|=IEF_STI_LIKE;			break;
-			case '$$': tmpins->flags|=IEF_ENDING_ZERO;		break;
+
+			case '!': tmpins->flags |= IEF_DONT_SWITCH_MODES;	break;
+			case '&': tmpins->flags |= IEF_DEFAULT; 			break;
+			case '%': tmpins->flags |= IEF_NOT_IN_64_BIT; 		break;
+			case '=': tmpins->flags |= IEF_48_REX;				break;
+			case '`': tmpins->flags |= IEF_REX_ONLY_R8_R15;		break;
+			case '^': tmpins->flags |= IEF_REX_XOR_LIKE;		break;
+			case '*': tmpins->flags |= IEF_STI_LIKE;			break;
+			case '$$': tmpins->flags |= IEF_ENDING_ZERO;			break;
+
 			default:
 				return;
 		}
@@ -49,12 +57,12 @@ U0 AsmParseInsFlags(CCompCtrl *cc,CInst *tmpins)
 
 U0 AsmHashLoad()
 {//See $LK,"::/Compiler/OpCodes.DD"$.
-	I64 i,j,size,size_max;
+	I64 i, j, size, size_max;
 	CInternalType *tmpit;
 	CCompCtrl *cc;
 	CHashGeneric *tmph;
 	CHashReg *tmpr;
-	CHashOpcode *tmpo,*tmpo2,*tmpo_max;
+	CHashOpcode *tmpo, *tmpo2, *tmpo_max;
 	CInst *tmpins;
 	CHashClass *tmpc;
 
@@ -68,23 +76,25 @@ U0 AsmHashLoad()
 	size_max = offset(CHashOpcode.ins) + sizeof(CInst) << 5;
 	tmpo_max = MAlloc(size_max);
 
-	cc=CompCtrlNew(FileRead("OpCodes.DD"),,"OpCodes.DD");
-	cc->htc.hash_table_list=NULL;
+	cc = CompCtrlNew(FileRead("OpCodes.DD"),, "OpCodes.DD");
+	cc->htc.hash_table_list = NULL;
 	Lex(cc);
-	while (cc->token) {
-		if (cc->token!=TK_IDENT)
-			LexExcept(cc,"Expecting identifier at ");
-		i=ListMatch(cc->cur_str, "NONE\0R8\0R16\0R32\0R64\0SEG\0FSTACK\0MM\0XMM\0OPCODE\0KEYWORD\0ASM_KEYWORD\0");
-		if (i<=0)
-			LexExcept(cc,"Unknown Statement");
+	while (cc->token)
+	{
+		if (cc->token != TK_IDENT)
+			LexExcept(cc, "Expecting identifier at ");
+		i = ListMatch(cc->cur_str, "NONE\0R8\0R16\0R32\0R64\0SEG\0FSTACK\0MM\0XMM\0OPCODE\0KEYWORD\0ASM_KEYWORD\0");
+		if (i <= 0)
+			LexExcept(cc, "Unknown Statement");
 		Lex(cc); //skip keyword
-		if (cc->token!=TK_IDENT)
-			LexExcept(cc,"Expecting identifier at ");
-		switch (i) {
+		if (cc->token != TK_IDENT)
+			LexExcept(cc, "Expecting identifier at ");
+		switch (i)
+		{
 			case REGT_R8...REGT_XMM:
-				tmpr=CAlloc(sizeof(CHashReg));
-				tmpr->str=cc->cur_str;
-				cc->cur_str=NULL;
+				tmpr = CAlloc(sizeof(CHashReg));
+				tmpr->str = cc->cur_str;
+				cc->cur_str = NULL;
 				Lex(cc); //skip keyword name
 				if (cc->token != TK_I64)
 					LexExcept(cc, "Expecting int at ");
@@ -95,114 +105,120 @@ U0 AsmHashLoad()
 				Lex(cc); //Skip INT
 				break;
 			case: //OPCODE
-				if (cc->token!=TK_IDENT)
-					LexExcept(cc,"Expecting opcode at ");
-				MemSet(tmpo_max,0,size_max);
-				tmpo_max->type=HTT_OPCODE;
-				tmpo_max->inst_entry_count=0;
-				tmpo_max->str=cc->cur_str;
-				cc->cur_str=0;
+				if (cc->token != TK_IDENT)
+					LexExcept(cc, "Expecting opcode at ");
+				MemSet(tmpo_max, 0, size_max);
+				tmpo_max->type = HTT_OPCODE;
+				tmpo_max->inst_entry_count = 0;
+				tmpo_max->str = cc->cur_str;
+				cc->cur_str = 0;
 				Lex(cc);				//Skip OPCODE
-				while (cc->token && cc->token!=';' && cc->token!=':') {
-					tmpins=&tmpo_max->ins[tmpo_max->inst_entry_count];
-					tmpins->ins_entry_num=tmpo_max->inst_entry_count++;
-					tmpins->slash_val=SV_NONE; //Not zero!!
-					while (cc->token==TK_I64) {
-						tmpins->opcode[tmpins->opcode_count++]=cc->cur_i64;
+				while (cc->token && cc->token != ';' && cc->token != ':')
+				{
+					tmpins = &tmpo_max->ins[tmpo_max->inst_entry_count];
+					tmpins->ins_entry_num = tmpo_max->inst_entry_count++;
+					tmpins->slash_val = SV_NONE; //Not zero!!
+					while (cc->token == TK_I64) {
+						tmpins->opcode[tmpins->opcode_count++] = cc->cur_i64;
 						Lex(cc);
 					}
-					if (cc->token==',')
+					if (cc->token == ',')
 						Lex(cc);
-					else if (cc->token!=';')
-						LexExcept(cc,"Expecting ',' at ");
+					else if (cc->token != ';')
+						LexExcept(cc, "Expecting ',' at ");
 
-					AsmParseInsFlags(cc,tmpins);
+					AsmParseInsFlags(cc, tmpins);
 
-					tmpins->uasm_slash_val=tmpins->slash_val;
-					if (tmpins->flags&IEF_STI_LIKE && tmpins->slash_val!=SV_I_REG)
-						tmpins->uasm_slash_val=SV_STI_LIKE;
+					tmpins->uasm_slash_val = tmpins->slash_val;
+					if (tmpins->flags & IEF_STI_LIKE && tmpins->slash_val != SV_I_REG)
+						tmpins->uasm_slash_val = SV_STI_LIKE;
 
-					tmpins->arg1=tmpins->arg2=tmpins->size1=tmpins->size2=0;
-					if (cc->token==TK_IDENT) {
-						j=DefineMatch(cc->cur_str,"ST_ARG_TYPES");
-						tmpins->arg1=j;
-						if (Bt(&cmp.size_arg_mask[1],j))
-							tmpins->size1=8;
-						else if (Bt(&cmp.size_arg_mask[2],j))
-							tmpins->size1=16;
-						else if (Bt(&cmp.size_arg_mask[4],j))
-							tmpins->size1=32;
-						else if (Bt(&cmp.size_arg_mask[8],j))
-							tmpins->size1=64;
+					tmpins->arg1 = tmpins->arg2 = tmpins->size1 = tmpins->size2 = 0;
+					if (cc->token == TK_IDENT)
+					{
+						j = DefineMatch(cc->cur_str, "ST_ARG_TYPES");
+						tmpins->arg1 = j;
+						if (Bt(&cmp.size_arg_mask[1], j))
+							tmpins->size1 = 8;
+						else if (Bt(&cmp.size_arg_mask[2], j))
+							tmpins->size1 = 16;
+						else if (Bt(&cmp.size_arg_mask[4], j))
+							tmpins->size1 = 32;
+						else if (Bt(&cmp.size_arg_mask[8], j))
+							tmpins->size1 = 64;
 
-						if (Lex(cc)==TK_IDENT) {
-							j=DefineMatch(cc->cur_str,"ST_ARG_TYPES");
+						if (Lex(cc) == TK_IDENT)
+						{
+							j = DefineMatch(cc->cur_str, "ST_ARG_TYPES");
 							Lex(cc);
-							tmpins->arg2=j;
+							tmpins->arg2 = j;
 							if (Bt(&cmp.size_arg_mask[1],j))
-								tmpins->size2=8;
-							else if (Bt(&cmp.size_arg_mask[2],j))
-								tmpins->size2=16;
-							else if (Bt(&cmp.size_arg_mask[4],j))
-								tmpins->size2=32;
-							else if (Bt(&cmp.size_arg_mask[8],j))
-								tmpins->size2=64;
+								tmpins->size2 = 8;
+							else if (Bt(&cmp.size_arg_mask[2], j))
+								tmpins->size2 = 16;
+							else if (Bt(&cmp.size_arg_mask[4], j))
+								tmpins->size2 = 32;
+							else if (Bt(&cmp.size_arg_mask[8], j))
+								tmpins->size2 = 64;
 						}
 					}
 				}
-				size=offset(CHashOpcode.ins)+sizeof(CInst)*tmpo_max->inst_entry_count;
-				tmpo=MAlloc(size);
-				MemCopy(tmpo,tmpo_max,size);
-				tmpo->use_count=0;
-				if (HashFind(tmpo->str,cmp.asm_hash,HTT_OPCODE))
-					LexExcept(cc,"Duplicate OPCODE entry ");
-				HashAdd(tmpo,cmp.asm_hash);
+				size = offset(CHashOpcode.ins) + sizeof(CInst) * tmpo_max->inst_entry_count;
+				tmpo = MAlloc(size);
+				MemCopy(tmpo, tmpo_max, size);
+				tmpo->use_count = 0;
+				if (HashFind(tmpo->str, cmp.asm_hash, HTT_OPCODE))
+					LexExcept(cc, "Duplicate OPCODE entry ");
+				HashAdd(tmpo, cmp.asm_hash);
 				//Parse aliases.
-				if (cc->token==':') {
-					while (Lex(cc)==TK_IDENT) {
-						tmpo2=MAllocIdent(tmpo);
-						tmpo2->str=cc->cur_str;
-						cc->cur_str=0;
-						tmpo2->oc_flags|=OCF_ALIAS;
-						if (HashFind(tmpo2->str,cmp.asm_hash,HTT_OPCODE))
-							LexExcept(cc,"Duplicate OPCODE ALIAS entry ");
-						HashAdd(tmpo2,cmp.asm_hash);
+				if (cc->token == ':')
+				{
+					while (Lex(cc) == TK_IDENT)
+					{
+						tmpo2 = MAllocIdent(tmpo);
+						tmpo2->str = cc->cur_str;
+						cc->cur_str = 0;
+						tmpo2->oc_flags |= OCF_ALIAS;
+						if (HashFind(tmpo2->str, cmp.asm_hash, HTT_OPCODE))
+							LexExcept(cc, "Duplicate OPCODE ALIAS entry ");
+						HashAdd(tmpo2, cmp.asm_hash);
 					}
 				}
 				break;
 			case: //KEYWORD
 			case: //ASM_KEYWORD
-				tmph=CAlloc(sizeof(CHashGeneric));
-				tmph->str=cc->cur_str;
-				cc->cur_str=NULL;
+				tmph = CAlloc(sizeof(CHashGeneric));
+				tmph->str = cc->cur_str;
+				cc->cur_str = NULL;
 				Lex(cc); //skip keyword name
-				if (cc->token!=TK_I64)
-					LexExcept(cc,"Expecting int at ");
-				tmph->user_data0=cc->cur_i64;
-				if (i==10)
-					tmph->type=HTT_KEYWORD;
+				if (cc->token != TK_I64)
+					LexExcept(cc, "Expecting int at ");
+				tmph->user_data0 = cc->cur_i64;
+				if (i == 10)
+					tmph->type = HTT_KEYWORD;
 				else
-					tmph->type=HTT_ASM_KEYWORD;
-				HashAdd(tmph,cmp.asm_hash);
+					tmph->type = HTT_ASM_KEYWORD;
+				HashAdd(tmph, cmp.asm_hash);
 				Lex(cc); //Skip INT
 				break;
 		}
-		if (cc->token!=';')
-			LexExcept(cc,"Missing ';' at");
+		if (cc->token != ';')
+			LexExcept(cc, "Missing ';' at");
 		Lex(cc); //Skip ';'
 	}
 	Free(tmpo_max);
 	CompCtrlDel(cc);
-	for (i=0;i<INTERNAL_TYPES_NUM;i++) {
-		tmpit=&internal_types_table[i];
-		tmpc=ParseClassNew;
-		tmpc->type=HTT_INTERNAL_TYPE;
-		tmpc->raw_type=tmpit->type;
-		Bts(&tmpc->flags,Cf_INTERNAL_TYPE);
-		tmpc->size=tmpit->size;
-		tmpc->str=ZStrNew(tmpit->name);
-		HashAdd(tmpc,cmp.asm_hash);
-		cmp.internal_types[tmpc->raw_type]=tmpc;
+	for (i = 0; i < INTERNAL_TYPES_NUM; i++)
+	{
+		tmpit = &internal_types_table[i];
+		tmpc = ParseClassNew;
+		tmpc->type = HTT_INTERNAL_TYPE;
+		tmpc->raw_type = tmpit->type;
+		Bts(&tmpc->flags, Cf_INTERNAL_TYPE);
+		tmpc->size = tmpit->size;
+		tmpc->str = ZStrNew(tmpit->name);
+		HashAdd(tmpc, cmp.asm_hash);
+		cmp.internal_types[tmpc->raw_type] = tmpc;
 	}
-	zenith_task->hash_table->next=cmp.asm_hash;
+	zenith_task->hash_table->next = cmp.asm_hash;
 }
diff --git a/src/Home/FilesRefactored.DD b/src/Home/FilesRefactored.DD
index 373019d5..bd350374 100755
--- a/src/Home/FilesRefactored.DD
+++ b/src/Home/FilesRefactored.DD
@@ -38,6 +38,7 @@ StartOS.CC
 
 /Compiler/
 	Asm.CC
+	AsmInit.CC
 	CompilerA.HH
 	CompilerB.HH