diff --git a/advanced/Templates/gravity.db.schema b/advanced/Templates/gravity.db.schema
index 1eee8491..2fd9a9d1 100644
--- a/advanced/Templates/gravity.db.schema
+++ b/advanced/Templates/gravity.db.schema
@@ -1,13 +1,14 @@
-CREATE TABLE whitelist (domain TEXT UNIQUE NOT NULL, comment TEXT, DateAdded DATETIME);
+CREATE TABLE whitelist (domain TEXT UNIQUE NOT NULL, comment TEXT, disabled BOOLEAN DEFAULT 0, DateAdded DATETIME);
 
-CREATE TABLE blacklist (domain TEXT UNIQUE NOT NULL, comment TEXT, DateAdded DATETIME);
+CREATE TABLE blacklist (domain TEXT UNIQUE NOT NULL, comment TEXT, disabled BOOLEAN DEFAULT 0, DateAdded DATETIME);
 
 CREATE TABLE gravity   (domain TEXT UNIQUE NOT NULL);
 
 CREATE VIEW vw_gravity AS SELECT DISTINCT a.domain
 FROM gravity a
-WHERE a.domain NOT IN (SELECT domain from whitelist);
+WHERE a.domain NOT IN (SELECT domain from whitelist WHERE disabled != 1);
 
 CREATE VIEW vw_blacklist AS SELECT DISTINCT a.domain
 FROM blacklist a
-WHERE a.domain NOT IN (SELECT domain from whitelist);
+WHERE a.disabled != 1 AND
+      a.domain NOT IN (SELECT domain from whitelist WHERE disabled != 1);