diff --git a/etc/templaterc b/etc/templaterc
index 60331f7fbc..67e71f8002 100644
--- a/etc/templaterc
+++ b/etc/templaterc
@@ -159,16 +159,6 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "87×49 Vistaprint Business Card"
-    (icon-name "gimp-business-card")
-    (width 1028)
-    (height 579)
-    (unit millimeters)
-    (xresolution 300.000000)
-    (yresolution 300.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
 (GimpTemplate "Toilet paper (US, 300 ppi)"
     (icon-name "gimp-toilet-paper")
     (width 1350)
@@ -181,7 +171,7 @@
     (fill-type background))
 (GimpTemplate "CD cover (300 ppi)"
     (icon-name "media-optical")
-    (width 1429)
+    (width 1417)
     (height 1417)
     (unit millimeters)
     (xresolution 300.000000)
@@ -189,7 +179,17 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Web banner leaderboard 728x90"
+(GimpTemplate "Web profile / avatar / icon 512×512"
+    (icon-name "gimp-web")
+    (width 512)
+    (height 512)
+    (unit pixels)
+    (xresolution 150)
+    (yresolution 150)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Web banner leaderboard 728×90"
     (icon-name "gimp-web")
     (width 728)
     (height 90)
@@ -199,10 +199,10 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Web banner large rectangle 336×280"
+(GimpTemplate "Web banner half page 300×600"
     (icon-name "gimp-web")
-    (width 336)
-    (height 280)
+    (width 300)
+    (height 600)
     (unit pixels)
     (xresolution 72.000000)
     (yresolution 72.000000)
@@ -219,19 +219,9 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Web banner large mobile 320×100"
+(GimpTemplate "Web banner wide skyscraper 160×600"
     (icon-name "gimp-web")
-    (width 320)
-    (height 100)
-    (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
-(GimpTemplate "Web banner large skyscraper 300×600"
-    (icon-name "gimp-web")
-    (width 300)
+    (width 160)
     (height 600)
     (unit pixels)
     (xresolution 72.000000)
@@ -239,143 +229,193 @@
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "1280×720 (HD 720p)"
-    (icon-name "gimp-video")
-    (width 1280)
-    (height 720)
+(GimpTemplate "Web banner mobile leaderboard 320×50"
+    (icon-name "gimp-web")
+    (width 320)
+    (height 50)
     (unit pixels)
     (xresolution 72.000000)
     (yresolution 72.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "1920×1080 (Full HD 1080p)"
-    (icon-name "gimp-video")
-    (width 1920)
-    (height 1080)
-    (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
-(GimpTemplate "3840x2160 (4K UHD)"
-    (icon-name "gimp-video")
-    (width 3840)
-    (height 2160)
-    (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
-(GimpTemplate "4096×2160 (Digital Cinema Initiatives 4K)"
-    (icon-name "gimp-video")
-    (width 4096)
-    (height 2160)
-    (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
-(GimpTemplate "1366×768 HD"
+(GimpTemplate "Display - 4:3 - 1024×768 (XGA)"
     (icon-name "gimp-display")
-    (width 1366)
+    (width 1024)
     (height 768)
     (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "1920×1200 WUXGA"
+(GimpTemplate "Display - 4:3 - 1152×864 (XGA+)"
+    (icon-name "gimp-display")
+    (width 1152)
+    (height 864)
+    (unit pixels)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 4:3 - 1600×1200 (UXGA)"
+    (icon-name "gimp-display")
+    (width 1600)
+    (height 1200)
+    (unit pixels)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 4:3 - 2048×1536 (QXGA)"
+    (icon-name "gimp-display")
+    (width 2048)
+    (height 1536)
+    (unit pixels)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 16:10 - 1680×1050 (WSXGA+)"
+    (icon-name "gimp-display")
+    (width 1680)
+    (height 1050)
+    (unit pixels)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 16:10 - 1920×1200 (WUXGA)"
     (icon-name "gimp-display")
     (width 1920)
     (height 1200)
     (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "2560x1600 WQXGA"
+(GimpTemplate "Display - 16:10 - 2560×1600 (WQXGA)"
     (icon-name "gimp-display")
     (width 2560)
     (height 1600)
     (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
+    (xresolution 300.000000)
+    (yresolution 300.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "3840×2160 4K UHD"
+(GimpTemplate "Display - 16:10 - 3840×2400 (WQUXGA)"
     (icon-name "gimp-display")
     (width 3840)
+    (height 2400)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 16:9 - 1280×720 (HD 720p)"
+    (icon-name "gimp-video")
+    (width 1280)
+    (height 720)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 16:9 - 1920×1080 (Full HD 1080p)"
+    (icon-name "gimp-video")
+    (width 1920)
+    (height 1080)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Display - 16:9 - 3840×2160 (4K UHD)"
+    (icon-name "gimp-video")
+    (width 3840)
     (height 2160)
     (unit pixels)
-    (xresolution 72.000000)
-    (yresolution 72.000000)
+    (xresolution 300)
+    (yresolution 300)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Apple iPhone 6/7"
-    (icon-name "gimp-smartphone")
-    (width 750)
-    (height 1334)
-    (unit millimeters)
-    (xresolution 326.000000)
-    (yresolution 326.000000)
+(GimpTemplate "Display - 16:9 - 7680×4320 (8K UHD)"
+    (icon-name "gimp-video")
+    (width 7680)
+    (height 4320)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Apple iPhone 5"
-    (icon-name "gimp-smartphone")
-    (width 640)
-    (height 1136)
-    (unit millimeters)
-    (xresolution 326.000000)
-    (yresolution 326.000000)
-    (resolution-unit inches)
-    (image-type rgb)
-    (fill-type background))
-(GimpTemplate "Apple iPad 3&4, Air"
-    (icon-name "gimp-smartphone")
+(GimpTemplate "Display - 17:9 - 2048×1080 (DCI 2K)"
+    (icon-name "gimp-video")
     (width 2048)
-    (height 2732)
-    (unit millimeters)
-    (xresolution 264.000000)
-    (yresolution 264.000000)
+    (height 1080)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Samsung Galaxy S6"
+(GimpTemplate "Display - 17:9 - 4096×2160 (DCI 4K)"
+    (icon-name "gimp-video")
+    (width 4096)
+    (height 2160)
+    (unit pixels)
+    (xresolution 300)
+    (yresolution 300)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Phone - 18.5:9 - 1440×2960"
     (icon-name "gimp-smartphone")
     (width 1440)
-    (height 2560)
-    (unit millimeters)
-    (xresolution 577.000000)
-    (yresolution 577.000000)
+    (height 2960)
+    (unit pixels)
+    (xresolution 500.000000)
+    (yresolution 500.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Samsung Galaxy S5"
+(GimpTemplate "Phone - 19:9 - 1440×3040"
     (icon-name "gimp-smartphone")
-    (width 1080)
-    (height 1920)
-    (unit millimeters)
-    (xresolution 360.000000)
-    (yresolution 360.000000)
+    (width 1440)
+    (height 3040)
+    (unit pixels)
+    (xresolution 500.000000)
+    (yresolution 500.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))
-(GimpTemplate "Samsung Galaxy Tab 2&3 10,1 inch"
+(GimpTemplate "Phone - 19.5:9 - 1440×3120"
     (icon-name "gimp-smartphone")
-    (width 800)
-    (height 1280)
-    (unit millimeters)
-    (xresolution 149.000000)
-    (yresolution 149.000000)
+    (width 1440)
+    (height 3120)
+    (unit pixels)
+    (xresolution 500.000000)
+    (yresolution 500.000000)
+    (resolution-unit inches)
+    (image-type rgb)
+    (fill-type background))
+(GimpTemplate "Phone - 20:9 - 1440×3200"
+    (icon-name "gimp-smartphone")
+    (width 1440)
+    (height 3200)
+    (unit pixels)
+    (xresolution 500.000000)
+    (yresolution 500.000000)
     (resolution-unit inches)
     (image-type rgb)
     (fill-type background))