--- a/Data/PremadeGroups.lua	Tue Feb 08 10:01:35 2011 +0100
+++ b/Data/PremadeGroups.lua	Wed Feb 09 21:53:26 2011 +0100
@@ -16,7 +16,6 @@
 
 addon.defaultGroups = {
 	["Inscription - Glyphs (All)"] = {
-		["version"] = 1,
 		["isParent"] = true,
 		["childs"] = {
 			"Inscription - Glyphs by class - Death Knight",
@@ -819,23 +818,15 @@
 	
 	-- Rare gems (Cataclysm)
 	-- Source: http://www.wowhead.com/items=3.0?filter=qu=3;minle=81;maxle=90;cr=87;crs=12;crv=0
-	["Jewelcrafting - Cata Rare Gems (Inferno Ruby)"] = {
-		["version"] = 1,
-		["items"] = {
-			[52206] = 1, -- Bold Inferno Ruby
-			[52207] = 1, -- Brilliant Inferno Ruby
-			[52212] = 1, -- Delicate Inferno Ruby
-			[52216] = 1, -- Flashing Inferno Ruby
-			[52230] = 1, -- Precise Inferno Ruby
-		},
-	},
-	["Jewelcrafting - Cata Rare Gems (Ocean Sapphire)"] = {
-		["version"] = 1,
-		["items"] = {
-			[52235] = 1, -- Rigid Ocean Sapphire
-			[52242] = 1, -- Solid Ocean Sapphire
-			[52244] = 1, -- Sparkling Ocean Sapphire
-			[52246] = 1, -- Stormy Ocean Sapphire
+	["Jewelcrafting - Cata Rare Gems (All)"] = {
+		["isParent"] = true,
+		["childs"] = {
+			"Jewelcrafting - Cata Rare Gems (Inferno Ruby)",
+			"Jewelcrafting - Cata Rare Gems (Ocean Sapphire)",
+			"Jewelcrafting - Cata Rare Gems (Amberjewel)",
+			"Jewelcrafting - Cata Rare Gems (Demonseye)",
+			"Jewelcrafting - Cata Rare Gems (Dream Emerald)",
+			"Jewelcrafting - Cata Rare Gems (Ember Topaz)",
 		},
 	},
 	["Jewelcrafting - Cata Rare Gems (Amberjewel)"] = {
@@ -902,6 +893,29 @@
 			[68358] = 1, -- Resplendent Ember Topaz
 		},
 	},
+	["Jewelcrafting - Cata Rare Gems (Inferno Ruby)"] = {
+		["version"] = 1,
+		["items"] = {
+			[52206] = 1, -- Bold Inferno Ruby
+			[52207] = 1, -- Brilliant Inferno Ruby
+			[52212] = 1, -- Delicate Inferno Ruby
+			[52216] = 1, -- Flashing Inferno Ruby
+			[52230] = 1, -- Precise Inferno Ruby
+		},
+	},
+	["Jewelcrafting - Cata Rare Gems (Ocean Sapphire)"] = {
+		["version"] = 1,
+		["items"] = {
+			[52235] = 1, -- Rigid Ocean Sapphire
+			[52242] = 1, -- Solid Ocean Sapphire
+			[52244] = 1, -- Sparkling Ocean Sapphire
+			[52246] = 1, -- Stormy Ocean Sapphire
+		},
+	},
+	
+	
+	
+	-- Meta gems
 	["Jewelcrafting - Cata Meta Gems (Shadowspirit Diamond)"] = {
 		["version"] = 2,
 		["items"] = {
@@ -929,6 +943,17 @@
 	
 	-- Common gems (Cataclysm)
 	-- Source: http://www.wowhead.com/items=3?filter=na=Nightstone;cr=87;crs=12;crv=0
+	["Jewelcrafting - Cata Common Gems (All)"] = {
+		["isParent"] = true,
+		["childs"] = {
+			"Jewelcrafting - Cata Common Gems (Nightstone)",
+			"Jewelcrafting - Cata Common Gems (Hessonite)",
+			"Jewelcrafting - Cata Common Gems (Jasper)",
+			"Jewelcrafting - Cata Common Gems (Alicite)",
+			"Jewelcrafting - Cata Common Gems (Carnelian)",
+			"Jewelcrafting - Cata Common Gems (Zephyrite)",
+		},
+	},
 	["Jewelcrafting - Cata Common Gems (Nightstone)"] = {
 		["version"] = 1,
 		["items"] = {
@@ -1058,115 +1083,6 @@
 	
 	
 	
-	-- Epic gems (WotLK)
-	-- Source: http://www.wowhead.com/items=3?filter=na=Ametrine;cr=87;crs=12;crv=0
-	["Jewelcrafting - Epic Gems (Ametrine)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40142] = 1, -- Inscribed Ametrine
-			[40144] = 1, -- Champion's Ametrine
-			[40145] = 1, -- Resplendent Ametrine
-			[40146] = 1, -- Fierce Ametrine
-			[40147] = 1, -- Deadly Ametrine
-			[40149] = 1, -- Lucent Ametrine
-			[40150] = 1, -- Deft Ametrine
-			[40152] = 1, -- Potent Ametrine
-			[40154] = 1, -- Willful Ametrine
-			[40155] = 1, -- Reckless Ametrine
-			[40156] = -2, -- Deadly Ametrine
-			[40158] = -2, -- Lucent Ametrine
-			[40159] = 1, -- Deft Ametrine
-			[40160] = 1, -- Stalwart Ametrine
-			[40161] = -2, -- Stalwart Ametrine
-			[40163] = 1, -- Resolute Ametrine
-		},
-	},
-	["Jewelcrafting - Epic Gems (Cardinal Ruby)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40111] = 1, -- Bold Cardinal Ruby
-			[40112] = 1, -- Delicate Cardinal Ruby
-			[40113] = 1, -- Brilliant Cardinal Ruby
-			[40114] = -2, -- Delicate Cardinal Ruby
-			[40116] = 1, -- Flashing Cardinal Ruby
-			[40118] = 1, -- Precise Cardinal Ruby
-			[40123] = -2, -- Brilliant Cardinal Ruby
-		},
-	},
-	["Jewelcrafting - Epic Gems (Dreadstone)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40129] = 1, -- Sovereign Dreadstone
-			[40130] = 1, -- Shifting Dreadstone
-			[40131] = -2, -- Glinting Dreadstone
-			[40132] = -2, -- Timeless Dreadstone
-			[40133] = 1, -- Purified Dreadstone
-			[40134] = -2, -- Purified Dreadstone
-			[40135] = 1, -- Mysterious Dreadstone
-			[40136] = -2, -- Shifting Dreadstone
-			[40137] = -2, -- Glinting Dreadstone
-			[40139] = 1, -- Defender's Dreadstone
-			[40141] = 1, -- Guardian's Dreadstone
-			[40143] = 1, -- Etched Dreadstone
-			[40148] = -2, -- Glinting Dreadstone
-			[40151] = -2, -- Purified Dreadstone
-			[40153] = 1, -- Veiled Dreadstone
-			[40157] = 1, -- Glinting Dreadstone
-			[40162] = 1, -- Accurate Dreadstone
-			[40164] = 1, -- Timeless Dreadstone
-			[40170] = -2, -- Purified Dreadstone
-			[40175] = -2, -- Purified Dreadstone
-		},
-	},
-	["Jewelcrafting - Epic Gems (Eye of Zul)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40138] = -2, -- Regal Eye of Zul
-			[40140] = -2, -- Jagged Eye of Zul
-			[40165] = 1, -- Jagged Eye of Zul
-			[40166] = 1, -- Nimble Eye of Zul
-			[40167] = 1, -- Regal Eye of Zul
-			[40168] = 1, -- Steady Eye of Zul
-			[40169] = 1, -- Forceful Eye of Zul
-			[40171] = 1, -- Misty Eye of Zul
-			[40172] = -2, -- Lightning Eye of Zul
-			[40173] = 1, -- Turbid Eye of Zul
-			[40174] = -2, -- Energized Eye of Zul
-			[40176] = -2, -- Misty Eye of Zul
-			[40177] = 1, -- Lightning Eye of Zul
-			[40178] = -2, -- Turbid Eye of Zul
-			[40179] = 1, -- Energized Eye of Zul
-			[40180] = 1, -- Radiant Eye of Zul
-			[40181] = -2, -- Radiant Eye of Zul
-			[40182] = 1, -- Shattered Eye of Zul
-		},
-	},
-	["Jewelcrafting - Epic Gems (King's Amber)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40115] = 1, -- Subtle King's Amber
-			[40117] = -2, -- Smooth King's Amber
-			[40124] = 1, -- Smooth King's Amber
-			[40126] = -2, -- Subtle King's Amber
-			[40127] = 1, -- Mystic King's Amber
-			[40128] = 1, -- Quick King's Amber
-		},
-	},
-	["Jewelcrafting - Epic Gems (Majestic Zircon)"] = {
-		["version"] = 2,
-		["items"] = {
-			[40119] = 1, -- Solid Majestic Zircon
-			[40120] = 1, -- Sparkling Majestic Zircon
-			[40121] = -2, -- Sparkling Majestic Zircon
-			[40122] = 1, -- Stormy Majestic Zircon
-			[40125] = 1, -- Rigid Majestic Zircon
-		},
-	},
-	
-	
-	
-	-- Rare gems (WotLK)
-	-- Enchants (WotLK)
 	-- Enchants (Heirlooms)
 	-- Source: manual retrieved from Wowhead
 	["Enchanting - Enchants - Heirlooms"] = {