diff --git a/install/includes/schema.sql b/install/includes/schema.sql
index daa6b08f..d410fafe 100644
--- a/install/includes/schema.sql
+++ b/install/includes/schema.sql
@@ -286,6 +286,16 @@ CREATE TABLE `myaac_gallery`
 
 INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC');
 
+CREATE TABLE `myaac_settings`
+(
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`plugin_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`key` VARCHAR(255) NOT NULL DEFAULT '',
+	`value` TEXT NOT NULL,
+	PRIMARY KEY (`id`),
+	KEY `key` (`key`)
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
+
 CREATE TABLE `myaac_spells`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
diff --git a/system/migrations/31.php b/system/migrations/31.php
index 8f4e117e..31ca4e9d 100644
--- a/system/migrations/31.php
+++ b/system/migrations/31.php
@@ -1,46 +1,11 @@
 <?php
 
-$db->exec("CREATE TABLE `myaac_options_bool`
+$db->exec("CREATE TABLE `myaac_settings`
 (
-	`name` VARCHAR(255) NOT NULL,
-	`key` VARCHAR(255) NOT NULL,
-	`value` INT(1) NOT NULL DEFAULT 0,
-	PRIMARY KEY (`key`),
-	UNIQUE (`key`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
-
-CREATE TABLE `myaac_options_double`
-(
-	`name` VARCHAR(255) NOT NULL,
-	`key` VARCHAR(255) NOT NULL,
-	`value` DOUBLE NOT NULL DEFAULT 0,
-	PRIMARY KEY (`key`),
-	UNIQUE (`key`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
-
-CREATE TABLE `myaac_options_int`
-(
-	`name` VARCHAR(255) NOT NULL,
-	`key` VARCHAR(255) NOT NULL,
-	`value` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY (`key`),
-	UNIQUE (`key`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
-
-CREATE TABLE `myaac_options_text`
-(
-	`name` VARCHAR(255) NOT NULL,
-	`key` VARCHAR(255) NOT NULL,
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`plugin_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`key` VARCHAR(255) NOT NULL DEFAULT '',
 	`value` TEXT NOT NULL,
-	PRIMARY KEY (`key`),
-	UNIQUE (`key`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
-
-CREATE TABLE `myaac_options_varchar`
-(
-	`name` VARCHAR(255) NOT NULL,
-	`key` VARCHAR(255) NOT NULL,
-	`value` VARCHAR(255) NOT NULL DEFAULT '',
-	PRIMARY KEY (`key`),
-	UNIQUE (`key`)
+	PRIMARY KEY (`id`),
+	KEY `key` (`key`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;");
\ No newline at end of file