diff --git a/aud/nut-joke-01.mp3 b/aud/nut-joke-01.mp3
index 0f1d4e8a13d4ca6a37062e19ae91ec1d8be982ff..aada8d88c6f229366d4f9ceb65a2be77c9853080 100644
--- a/aud/nut-joke-01.mp3
+++ b/aud/nut-joke-01.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38c75c996a6105c881285c168027507952dc9d6cb35063bf13701dbf90c31ef3
-size 33645
+oid sha256:eb1a06d7a3b7f9902b6b013f03cb6c0c9c82cf65740c77c0fece5bac8b4e10c2
+size 103862
diff --git a/aud/nut-joke-01.ogg b/aud/nut-joke-01.ogg
index 36786dee56578c992d1605a4c1ef3d8f712b0720..f914374cfbc6df5615a655fdf308bdc537395732 100644
--- a/aud/nut-joke-01.ogg
+++ b/aud/nut-joke-01.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e86c9e42c8511f519e764d536b4edff2a72c37b3470138bd9bcfc3dd1937be8
-size 35525
+oid sha256:fc8f07dbf07ebf3ffa2b05878382099dcfc6f0f3111825bec7fd80669d53ecc6
+size 111624
diff --git a/aud/nut-joke-02.mp3 b/aud/nut-joke-02.mp3
index 2c6098254caf6b2e979941c2ba643dcc7f4613ca..7031b9ed0b0751763b7cc6f439c0a269ef7ab21d 100644
--- a/aud/nut-joke-02.mp3
+++ b/aud/nut-joke-02.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:696cdd59669cc0450411b801a771f1971897834d7a4bc2855ee9fbd5c496fafc
-size 41586
+oid sha256:c6c10ce7383fc599de0e38c50f729aa86aa55cfb87d76c81132c278bf2650085
+size 31973
diff --git a/aud/nut-joke-02.ogg b/aud/nut-joke-02.ogg
index 0788d24d9c0a4877db8c613483959edfdeb211bf..bd39d869a69ea24dff6275aef0bd380d3e1c152c 100644
--- a/aud/nut-joke-02.ogg
+++ b/aud/nut-joke-02.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6a221554b134a51886f4d0b960d2987eb4450716c9726b4cb71c22490c01a93
-size 41883
+oid sha256:3c880db56a4eed9f8e1a034375924fa36aa7013fdb37881caa21aebffe37417d
+size 37386
diff --git a/aud/nut-joke-03.mp3 b/aud/nut-joke-03.mp3
index 6dfdc9950061fdff3619985598b8b9d3470ec3a4..9a2f52a8d7f4ced8e052a8650a7230e8fe12cee4 100644
--- a/aud/nut-joke-03.mp3
+++ b/aud/nut-joke-03.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:466a5c0c60a8b2c5db85a5655c826a17f85c19c2a0f93fc3daeedea7db903449
-size 34481
+oid sha256:8d449c9451d0d2aa18e394a617ae950ee4549cfcce4317dca1cfe375788f137d
+size 41586
diff --git a/aud/nut-joke-03.ogg b/aud/nut-joke-03.ogg
index 454e406a7ff974e1cc533a830981b7a2b5e44102..319392358ef697ea869e9f1057344b808903b5cb 100644
--- a/aud/nut-joke-03.ogg
+++ b/aud/nut-joke-03.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f38811868d0ffcc060442d864e8e2ddd860c7e1b110e08456d03ed3b997efe82
-size 37013
+oid sha256:585eda0506094061fab0992b31dc9ba0de774b7c345c22484ea1c0f73d5c1111
+size 46978
diff --git a/aud/nut-joke-04.mp3 b/aud/nut-joke-04.mp3
index fefc8b16be83c6864aa6ec099a5bd1fd2b5b5534..8446865cf87900195c40f9170151e77659cd2f8f 100644
--- a/aud/nut-joke-04.mp3
+++ b/aud/nut-joke-04.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12a804cc5fd339eef1b71391b4bfdef85fabe88877ce6005858c10f6e32ee57b
-size 36780
+oid sha256:3fd4a3a91b22b1a8d3ec37f16ea293ca0a1fa46f60f4331cf01d35ce6817367e
+size 60395
diff --git a/aud/nut-joke-04.ogg b/aud/nut-joke-04.ogg
index 5e83b6476e82f918fa789f380d9364c7b235ad2b..655d295db6cec6651f2291935e6a55aeeb8fb159 100644
--- a/aud/nut-joke-04.ogg
+++ b/aud/nut-joke-04.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37e9d437931c07ceda2634d3570c1cd7f5240c6132caa9add52640986e1b5ec8
-size 44615
+oid sha256:3125101e46ea74fa5fa5db70061464e17600e20af00124faf78ade0062d930fb
+size 65285
diff --git a/aud/nut-joke-05.mp3 b/aud/nut-joke-05.mp3
index dd69aee66f918c17690089df8b171e80151c2cdc..b6548d3e311596df5727cff5b68e19057b2bb037 100644
--- a/aud/nut-joke-05.mp3
+++ b/aud/nut-joke-05.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9dd23754f734c8c5bae4988e2c10a74022de846417f7963e6582a12e68cc508
-size 31555
+oid sha256:066ef0f8321752c801443714b97f4f2892bae3efcb15c6be9f112e3dd0310f38
+size 36362
diff --git a/aud/nut-joke-05.ogg b/aud/nut-joke-05.ogg
index d6c0ddc3def0187c2228f94ff1706e0c135395bb..497c6b48ceac6c56cd46814b6f417b3100f236b9 100644
--- a/aud/nut-joke-05.ogg
+++ b/aud/nut-joke-05.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a273912c7cfdca06c537a3b07a5f81d90366f0c685b2edd81db13ef8a36dd7f
-size 37083
+oid sha256:2eb44ec1570923b1632e4f2c0da62fe8ef94df2a29a30e7f6515b43790f3345a
+size 42292
diff --git a/aud/nut-joke-06.mp3 b/aud/nut-joke-06.mp3
index 61cef27326ab6df1c9b6b5ed3f929843f16bae45..87c1e40e50c079d50b57faa64d5f36b952335a2b 100644
--- a/aud/nut-joke-06.mp3
+++ b/aud/nut-joke-06.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:adb97ef6d1420948394347f85162132cc164de5dc5a5b782a12620831f7b706a
-size 48692
+oid sha256:47149de911e23a8ad9b643f3b2e9eb2cb2578b5120c872d87565ddd73437f3e3
+size 52035
diff --git a/aud/nut-joke-06.ogg b/aud/nut-joke-06.ogg
index d6afc66b4e7db1b9503d1223dee1821f13d445e8..cb88b8807ed4b6a9a7c278d061c760c6a62c503a 100644
--- a/aud/nut-joke-06.ogg
+++ b/aud/nut-joke-06.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5006ba5bb1810a6df8ae04fb7dd76cc61916740b8f4a9e848b5f0c059b5e533e
-size 53716
+oid sha256:b25ad03dd3e607dd205d30bb9891bfc22729cb065d009ec058ce3154bfb95afa
+size 57758
diff --git a/aud/nut-joke-07.mp3 b/aud/nut-joke-07.mp3
index 2b1007e52970533ce5c43f756491706e1631b1ca..0f1d4e8a13d4ca6a37062e19ae91ec1d8be982ff 100644
--- a/aud/nut-joke-07.mp3
+++ b/aud/nut-joke-07.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0136d1686e2dae3e15ba92f33b85fdc0767f800c250c163b584e5de71bbe5e8f
-size 42631
+oid sha256:38c75c996a6105c881285c168027507952dc9d6cb35063bf13701dbf90c31ef3
+size 33645
diff --git a/aud/nut-joke-07.ogg b/aud/nut-joke-07.ogg
index cf6fa6c0a2ec385c32d8dfe9352983d766ff57a5..36786dee56578c992d1605a4c1ef3d8f712b0720 100644
--- a/aud/nut-joke-07.ogg
+++ b/aud/nut-joke-07.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bed5b19678046c74b3cafce0952817d593519d8dde070a3f7233dbe09a512e1
-size 47267
+oid sha256:7e86c9e42c8511f519e764d536b4edff2a72c37b3470138bd9bcfc3dd1937be8
+size 35525
diff --git a/aud/nut-joke-08.mp3 b/aud/nut-joke-08.mp3
index 90947d20386ea6ea077e3b033330637bcf7dcc61..2c6098254caf6b2e979941c2ba643dcc7f4613ca 100644
--- a/aud/nut-joke-08.mp3
+++ b/aud/nut-joke-08.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad2ffac599576a4fc4ef457bb3acded5685dff68906eea265c17761a6e00cb9c
-size 23405
+oid sha256:696cdd59669cc0450411b801a771f1971897834d7a4bc2855ee9fbd5c496fafc
+size 41586
diff --git a/aud/nut-joke-08.ogg b/aud/nut-joke-08.ogg
index 1c2438b06672f5389829e7edd5a05a8c19eea3e2..0788d24d9c0a4877db8c613483959edfdeb211bf 100644
--- a/aud/nut-joke-08.ogg
+++ b/aud/nut-joke-08.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:004c1bddbeb9b85718e134ea23e0eeec50c9d12915e201c5a83c23b9b05fa0cf
-size 29978
+oid sha256:b6a221554b134a51886f4d0b960d2987eb4450716c9726b4cb71c22490c01a93
+size 41883
diff --git a/aud/nut-joke-09.mp3 b/aud/nut-joke-09.mp3
index 79f7d1e9282fdc5ea265911a5dd995480e17afeb..6dfdc9950061fdff3619985598b8b9d3470ec3a4 100644
--- a/aud/nut-joke-09.mp3
+++ b/aud/nut-joke-09.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:535a85a7f8175bf77be0c3b91a754c8ac8755c3f215cb5d5d2c980a08463b033
-size 46811
+oid sha256:466a5c0c60a8b2c5db85a5655c826a17f85c19c2a0f93fc3daeedea7db903449
+size 34481
diff --git a/aud/nut-joke-09.ogg b/aud/nut-joke-09.ogg
index 57b23a9c6c823ea043d97116543a686fa273861d..454e406a7ff974e1cc533a830981b7a2b5e44102 100644
--- a/aud/nut-joke-09.ogg
+++ b/aud/nut-joke-09.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1881429cbbe2dd508ee9c64cab7ee06f579e5f2887d9330a38ce62d9fdc1205e
-size 53407
+oid sha256:f38811868d0ffcc060442d864e8e2ddd860c7e1b110e08456d03ed3b997efe82
+size 37013
diff --git a/aud/nut-joke-10.mp3 b/aud/nut-joke-10.mp3
index 0990cf14e20377a983398246fb2afa8293b7ace2..fefc8b16be83c6864aa6ec099a5bd1fd2b5b5534 100644
--- a/aud/nut-joke-10.mp3
+++ b/aud/nut-joke-10.mp3
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f838acf86cf701baeaa46533afb70cb04584640e082d816575ffb80c9cf9ca1
-size 41586
+oid sha256:12a804cc5fd339eef1b71391b4bfdef85fabe88877ce6005858c10f6e32ee57b
+size 36780
diff --git a/aud/nut-joke-10.ogg b/aud/nut-joke-10.ogg
index 102ecb1adc9e58cd38a8bcda2ac7155ee9f04bef..5e83b6476e82f918fa789f380d9364c7b235ad2b 100644
--- a/aud/nut-joke-10.ogg
+++ b/aud/nut-joke-10.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e71491119e503cff3ba158f9a7a6fc6c16d3a5f04a9920e9d6ff1dc8b076fe34
-size 46646
+oid sha256:37e9d437931c07ceda2634d3570c1cd7f5240c6132caa9add52640986e1b5ec8
+size 44615
diff --git a/aud/nut-joke-11.mp3 b/aud/nut-joke-11.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..dd69aee66f918c17690089df8b171e80151c2cdc
--- /dev/null
+++ b/aud/nut-joke-11.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9dd23754f734c8c5bae4988e2c10a74022de846417f7963e6582a12e68cc508
+size 31555
diff --git a/aud/nut-joke-11.ogg b/aud/nut-joke-11.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d6c0ddc3def0187c2228f94ff1706e0c135395bb
--- /dev/null
+++ b/aud/nut-joke-11.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a273912c7cfdca06c537a3b07a5f81d90366f0c685b2edd81db13ef8a36dd7f
+size 37083
diff --git a/aud/nut-joke-12.mp3 b/aud/nut-joke-12.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..61cef27326ab6df1c9b6b5ed3f929843f16bae45
--- /dev/null
+++ b/aud/nut-joke-12.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adb97ef6d1420948394347f85162132cc164de5dc5a5b782a12620831f7b706a
+size 48692
diff --git a/aud/nut-joke-12.ogg b/aud/nut-joke-12.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d6afc66b4e7db1b9503d1223dee1821f13d445e8
--- /dev/null
+++ b/aud/nut-joke-12.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5006ba5bb1810a6df8ae04fb7dd76cc61916740b8f4a9e848b5f0c059b5e533e
+size 53716
diff --git a/aud/nut-joke-13.mp3 b/aud/nut-joke-13.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..2b1007e52970533ce5c43f756491706e1631b1ca
--- /dev/null
+++ b/aud/nut-joke-13.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0136d1686e2dae3e15ba92f33b85fdc0767f800c250c163b584e5de71bbe5e8f
+size 42631
diff --git a/aud/nut-joke-13.ogg b/aud/nut-joke-13.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..cf6fa6c0a2ec385c32d8dfe9352983d766ff57a5
--- /dev/null
+++ b/aud/nut-joke-13.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bed5b19678046c74b3cafce0952817d593519d8dde070a3f7233dbe09a512e1
+size 47267
diff --git a/aud/nut-joke-14.mp3 b/aud/nut-joke-14.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..90947d20386ea6ea077e3b033330637bcf7dcc61
--- /dev/null
+++ b/aud/nut-joke-14.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad2ffac599576a4fc4ef457bb3acded5685dff68906eea265c17761a6e00cb9c
+size 23405
diff --git a/aud/nut-joke-14.ogg b/aud/nut-joke-14.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..1c2438b06672f5389829e7edd5a05a8c19eea3e2
--- /dev/null
+++ b/aud/nut-joke-14.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:004c1bddbeb9b85718e134ea23e0eeec50c9d12915e201c5a83c23b9b05fa0cf
+size 29978
diff --git a/aud/nut-joke-15.mp3 b/aud/nut-joke-15.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..79f7d1e9282fdc5ea265911a5dd995480e17afeb
--- /dev/null
+++ b/aud/nut-joke-15.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:535a85a7f8175bf77be0c3b91a754c8ac8755c3f215cb5d5d2c980a08463b033
+size 46811
diff --git a/aud/nut-joke-15.ogg b/aud/nut-joke-15.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..57b23a9c6c823ea043d97116543a686fa273861d
--- /dev/null
+++ b/aud/nut-joke-15.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1881429cbbe2dd508ee9c64cab7ee06f579e5f2887d9330a38ce62d9fdc1205e
+size 53407
diff --git a/aud/nut-joke-16.mp3 b/aud/nut-joke-16.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..0990cf14e20377a983398246fb2afa8293b7ace2
--- /dev/null
+++ b/aud/nut-joke-16.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f838acf86cf701baeaa46533afb70cb04584640e082d816575ffb80c9cf9ca1
+size 41586
diff --git a/aud/nut-joke-16.ogg b/aud/nut-joke-16.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..102ecb1adc9e58cd38a8bcda2ac7155ee9f04bef
--- /dev/null
+++ b/aud/nut-joke-16.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e71491119e503cff3ba158f9a7a6fc6c16d3a5f04a9920e9d6ff1dc8b076fe34
+size 46646
diff --git a/aud/nut-joke-17.mp3 b/aud/nut-joke-17.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..05cc825882caba78ffbc8092d925252919054d45
--- /dev/null
+++ b/aud/nut-joke-17.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2dcb305484cbe32ff06c1fb9ad70eab0caa15c8a7b803af971f98a56d61d71c6
+size 46811
diff --git a/aud/nut-joke-17.ogg b/aud/nut-joke-17.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..8ee10a3b12fa420c8da219ab7964c5a5be778f64
--- /dev/null
+++ b/aud/nut-joke-17.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bb662066250ff564324ad7b910573dc69167ae20941866ad08f1865e698e54c
+size 52655
diff --git a/index.html b/index.html
index b38bfadb6f8d45d3c69cacd36beef6e7ae4f0a2c..0ec6de048c3473c89956e773144ebc74a17e0f29 100644
--- a/index.html
+++ b/index.html
@@ -75,66 +75,29 @@
 		height="100%"
 	/>
 
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-01.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-01.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-02.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-02.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-03.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-03.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-04.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-04.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-05.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-05.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-06.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-06.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-07.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-07.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-08.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-08.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-09.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-09.ogg">
-	</audio>
-
-	<audio class="random-joke" preload="auto">
-		<source type="audio/mp3" src="aud/nut-joke-10.mp3">
-		<source type="audio/ogg" src="aud/nut-joke-10.ogg">
+	<audio id="nutaud" preload="auto">
+		<source id="nutsource-mp3" type="audio/mp3" src="aud/nut-joke-01.mp3">
+		<source id="nutsource-ogg" type="audio/ogg" src="aud/nut-joke-01.ogg">
 	</audio>
 </div>
 
 <script type="application/javascript" async>
+	const totalJokes = 16
+
+	function leftPad(num, size) {
+		let s = num + "";
+		while (s.length < size) s = "0" + s;
+		return s;
+	}
+
 	document.getElementById('nutimg').addEventListener('click', function () {
-		const list = Array.from(document.querySelectorAll('.random-joke') ?? []);
-		list.forEach(aud => {
-			aud.pause();
-			aud.currentTime = 0;
-		});
-		const selected = list[Math.floor(Math.random() * list.length)];
-		selected.play();
+		const jokeNum = Math.floor(Math.random() * totalJokes) + 2;
+		document.getElementById('nutaud').pause();
+		document.getElementById('nutaud').currentTime = 0;
+		document.getElementById('nutsource-mp3').src = `aud/nut-joke-${leftPad(jokeNum, 2)}.mp3`;
+		document.getElementById('nutsource-ogg').src = `aud/nut-joke-${leftPad(jokeNum, 2)}.ogg`;
+		document.getElementById('nutaud').load();
+		document.getElementById('nutaud').play();
 	});
 </script>