diff --git a/presets/baseball.json b/presets/baseball.json
index 805fb1d7..0a05598c 100644
--- a/presets/baseball.json
+++ b/presets/baseball.json
@@ -1,5 +1,11 @@
 {
 	"name":				"Baseball",
+	"positions": [
+						"Pitcher",
+						"Catcher",
+						"Infielder",
+						"Outfielder"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
@@ -43,8 +49,9 @@
 						{ "name" : "STRK", "equation" : "$streak", "description" : "Current streak" }
 	],
 	"metrics": [
-						"Height",
-						"Weight"
+						{ "name" : "B/T", "description": "Bats / Throws" },
+						{ "name" : "Ht", "description": "Height" },
+						{ "name" : "Wt", "description": "Weight" }
 	],
 	"statistics": [
 						{ "name" : "G", "equation" : "$eventsplayed", "description" : "Games played" },
diff --git a/presets/basketball.json b/presets/basketball.json
index 17f177b2..46b6412f 100644
--- a/presets/basketball.json
+++ b/presets/basketball.json
@@ -1,5 +1,12 @@
 {
 	"name":				"Basketball",
+	"positions": [
+						"Guard",
+						"Forward-Guard",
+						"Forward",
+						"Forward-Center",
+						"Center"
+	],
 	"outcomes": [
 						"Win",
 						"Loss"
diff --git a/presets/cricket.json b/presets/cricket.json
index 6a31fd25..d10b9c58 100644
--- a/presets/cricket.json
+++ b/presets/cricket.json
@@ -1,5 +1,11 @@
 {
 	"name":				"Cricket",
+	"positions": [
+						"Batsman",
+						"Bowler",
+						"Keeper",
+						"All-rounder"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
@@ -29,7 +35,8 @@
 	],
 	"metrics": [
 						"Height",
-						"Weight"
+						"Weight",
+						"Bat brand"
 	],
 	"statistics": [
 						{ "name" : "Appearances", "equation" : "$eventsplayed", "description" : "Matches played" }
diff --git a/presets/darts.json b/presets/darts.json
index f54430ef..050f23c9 100644
--- a/presets/darts.json
+++ b/presets/darts.json
@@ -2,8 +2,8 @@
 	"name":				"Darts",
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						"Legs"
diff --git a/presets/football.json b/presets/football.json
index 1cc7bfb3..749617a6 100644
--- a/presets/football.json
+++ b/presets/football.json
@@ -1,16 +1,19 @@
 {
 	"name":				"American Football",
 	"positions": [
-						"Back",
 						"Quarterback",
+						"Running back",
 						"Wide receiver",
+						"Tight end",
 						"Center",
-						"Tackle",
-						"Guard",
-						"Line backer",
-						"Defense end",
-						"Defense tackle",
-						"Defense back"
+						"Offensive guard",
+						"Offensive tackle",
+						"Defensive tackle",
+						"Defensive end",
+						"Middle linebacker",
+						"Outside linebacker",
+						"Cornerback",
+						"Safety"
 	],
 	"outcomes": [
 						"Win",
diff --git a/presets/handball.json b/presets/handball.json
index 5322e3a7..650719b9 100644
--- a/presets/handball.json
+++ b/presets/handball.json
@@ -1,9 +1,18 @@
 {
 	"name":				"Handball",
+	"positions": [
+						"Goalkeeper",
+						"Center back",
+						"Left back",
+						"Right back",
+						"Pivot",
+						"Left wing",
+						"Right wing"
+	],
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						{ "name" : "1st Half", "description" : "1st half goals" },
diff --git a/presets/hockey.json b/presets/ice-hockey.json
similarity index 97%
rename from presets/hockey.json
rename to presets/ice-hockey.json
index 6734ce6b..ecd30af9 100644
--- a/presets/hockey.json
+++ b/presets/ice-hockey.json
@@ -1,5 +1,10 @@
 {
 	"name":				"Ice Hockey",
+	"positions": [
+						"Forward",
+						"Defenseman",
+						"Goalie"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
diff --git a/presets/netball.json b/presets/netball.json
index cfb94565..1e9aefed 100644
--- a/presets/netball.json
+++ b/presets/netball.json
@@ -1,5 +1,14 @@
 {
 	"name":				"Netball",
+	"positions": [
+						"Goal Keeper",
+						"Goal Defense",
+						"Wing Defense",
+						"Center",
+						"Wing Attack",
+						"Goal Attack",
+						"Goal Shooter"
+	],
 	"outcomes": [
 						"Win",
 						"Loss"
diff --git a/presets/rugby.json b/presets/rugby-league.json
similarity index 90%
rename from presets/rugby.json
rename to presets/rugby-league.json
index 4b54862e..eed06904 100644
--- a/presets/rugby.json
+++ b/presets/rugby-league.json
@@ -1,5 +1,16 @@
 {
 	"name":				"Rugby League",
+	"positions": [
+						"Fullback",
+						"Wing",
+						"Centre",
+						"Five-Eighth",
+						"Halfback",
+						"Hooker",
+						"Prop",
+						"Second-row",
+						"Lock"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
diff --git a/presets/rugby-union.json b/presets/rugby-union.json
index 9f458e1f..6fd7a9a3 100644
--- a/presets/rugby-union.json
+++ b/presets/rugby-union.json
@@ -1,5 +1,17 @@
 {
 	"name":				"Rugby Union",
+	"positions": [
+						"Full-back",
+						"Wing",
+						"Centre",
+						"Fly-half",
+						"Scrum-half",
+						"Number Eight",
+						"Flanker",
+						"Lock",
+						"Hooker",
+						"Prop"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
diff --git a/presets/snooker.json b/presets/snooker.json
index b77c2a18..7e6c7fa5 100644
--- a/presets/snooker.json
+++ b/presets/snooker.json
@@ -2,8 +2,8 @@
 	"name":				"Snooker",
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						{ "name" : "Score", "description" : "Total points", "primary" : 1 }
diff --git a/presets/soccer.json b/presets/soccer.json
index f9bf17ad..7a16a118 100644
--- a/presets/soccer.json
+++ b/presets/soccer.json
@@ -8,13 +8,12 @@
 	],
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						{ "name" : "1st Half", "description" : "1st half goals" },
 						{ "name" : "2nd Half", "description" : "2nd half goals" },
-						{ "name" : "PK", "description" : "Penalty kicks" },
 						{ "name" : "Goals", "description" : "Total goals", "primary" : 1 }
 	],
 	"performance": [
diff --git a/presets/squash.json b/presets/squash.json
index e59ef556..8b331650 100644
--- a/presets/squash.json
+++ b/presets/squash.json
@@ -2,8 +2,8 @@
 	"name":				"Squash",
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						{ "name" : "G1", "description" : "1st game" },
diff --git a/presets/volleyball.json b/presets/volleyball.json
index f1f20b5c..5e8bea6f 100644
--- a/presets/volleyball.json
+++ b/presets/volleyball.json
@@ -1,5 +1,11 @@
 {
 	"name":				"Volleyball",
+	"positions": [
+						"Outside Hitter",
+						"Middle Blocker",
+						"Setter",
+						"Defender"
+	],
 	"outcomes": [
 						"Win",
 						"Loss",
@@ -34,8 +40,7 @@
 						{ "name" : "Ratio", "equation" : "$pointsfor / $pointsagainst", "precision" : 3, "priority" : 2 }
 	],
 	"metrics": [
-						"Height",
-						"Weight"
+						"Height"
 	],
 	"statistics": [
 						{ "name" : "Pct", "equation" : "( $k - $e ) / $ta", "description" : "Hitting percentage" },
diff --git a/presets/waterpolo.json b/presets/water-polo.json
similarity index 95%
rename from presets/waterpolo.json
rename to presets/water-polo.json
index f7abc970..59d27720 100644
--- a/presets/waterpolo.json
+++ b/presets/water-polo.json
@@ -1,5 +1,10 @@
 {
 	"name":				"Water Polo",
+	"positions": [
+						"Offense",
+						"Defense",
+						"Goalie"
+	],
 	"positions": [
 						"Goalkeeper",
 						"Driver",
@@ -8,8 +13,8 @@
 	],
 	"outcomes": [
 						"Win",
-						"Draw",
-						"Loss"
+						"Loss",
+						"Draw"
 	],
 	"results": [
 						{ "name" : "1st Quarter", "description" : "1st quarter goals" },