diff --git a/akka-docs/src/main/paradox/_template/projectSpecificFooter.st b/akka-docs/src/main/paradox/_template/projectSpecificFooter.st
index a10db6f4e7..4b90de6192 100644
--- a/akka-docs/src/main/paradox/_template/projectSpecificFooter.st
+++ b/akka-docs/src/main/paradox/_template/projectSpecificFooter.st
@@ -1 +1,2 @@
 <script type="text/javascript" src="$page.base$assets/js/warnOldDocs.js"></script>
+<script type="text/javascript" src="$page.base$assets/js/scalafiddle.js"></script>
diff --git a/akka-docs/src/main/paradox/actors.md b/akka-docs/src/main/paradox/actors.md
index f6bdf21159..7011e81410 100644
--- a/akka-docs/src/main/paradox/actors.md
+++ b/akka-docs/src/main/paradox/actors.md
@@ -89,7 +89,7 @@ construction.
 
 #### Here is another example that you can edit and run in the browser:
 
-@@fiddle [ActorDocSpec.scala]($code$/scala/docs/actor/ActorDocSpec.scala) { #fiddle_code height=400px extraParams=theme=light&layout=v75&passive cssStyle=width:100%; }
+@@fiddle [ActorDocSpec.scala]($code$/scala/docs/actor/ActorDocSpec.scala) { #fiddle_code template=Akka layout=v75 minheight=400px }
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/assets/js/scalafiddle.js b/akka-docs/src/main/paradox/assets/js/scalafiddle.js
new file mode 100644
index 0000000000..85bd223061
--- /dev/null
+++ b/akka-docs/src/main/paradox/assets/js/scalafiddle.js
@@ -0,0 +1,8 @@
+window.scalaFiddleTemplates = {
+  "Akka": {
+    pre: "// $FiddleDependency org.akka-js %%% akkajsactor % 1.2.5.11 \n" +
+    "// $FiddleDependency org.akka-js %%% akkajsactorstream % 1.2.5.11 \n" +
+    "// $FiddleDependency org.akka-js %%% akkajsactortyped % 1.2.5.11 \n",
+    post: ""
+  }
+}
diff --git a/akka-docs/src/main/paradox/stream/stream-quickstart.md b/akka-docs/src/main/paradox/stream/stream-quickstart.md
index 2bebca6e0d..822022c140 100644
--- a/akka-docs/src/main/paradox/stream/stream-quickstart.md
+++ b/akka-docs/src/main/paradox/stream/stream-quickstart.md
@@ -132,7 +132,7 @@ whether the stream terminated normally or exceptionally.
 <a name="here-is-another-example-that-you-can-edit-and-run-in-the-browser-"></a>
 Here is another example that you can edit and run in the browser:
 
-@@fiddle [TwitterStreamQuickstartDocSpec.scala]($code$/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #fiddle_code height=400px extraParams=theme=light&layout=v75&passive cssStyle=width:100%; }
+@@fiddle [TwitterStreamQuickstartDocSpec.scala]($code$/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #fiddle_code template=Akka layout=v75 minheight=400px }
 
 
 ## Reusable Pieces
diff --git a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
index 01d93d6eca..cd48305384 100644
--- a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
@@ -379,7 +379,6 @@ class ActorDocSpec extends AkkaSpec("""
       ponger ! Ping
     }
 
-    // $FiddleDependency org.akka-js %%% akkajsactor % 1.2.5.1
     //#fiddle_code
 
     val testProbe = new TestProbe(system)
diff --git a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
index 0028473536..0105ebf14a 100644
--- a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
@@ -159,7 +159,6 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
       .map(_.name.toUpperCase) // Convert all hashtags to upper case
       .runWith(Sink.foreach(println)) // Attach the Flow to a Sink that will finally print the hashtags
 
-      // $FiddleDependency org.akka-js %%% akkajsactorstream % 1.2.5.1
       //#fiddle_code
       .value
   }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 579749b3a5..dffaf15090 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,7 +18,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.5")
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.9")
+addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.10")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.12")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.1") // for advanced PR validation features