diff --git a/ChangeLog b/ChangeLog
index ea90634..00c8bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-13  Blake Nicholson  <blaken@umich.edu>
+
+	* DBModeler/SQLGenerator.m: Updated to use new gsmarkup file.
+	* DBModeler/Resources/SQLGenerator.gsmarkup: Initial import.
+	* DBModeler/Resources/SQLGenerator.gorm: Removed.
+	* DBModeler/GNUmakefile: Replaced the SQLGenerator.gorm resource with
+	SQLGenerator.gsmarkup.  Removed reference to ConsistencyResults.gorm.
+
 2008-05-13  Matt Rice  <ratmice@gmail.com>
 
 	* DBModeler/Resources/Menu-{Cocoa,GNUstep}.gsmarkup: Remove a TODO
diff --git a/DBModeler/GNUmakefile b/DBModeler/GNUmakefile
index 4ebbc90..7402e80 100644
--- a/DBModeler/GNUmakefile
+++ b/DBModeler/GNUmakefile
@@ -43,7 +43,7 @@ ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler Renaissance
 
 $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/ModelDrag.tiff		\
-	Resources/SQLGenerator.gorm		\
+	Resources/SQLGenerator.gsmarkup	\
 	Resources/Info-gnustep.plist    	\
 	Resources/Key_Diagram.tiff		\
 	Resources/Key_Header.tiff		\
@@ -55,7 +55,6 @@ $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/ClassProperty_Header.tiff	\
 	Resources/ClassProperty_On.tiff 	\
 	Resources/Preferences.gorm		\
-	Resources/ConsistencyResults.gorm	\
 	Resources/DBModeler.tiff		\
 	Resources/DBModeler.icns		\
 	Resources/AllowsNull_On.tiff		\
diff --git a/DBModeler/Resources/SQLGenerator.gorm/data.classes b/DBModeler/Resources/SQLGenerator.gorm/data.classes
deleted file mode 100644
index ce0b66f..0000000
--- a/DBModeler/Resources/SQLGenerator.gorm/data.classes
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "## Comment" = "Do NOT change this file, Gorm maintains it";
-    FirstResponder = {
-	Actions = (
-	    "executeSQL:",
-	    "switchChanged:",
-	    "openSesame:",
-	    "saveAs:",
-	    "showTables:"
-	);
-	Super = NSObject;
-    };
-    SQLGenerator = {
-	Actions = (
-	    "openSesame:",
-	    "executeSQL:",
-	    "switchChanged:",
-	    "saveAs:",
-	    "showTables:"
-	);
-	Outlets = (
-	    dropDatabaseSwitch,
-	    createDatabaseSwitch,
-	    dropTablesSwitch,
-	    createTablesSwitch,
-	    dropPKSwitch,
-	    createPKSwitch,
-	    createPKConstraintsSwitch,
-	    createFKConstraintsSwitch,
-	    _sqlOutput,
-	    _window
-	);
-	Super = NSObject;
-    };
-}
\ No newline at end of file
diff --git a/DBModeler/Resources/SQLGenerator.gorm/data.info b/DBModeler/Resources/SQLGenerator.gorm/data.info
deleted file mode 100644
index 152bdec..0000000
Binary files a/DBModeler/Resources/SQLGenerator.gorm/data.info and /dev/null differ
diff --git a/DBModeler/Resources/SQLGenerator.gorm/objects.gorm b/DBModeler/Resources/SQLGenerator.gorm/objects.gorm
deleted file mode 100644
index ab9dff6..0000000
Binary files a/DBModeler/Resources/SQLGenerator.gorm/objects.gorm and /dev/null differ
diff --git a/DBModeler/Resources/SQLGenerator.gsmarkup b/DBModeler/Resources/SQLGenerator.gsmarkup
new file mode 100644
index 0000000..6d4fc9e
--- /dev/null
+++ b/DBModeler/Resources/SQLGenerator.gsmarkup
@@ -0,0 +1,97 @@
+<?xml version="1.0"?> 
+<!DOCTYPE gsmarkup> 
+<gsmarkup> 
+	<objects>
+
+		<window title="SQL Generation" id="sqlgenWindow" resizable="no">
+			<vbox leftPadding="10" padding="10">
+				<box title="SQL Generation Options" topPadding="10"
+					leftPadding="15" rightPadding="15" width="425">
+					<hbox halign="wexpand">
+						<vbox halign="left" valign="wexpand">
+							<button id="dropDatabase" title="Drop Database"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="dropTables" title="Drop Tables"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<vspace />
+							<button id="dropPKSupport"
+								title="Drop Primary Key Support" type="switch"
+								halign="left" valign="bottom"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+						</vbox>
+						<hspace />
+						<vbox halign="right" valign="top">
+							<button id="createDB" title="Create Database"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createTables" title="Create Tables"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createPKConstraints"
+								title="Primary Key Constraints" type="switch"
+								halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createFKConstraints"
+								title="Foreign Key Constraints" type="switch"
+								halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createPKSupport"
+							   	title="Create Primary Key Support"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+						</vbox>
+					</hbox>
+				</box>
+				<scrollView width="425" height="300"
+					borderType="bezel" leftPadding="15" rightPadding="15"
+					hasHorizontalScroller="no">
+					<textView id="sqlOutput"/>
+				</scrollView>
+				<hbox halign="left" padding="8">
+					<button id="executeSQL" title="Execute SQL"
+						type="momentaryPushIn" halign="left" valign="center"
+						action="executeSQL:" target="#NSOwner" width="115"
+						leftPadding="5" />
+					<button id="saveAs" title="Save As..."
+						type="momentaryPushIn" halign="left" valign="center"
+						action="saveAs:" target="#NSOwner" width="100" />
+					<button id="tables" title="Tables..."
+						type="momentaryPushIn" halign="left" valign="center"
+						action="showTables:" target="#NSOwner" width="100" />
+				</hbox>
+			</vbox>
+		</window>
+
+	</objects>
+
+	<connectors>
+		<outlet source="#NSOwner" target="#sqlgenWindow" key="window"/>
+		<outlet source="#NSOwner" target="#dropDatabase"
+			key="dropDatabaseSwitch" />
+		<outlet source="#NSOwner" target="#createDB"
+			key="createDatabaseSwitch"/>
+		<outlet source="#NSOwner" target="#dropTables"
+			key="dropTablesSwitch"/>
+		<outlet source="#NSOwner" target="#createTables"
+		   	key="createTablesSwitch"/>
+		<outlet source="#NSOwner" target="#dropPKSupport"
+		   	key="dropPKSwitch"/>
+		<outlet source="#NSOwner" target="#createPKSupport"
+		   	key="createPKSwitch"/>
+		<outlet source="#NSOwner" target="#createPKConstraints"
+		   	key="createPKConstraintsSwitch" />
+		<outlet source="#NSOwner" target="#createFKConstraints"
+		   	key="createFKConstraintsSwitch" />
+		<outlet source="#NSOwner" target="#sqlOutput" key="sqlOutput"/>
+	</connectors>
+</gsmarkup>
diff --git a/DBModeler/SQLGenerator.m b/DBModeler/SQLGenerator.m
index 9d28397..0a41626 100644
--- a/DBModeler/SQLGenerator.m
+++ b/DBModeler/SQLGenerator.m
@@ -44,6 +44,8 @@
 #include <AppKit/NSWindow.h>
 #endif
 
+#include <Renaissance/Renaissance.h>
+
 #include <EOAccess/EOAdaptor.h>
 #include <EOAccess/EOAdaptorChannel.h>
 #include <EOAccess/EOAdaptorContext.h>
@@ -85,11 +87,11 @@ static NSString *_otherScript;
   adminSwitchButtons = [[NSMutableArray alloc] initWithCapacity:3];
   otherSwitchButtons = [[NSMutableArray alloc] initWithCapacity:7];
   opts = [[NSMutableDictionary alloc] initWithCapacity:8];
-  loadedNib = [NSBundle loadNibNamed:@"SQLGenerator" owner:self];
+  loadedNib = [NSBundle loadGSMarkupNamed: @"SQLGenerator" owner: self];
   return self;
 }
 
-- (void) awakeFromNib
+- (void) awakeFromGSMarkup
 {
   [[dropDatabaseSwitch cell] setRepresentedObject: EODropDatabaseKey];
   [[createDatabaseSwitch cell] setRepresentedObject: EOCreateDatabaseKey];