diff --git a/data/all.cup b/data/all.cup
index 6b629aa37..af3116c88 100644
--- a/data/all.cup
+++ b/data/all.cup
@@ -3,8 +3,8 @@
 (supertuxkart-cup
  (name "All tracks")
  (description "All 13 tracks included in SuperTuxKart")
- (tracks "beach" "startrack" "lighthouse" "volcano" "islandtrack" "bsodcastle" "snowtuxpeak" "littlevolcano" "olivermath" "race" "subseatrack" "tuxtrack")
- (laps      2         3            4          3          2             3            3            2               4         5         3            2)
+ (tracks "beach" "startrack" "lighthouse" "jungle" "volcano" "islandtrack" "sandtrack" "bsodcastle" "snowtuxpeak" "littlevolcano" "olivermath" "race" "city" "canyon" "subseatrack" "tuxtrack")
+ (laps      2         3            4          3        3           2             3           3            3              2               4         5     2       2          3            2)
 )
 
 ;; EOF ;;
diff --git a/data/gotm.cup b/data/gotm.cup
deleted file mode 100644
index 192d99cf1..000000000
--- a/data/gotm.cup
+++ /dev/null
@@ -1,11 +0,0 @@
-;; -*- mode: lisp -*-
-
-(supertuxkart-cup
- (name "Game-of-the-Month")
- (description "All seven tracks done by the Game of the month team")
- (herring "new")
- (tracks "beach" "lighthouse" "startrack" "volcano" "littlevolcano" "race" "subseatrack" )
- (laps      2          4           3           3           2           5         3)
-)
-
-;; EOF ;;
diff --git a/data/gp1.cup b/data/gp1.cup
new file mode 100644
index 000000000..ebfd61260
--- /dev/null
+++ b/data/gp1.cup
@@ -0,0 +1,10 @@
+;; -*- mode: lisp -*-
+
+(supertuxkart-cup
+ (name "Penguin Playground")
+ (description "First grand prix, easy to get started")
+ (tracks "tuxtrack" "race" "olivermath")
+ (laps      3          5         4)
+)
+
+;; EOF ;;
diff --git a/data/gp2.cup b/data/gp2.cup
new file mode 100644
index 000000000..0c35ddbad
--- /dev/null
+++ b/data/gp2.cup
@@ -0,0 +1,10 @@
+;; -*- mode: lisp -*-
+
+(supertuxkart-cup
+ (name "To the Moon and Back")
+ (description "Second grand prix")
+ (tracks "beach" "startrack" "jungle" "lighthouse")
+ (laps      2       3           2         4)
+)
+
+;; EOF ;;
diff --git a/data/gp3.cup b/data/gp3.cup
new file mode 100644
index 000000000..dbb370070
--- /dev/null
+++ b/data/gp3.cup
@@ -0,0 +1,10 @@
+;; -*- mode: lisp -*-
+
+(supertuxkart-cup
+ (name "Snag Drive")
+ (description "Third grand prix")
+ (tracks "islandtrack" "sandtrack" "city" "littlevolcano")
+ (laps      2               3           2          2)
+)
+
+;; EOF ;;
diff --git a/data/gp4.cup b/data/gp4.cup
new file mode 100644
index 000000000..89260764e
--- /dev/null
+++ b/data/gp4.cup
@@ -0,0 +1,10 @@
+;; -*- mode: lisp -*-
+
+(supertuxkart-cup
+ (name "At world's end")
+ (description "Last grand prix, longer and harder")
+ (tracks "bsodcastle" "canyon" "subseatrack" "volcano" "snowtuxpeak")
+ (laps       3            2       3             3           3)
+)
+
+;; EOF ;;
diff --git a/data/island.cup b/data/island.cup
deleted file mode 100644
index 0abb73cd8..000000000
--- a/data/island.cup
+++ /dev/null
@@ -1,10 +0,0 @@
-;; -*- mode: lisp -*-
-
-(supertuxkart-cup
- (name "All Island Tracks")
- (description "All three tracks on Islands")
- (tracks "beach" "lighthouse" "islandtrack" )
- (laps      2         4             2)
-)
-
-;; EOF ;;
diff --git a/data/tuxkart.cup b/data/tuxkart.cup
deleted file mode 100644
index 89585bbb3..000000000
--- a/data/tuxkart.cup
+++ /dev/null
@@ -1,11 +0,0 @@
-;; -*- mode: lisp -*-
-
-(supertuxkart-cup
- (name        "TuxKart Cup")
- (description "The original five tracks included in TuxKart")
- (herring     "old")
- (tracks      "olivermath" "bsodcastle" "tuxtrack")
- (laps              4           3             2)
-)
-
-;; EOF ;;
diff --git a/data/volcano.cup b/data/volcano.cup
deleted file mode 100644
index 44c731ece..000000000
--- a/data/volcano.cup
+++ /dev/null
@@ -1,10 +0,0 @@
-;; -*- mode: lisp -*-
-
-(supertuxkart-cup
- (name "Volcano Tracks")
- (description "All three tracks with Volcanos")
- (tracks "volcano" "bsodcastle" "littlevolcano" )
- (laps        3         3            3             3) 
-)
-
-;; EOF ;;