diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h
index 7674f138f..504f8aed3 100644
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@@ -126,11 +126,7 @@ struct LDoNTrapTemplate
 
 // All clients translate the character select information to some degree
 
-struct CharSelectEquip
-{
-	EQEmu::Texture_Struct Textures;
-	EQEmu::Tint_Struct Color;
-};
+struct CharSelectEquip : EQEmu::Texture_Struct, EQEmu::Tint_Struct {};
 
 // RoF2-based hybrid struct
 struct CharacterSelectEntry_Struct
diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index 3b1e890bc..b60e0534f 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -3047,12 +3047,12 @@ namespace RoF
 			eq_cse->Face = emu_cse->Face;
 
 			for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
-				eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material;
-				eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1;
-				eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial;
-				eq_cse->Equip[equip_index].Textures.HeroForgeModel = emu_cse->Equip[equip_index].Textures.HeroForgeModel;
-				eq_cse->Equip[equip_index].Textures.Material2 = emu_cse->Equip[equip_index].Textures.Material2;
-				eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color;
+				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
+				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
+				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
+				eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroForgeModel;
+				eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Material2;
+				eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
 			}
 
 			eq_cse->Unknown15 = emu_cse->Unknown15;
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index 5011cacb0..30941a1bf 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -3140,12 +3140,12 @@ namespace RoF2
 			eq_cse->Face = emu_cse->Face;
 
 			for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
-				eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material;
-				eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1;
-				eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial;
-				eq_cse->Equip[equip_index].Textures.HeroForgeModel = emu_cse->Equip[equip_index].Textures.HeroForgeModel;
-				eq_cse->Equip[equip_index].Textures.Material2 = emu_cse->Equip[equip_index].Textures.Material2;
-				eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color;
+				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
+				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
+				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
+				eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroForgeModel;
+				eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Material2;
+				eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
 			}
 
 			eq_cse->Unknown15 = emu_cse->Unknown15;
diff --git a/common/patches/rof2_structs.h b/common/patches/rof2_structs.h
index ee9ae9c29..ed34d44b8 100644
--- a/common/patches/rof2_structs.h
+++ b/common/patches/rof2_structs.h
@@ -228,11 +228,7 @@ struct Texture_Struct
 //	TextureProfile();
 //};
 
-struct CharSelectEquip
-{
-	Texture_Struct Textures;
-	Tint_Struct Color;
-};
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
 
 struct CharacterSelectEntry_Struct
 {
diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h
index 1c957889a..9846b1e9e 100644
--- a/common/patches/rof_structs.h
+++ b/common/patches/rof_structs.h
@@ -228,11 +228,7 @@ struct Texture_Struct
 //	TextureProfile();
 //};
 
-struct CharSelectEquip
-{
-	Texture_Struct Textures;
-	Tint_Struct Color;
-};
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
 
 struct CharacterSelectEntry_Struct
 {
diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp
index fd99fa0e9..58997a9a5 100644
--- a/common/patches/sod.cpp
+++ b/common/patches/sod.cpp
@@ -1994,10 +1994,10 @@ namespace SoD
 			eq_cse->Face = emu_cse->Face;
 
 			for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
-				eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material;
-				eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1;
-				eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial;
-				eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color;
+				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
+				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
+				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
+				eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
 			}
 
 			eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;
diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h
index 6affabfe3..11331552a 100644
--- a/common/patches/sod_structs.h
+++ b/common/patches/sod_structs.h
@@ -184,11 +184,7 @@ struct TextureProfile
 	TextureProfile();
 };
 
-struct CharSelectEquip
-{
-	Texture_Struct Textures;
-	Tint_Struct Color;
-};
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
 
 struct CharacterSelectEntry_Struct
 {
diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp
index 38e004cac..c2402f1e2 100644
--- a/common/patches/sof.cpp
+++ b/common/patches/sof.cpp
@@ -1650,10 +1650,10 @@ namespace SoF
 			eq_cse->Face = emu_cse->Face;
 
 			for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
-				eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material;
-				eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1;
-				eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial;
-				eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color;
+				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
+				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
+				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
+				eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
 			}
 
 			eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;
diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h
index 66c3f93bf..881259e3e 100644
--- a/common/patches/sof_structs.h
+++ b/common/patches/sof_structs.h
@@ -184,11 +184,7 @@ struct TextureProfile
 	TextureProfile();
 };
 
-struct CharSelectEquip
-{
-	Texture_Struct Textures;
-	Tint_Struct Color;
-};
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
 
 struct CharacterSelectEntry_Struct
 {
diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp
index 17112cf68..849f898f7 100644
--- a/common/patches/titanium.cpp
+++ b/common/patches/titanium.cpp
@@ -1224,14 +1224,14 @@ namespace Titanium
 				eq->Race[char_index] = 1;
 
 			for (int index = 0; index < EQEmu::textures::TextureCount; ++index) {
-				eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color.Color;
+				eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color;
 			}
 
 			eq->BeardColor[char_index] = emu_cse->BeardColor;
 			eq->HairStyle[char_index] = emu_cse->HairStyle;
 
 			for (int index = 0; index < EQEmu::textures::TextureCount; ++index) {
-				eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Textures.Material;
+				eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Material;
 			}
 
 			eq->SecondaryIDFile[char_index] = emu_cse->SecondaryIDFile;
diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp
index 0a720ea2e..2756ae6dd 100644
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@@ -2291,10 +2291,10 @@ namespace UF
 			eq_cse->Face = emu_cse->Face;
 
 			for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
-				eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material;
-				eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1;
-				eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial;
-				eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color;
+				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
+				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
+				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
+				eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
 			}
 
 			eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;
diff --git a/common/patches/uf_structs.h b/common/patches/uf_structs.h
index 284e8a336..f4f78f1c5 100644
--- a/common/patches/uf_structs.h
+++ b/common/patches/uf_structs.h
@@ -184,11 +184,7 @@ struct TextureProfile
 	TextureProfile();
 };
 
-struct CharSelectEquip
-{
-	Texture_Struct Textures;
-	Tint_Struct Color;
-};
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
 
 struct CharacterSelectEntry_Struct
 {
diff --git a/world/worlddb.cpp b/world/worlddb.cpp
index c1995535f..0eaa474a0 100644
--- a/world/worlddb.cpp
+++ b/world/worlddb.cpp
@@ -118,12 +118,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 		cse->Face = (uint8)atoi(row[15]);
 
 		for (uint32 matslot = 0; matslot < EQEmu::textures::TextureCount; matslot++) {	// Processed below
-			cse->Equip[matslot].Textures.Material = 0;
-			cse->Equip[matslot].Textures.Unknown1 = 0;
-			cse->Equip[matslot].Textures.EliteMaterial = 0;
-			cse->Equip[matslot].Textures.HeroForgeModel = 0;
-			cse->Equip[matslot].Textures.Material2 = 0;
-			cse->Equip[matslot].Color.Color = 0;
+			cse->Equip[matslot].Material = 0;
+			cse->Equip[matslot].Unknown1 = 0;
+			cse->Equip[matslot].EliteMaterial = 0;
+			cse->Equip[matslot].HeroForgeModel = 0;
+			cse->Equip[matslot].Material2 = 0;
+			cse->Equip[matslot].Color = 0;
 		}						
 
 		cse->Unknown15 = 0xFF;
@@ -262,12 +262,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 					// Weapon Models 
 					if (inst->GetOrnamentationIDFile() != 0) {
 						idfile = inst->GetOrnamentationIDFile();
-						cse->Equip[matslot].Textures.Material = idfile;
+						cse->Equip[matslot].Material = idfile;
 					}
 					else {
 						if (strlen(item->IDFile) > 2) {
 							idfile = atoi(&item->IDFile[2]);
-							cse->Equip[matslot].Textures.Material = idfile;
+							cse->Equip[matslot].Material = idfile;
 						}
 					}
 					if (matslot == EQEmu::textures::TexturePrimary) {
@@ -287,10 +287,10 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 					}
 
 					// Armor Materials/Models
-					cse->Equip[matslot].Textures.Material = item->Material;
-					cse->Equip[matslot].Textures.EliteMaterial = item->EliteMaterial;
-					cse->Equip[matslot].Textures.HeroForgeModel = inst->GetOrnamentHeroModel(matslot);
-					cse->Equip[matslot].Color.Color = color;
+					cse->Equip[matslot].Material = item->Material;
+					cse->Equip[matslot].EliteMaterial = item->EliteMaterial;
+					cse->Equip[matslot].HeroForgeModel = inst->GetOrnamentHeroModel(matslot);
+					cse->Equip[matslot].Color = color;
 				}
 			}
 		}