diff --git a/build.js b/build.js
index 0ae633dcd..780c7b98e 100644
--- a/build.js
+++ b/build.js
@@ -1,4 +1,5 @@
 var fs = require('fs'),
+    path = require('path'),
     glob = require('glob');
 
 function read(f) {
@@ -13,6 +14,12 @@ function rp(f) {
     return r('presets/' + f);
 }
 
+var forms = {};
+glob.sync(__dirname + '/data/presets/forms/*.json').forEach(function(file) {
+    forms[path.basename(file, '.json')] = read(file);
+});
+fs.writeFileSync('data/presets/forms.json', JSON.stringify(forms));
+
 fs.writeFileSync('data/presets/presets.json', JSON.stringify(
     glob.sync(__dirname + '/data/presets/presets/**/*.json').map(function(file) {
         return read(file);
diff --git a/data/presets/forms.json b/data/presets/forms.json
index 755ad0082..1d4db9edc 100644
--- a/data/presets/forms.json
+++ b/data/presets/forms.json
@@ -1,97 +1 @@
-{
-    "cuisine": {
-        "key": "cuisine",
-        "type": "combo",
-        "indexed": true
-    },
-    "internet_access": {
-        "key": "internet_access",
-        "title": "Internet Access",
-        "type": "select",
-        "options": ["yes", "no", "wlan", "wired", "terminal"]
-    },
-    "building_area": {
-        "key": "building",
-        "type": "check",
-        "default": { "area": "yes" }
-    },
-    "address": {
-        "type": "address",
-        "title": "Address"
-    },
-    "operator": {
-        "key": "operator",
-        "type": "text"
-    },
-    "religion": {
-        "key": "religion",
-        "type": "select",
-        "options": ["christian", "muslim", "buddhist", "jewish", "hindu", "shinto", "taoist"]
-    },
-    "denomination": {
-        "key": "denomination",
-        "type": "combo"
-    },
-    "building": {
-        "key": "building",
-        "type": "combo"
-    },
-    "building_yes": {
-        "key": "building",
-        "type": "combo",
-        "default": { "area": "yes" }
-    },
-    "levels": {
-        "key": "building:levels",
-        "type": "number",
-        "title": "Levels"
-    },
-    "fee": {
-        "key": "fee",
-        "type": "check"
-    },
-    "access": {
-        "key": "access",
-        "type": "combo"
-    },
-    "atm": {
-        "key": "atm",
-        "type": "check"
-    },
-    "shelter": {
-        "key": "shelter",
-        "type": "check"
-    },
-    "emergency": {
-        "key": "emergency",
-        "type": "check"
-    },
-    "oneway": {
-        "key": "oneway",
-        "type": "check"
-    },
-    "bridge": {
-        "key": "bridge",
-        "type": "check"
-    },
-    "tunnel": {
-        "key": "tunnel",
-        "type": "check"
-    },
-    "maxspeed": {
-        "key": "maxspeed",
-        "type": "combo"
-    },
-    "surface": {
-        "key": "surface",
-        "type": "combo"
-    },
-    "layer": {
-        "key": "layer",
-        "type": "combo"
-    },
-    "elevation": {
-        "key": "ele",
-        "type": "number"
-    }
-}
+{"access":{"key":"access","type":"combo"},"address":{"type":"address","title":"Address"},"atm":{"key":"atm","type":"check"},"bridge":{"key":"bridge","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number"},"emergency":{"key":"emergency","type":"check"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","title":"Internet Access","type":"select","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number","title":"Levels"},"maxspeed":{"key":"maxspeed","type":"combo"},"oneway":{"key":"oneway","type":"check"},"operator":{"key":"operator","type":"text"},"religion":{"key":"religion","type":"select","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"shelter":{"key":"shelter","type":"check"},"surface":{"key":"surface","type":"combo"},"tunnel":{"key":"tunnel","type":"check"}}
\ No newline at end of file
diff --git a/data/presets/forms/access.json b/data/presets/forms/access.json
new file mode 100644
index 000000000..4d880a5c9
--- /dev/null
+++ b/data/presets/forms/access.json
@@ -0,0 +1,4 @@
+{
+    "key": "access",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/address.json b/data/presets/forms/address.json
new file mode 100644
index 000000000..297019dab
--- /dev/null
+++ b/data/presets/forms/address.json
@@ -0,0 +1,4 @@
+{
+    "type": "address",
+    "title": "Address"
+}
\ No newline at end of file
diff --git a/data/presets/forms/atm.json b/data/presets/forms/atm.json
new file mode 100644
index 000000000..ed808c72a
--- /dev/null
+++ b/data/presets/forms/atm.json
@@ -0,0 +1,4 @@
+{
+    "key": "atm",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/bridge.json b/data/presets/forms/bridge.json
new file mode 100644
index 000000000..0324d133a
--- /dev/null
+++ b/data/presets/forms/bridge.json
@@ -0,0 +1,4 @@
+{
+    "key": "bridge",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/building.json b/data/presets/forms/building.json
new file mode 100644
index 000000000..87257d332
--- /dev/null
+++ b/data/presets/forms/building.json
@@ -0,0 +1,4 @@
+{
+    "key": "building",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/building_area.json b/data/presets/forms/building_area.json
new file mode 100644
index 000000000..7c77541b4
--- /dev/null
+++ b/data/presets/forms/building_area.json
@@ -0,0 +1,7 @@
+{
+    "key": "building",
+    "type": "check",
+    "default": {
+        "area": "yes"
+    }
+}
\ No newline at end of file
diff --git a/data/presets/forms/building_yes.json b/data/presets/forms/building_yes.json
new file mode 100644
index 000000000..f0f028e13
--- /dev/null
+++ b/data/presets/forms/building_yes.json
@@ -0,0 +1,7 @@
+{
+    "key": "building",
+    "type": "combo",
+    "default": {
+        "area": "yes"
+    }
+}
\ No newline at end of file
diff --git a/data/presets/forms/cuisine.json b/data/presets/forms/cuisine.json
new file mode 100644
index 000000000..0895fdbc6
--- /dev/null
+++ b/data/presets/forms/cuisine.json
@@ -0,0 +1,5 @@
+{
+    "key": "cuisine",
+    "type": "combo",
+    "indexed": true
+}
\ No newline at end of file
diff --git a/data/presets/forms/denomination.json b/data/presets/forms/denomination.json
new file mode 100644
index 000000000..b3ee85ffa
--- /dev/null
+++ b/data/presets/forms/denomination.json
@@ -0,0 +1,4 @@
+{
+    "key": "denomination",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/elevation.json b/data/presets/forms/elevation.json
new file mode 100644
index 000000000..3793abbc0
--- /dev/null
+++ b/data/presets/forms/elevation.json
@@ -0,0 +1,4 @@
+{
+    "key": "ele",
+    "type": "number"
+}
\ No newline at end of file
diff --git a/data/presets/forms/emergency.json b/data/presets/forms/emergency.json
new file mode 100644
index 000000000..aa58e9f80
--- /dev/null
+++ b/data/presets/forms/emergency.json
@@ -0,0 +1,4 @@
+{
+    "key": "emergency",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/fee.json b/data/presets/forms/fee.json
new file mode 100644
index 000000000..d2ef7da4a
--- /dev/null
+++ b/data/presets/forms/fee.json
@@ -0,0 +1,4 @@
+{
+    "key": "fee",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/internet_access.json b/data/presets/forms/internet_access.json
new file mode 100644
index 000000000..d92790758
--- /dev/null
+++ b/data/presets/forms/internet_access.json
@@ -0,0 +1,12 @@
+{
+    "key": "internet_access",
+    "title": "Internet Access",
+    "type": "select",
+    "options": [
+        "yes",
+        "no",
+        "wlan",
+        "wired",
+        "terminal"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/forms/layer.json b/data/presets/forms/layer.json
new file mode 100644
index 000000000..162dbfeb9
--- /dev/null
+++ b/data/presets/forms/layer.json
@@ -0,0 +1,4 @@
+{
+    "key": "layer",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/levels.json b/data/presets/forms/levels.json
new file mode 100644
index 000000000..c96a9e16a
--- /dev/null
+++ b/data/presets/forms/levels.json
@@ -0,0 +1,5 @@
+{
+    "key": "building:levels",
+    "type": "number",
+    "title": "Levels"
+}
\ No newline at end of file
diff --git a/data/presets/forms/maxspeed.json b/data/presets/forms/maxspeed.json
new file mode 100644
index 000000000..cb8e160f2
--- /dev/null
+++ b/data/presets/forms/maxspeed.json
@@ -0,0 +1,4 @@
+{
+    "key": "maxspeed",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/oneway.json b/data/presets/forms/oneway.json
new file mode 100644
index 000000000..490e9fb8b
--- /dev/null
+++ b/data/presets/forms/oneway.json
@@ -0,0 +1,4 @@
+{
+    "key": "oneway",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/operator.json b/data/presets/forms/operator.json
new file mode 100644
index 000000000..4d63e6501
--- /dev/null
+++ b/data/presets/forms/operator.json
@@ -0,0 +1,4 @@
+{
+    "key": "operator",
+    "type": "text"
+}
\ No newline at end of file
diff --git a/data/presets/forms/religion.json b/data/presets/forms/religion.json
new file mode 100644
index 000000000..bdea4c0e4
--- /dev/null
+++ b/data/presets/forms/religion.json
@@ -0,0 +1,13 @@
+{
+    "key": "religion",
+    "type": "select",
+    "options": [
+        "christian",
+        "muslim",
+        "buddhist",
+        "jewish",
+        "hindu",
+        "shinto",
+        "taoist"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/forms/shelter.json b/data/presets/forms/shelter.json
new file mode 100644
index 000000000..521a8dc47
--- /dev/null
+++ b/data/presets/forms/shelter.json
@@ -0,0 +1,4 @@
+{
+    "key": "shelter",
+    "type": "check"
+}
\ No newline at end of file
diff --git a/data/presets/forms/surface.json b/data/presets/forms/surface.json
new file mode 100644
index 000000000..0ec8555d8
--- /dev/null
+++ b/data/presets/forms/surface.json
@@ -0,0 +1,4 @@
+{
+    "key": "surface",
+    "type": "combo"
+}
\ No newline at end of file
diff --git a/data/presets/forms/tunnel.json b/data/presets/forms/tunnel.json
new file mode 100644
index 000000000..7dc884028
--- /dev/null
+++ b/data/presets/forms/tunnel.json
@@ -0,0 +1,4 @@
+{
+    "key": "tunnel",
+    "type": "check"
+}
\ No newline at end of file