Updated GEdit scheme