diff --git a/modules/twinkleconfig.js b/modules/twinkleconfig.js
index 2f83cc6bc..8f69f85d4 100644
--- a/modules/twinkleconfig.js
+++ b/modules/twinkleconfig.js
@@ -32,6 +32,7 @@ Twinkle.config.commonSets = {
 		u1: 'U1', u2: 'U2', u5: 'U5',
 		f1: 'F1', f2: 'F2', f3: 'F3', f7: 'F7', f8: 'F8', f9: 'F9',
 		c1: 'C1', c4: 'C4',
+		t5: 'T5',
 		r2: 'R2', r3: 'R3', r4: 'R4'
 	},
 	csdCriteriaDisplayOrder: [
@@ -41,6 +42,7 @@ Twinkle.config.commonSets = {
 		'u1', 'u2', 'u5',
 		'f1', 'f2', 'f3', 'f7', 'f8', 'f9',
 		'c1', 'c4',
+		't5', 't5',
 		'r2', 'r3', 'r4'
 	],
 	csdCriteriaNotification: {
@@ -51,6 +53,7 @@ Twinkle.config.commonSets = {
 		u5: 'U5',
 		f1: 'F1', f2: 'F2', f3: 'F3', f7: 'F7', f9: 'F9',
 		c1: 'C1',
+		t5: 'T5',
 		r2: 'R2', r3: 'R3', r4: 'R4'
 	},
 	csdCriteriaNotificationDisplayOrder: [
@@ -60,6 +63,7 @@ Twinkle.config.commonSets = {
 		'u5',
 		'f1', 'f2', 'f3', 'f7', 'f9',
 		'c1',
+		't5', 't5',
 		'r2', 'r3', 'r4'
 	],
 	csdAndImageDeletionCriteria: {
@@ -69,6 +73,7 @@ Twinkle.config.commonSets = {
 		u1: 'U1', u2: 'U2', u5: 'U5',
 		f1: 'F1', f2: 'F2', f3: 'F3', f4: 'F4', f5: 'F5', f6: 'F6', f7: 'F7', f8: 'F8', f9: 'F9', f11: 'F11',
 		c1: 'C1', c4: 'C4',
+		t5: 'T5',
 		r2: 'R2', r3: 'R3', r4: 'R4'
 	},
 	csdAndImageDeletionCriteriaDisplayOrder: [
@@ -78,6 +83,7 @@ Twinkle.config.commonSets = {
 		'u1', 'u2', 'u5',
 		'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f11',
 		'c1', 'c4',
+		't5', 't5',
 		'r2', 'r3', 'r4'
 	],
 	namespacesNoSpecial: {
diff --git a/modules/twinklespeedy.js b/modules/twinklespeedy.js
index 9d685f60e..4f0c9ff79 100644
--- a/modules/twinklespeedy.js
+++ b/modules/twinklespeedy.js
@@ -301,6 +301,13 @@ Twinkle.speedy.callback.modeChanged = function twinklespeedyCallbackModeChanged(
 				}
 				break;
 
+			case 10: // template
+			case 11: // template talk
+			case 828: // module
+			case 829: // module talk
+				appendList('Templates and modules', Twinkle.speedy.templateList);
+				break;
+
 			case 14: // category
 			case 15: // category talk
 				appendList('Categories', Twinkle.speedy.categoryList);
@@ -708,6 +715,14 @@ Twinkle.speedy.categoryList = [
 	}
 ];
 
+Twinkle.speedy.templateList = [
+	{
+		label: 'T5: Unused template subpages',
+		value: 't5',
+		tooltip: 'Unused subpages of templates and Lua modules. This does not apply to /testcases and /sandbox subpages, or subpages of Module:Sandbox.'
+	}
+];
+
 Twinkle.speedy.userList = [
 	{
 		label: 'U1: User request',
@@ -1048,6 +1063,7 @@ Twinkle.speedy.normalizeHash = {
 	nopermission: 'f11',
 	catempty: 'c1',
 	c4: 'c4',
+	t5: 't5',
 	userreq: 'u1',
 	nouser: 'u2',
 	notwebhost: 'u5'