diff --git a/src/TestWebsites/MVC/Views/Home/Bmp.cshtml b/src/TestWebsites/MVC/Views/Home/Bmp.cshtml
index 042daa2132..92632c475e 100644
--- a/src/TestWebsites/MVC/Views/Home/Bmp.cshtml
+++ b/src/TestWebsites/MVC/Views/Home/Bmp.cshtml
@@ -69,7 +69,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Watermark</h2>
-                <img src="/images/format-Penguins.bmp?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/format-Penguins.bmp?width=300&watermark=text-test&color=fff&fontsize=48&fontstyle=italic&fontopacity=100&textposition=100,100&dropshadow=true&font=arial" />
             </div>
             <div class="col-s-6">
                 <h2>Format</h2>
diff --git a/src/TestWebsites/MVC/Views/Home/Png.cshtml b/src/TestWebsites/MVC/Views/Home/Png.cshtml
index 2b1c09b197..370f154ee6 100644
--- a/src/TestWebsites/MVC/Views/Home/Png.cshtml
+++ b/src/TestWebsites/MVC/Views/Home/Png.cshtml
@@ -68,7 +68,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Watermark</h2>
-                <img src="/images/format-Penguins.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/format-Penguins.png?width=300&watermark=text-test&color=fff&fontsize=48&fontstyle=italic&fontopacity=100&textposition=100,100&dropshadow=true&font=arial" />
             </div>
             <div class="col-s-6">
                 <h2>Format</h2>
diff --git a/src/TestWebsites/MVC/Views/Home/Png8.cshtml b/src/TestWebsites/MVC/Views/Home/Png8.cshtml
index 5cc5375343..83965572bd 100644
--- a/src/TestWebsites/MVC/Views/Home/Png8.cshtml
+++ b/src/TestWebsites/MVC/Views/Home/Png8.cshtml
@@ -69,7 +69,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Watermark</h2>
-                <img src="/images/format-Penguins-8bit.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/format-Penguins-8bit.png?width=300&watermark=text-test&color=fff&fontsize=48&fontstyle=italic&fontopacity=100&textposition=100,100&dropshadow=true&font=arial" />
             </div>
             <div class="col-s-6">
                 <h2>Format</h2>
diff --git a/src/TestWebsites/MVC/Views/Home/Tiff.cshtml b/src/TestWebsites/MVC/Views/Home/Tiff.cshtml
index 3b13c8a339..2a09241e26 100644
--- a/src/TestWebsites/MVC/Views/Home/Tiff.cshtml
+++ b/src/TestWebsites/MVC/Views/Home/Tiff.cshtml
@@ -68,7 +68,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Watermark</h2>
-                <img src="/images/format-Penguins.tif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/format-Penguins.tif?width=300&watermark=text-test&color=fff&fontsize=48&fontstyle=italic&fontopacity=100&textposition=100,100&dropshadow=true&font=arial" />
             </div>
             <div class="col-s-6">
                 <h2>Format</h2>
diff --git a/src/TestWebsites/MVC/Views/Home/WebP.cshtml b/src/TestWebsites/MVC/Views/Home/WebP.cshtml
index 8c4e5442af..020647610c 100644
--- a/src/TestWebsites/MVC/Views/Home/WebP.cshtml
+++ b/src/TestWebsites/MVC/Views/Home/WebP.cshtml
@@ -69,7 +69,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Watermark</h2>
-                <img src="/images/format-Penguins.bmp?format=webp&width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/format-Penguins.bmp?format=webp&width=300&watermark=text-test&color=fff&fontsize=48&fontstyle=italic&fontopacity=100&textposition=100,100&dropshadow=true&font=arial" />
             </div>
             <div class="col-s-6">
                 <h2>Format</h2>