diff --git a/docs/GraFx-Fonts/index.md b/docs/GraFx-Fonts/index.md
index e55e5caa..9b09797b 100644
--- a/docs/GraFx-Fonts/index.md
+++ b/docs/GraFx-Fonts/index.md
@@ -23,4 +23,4 @@ erDiagram
   GraFx-Publisher-Fonts {
   	has fonts
   }  
-```
+```
\ No newline at end of file
diff --git a/docs/GraFx-Studio/concepts/actions/actioncode.png b/docs/GraFx-Studio/concepts/actions/actioncode.png
index e58bba19..d589d2ee 100644
Binary files a/docs/GraFx-Studio/concepts/actions/actioncode.png and b/docs/GraFx-Studio/concepts/actions/actioncode.png differ
diff --git a/docs/GraFx-Studio/concepts/actions/index.md b/docs/GraFx-Studio/concepts/actions/index.md
index b939165c..8b1fae19 100644
--- a/docs/GraFx-Studio/concepts/actions/index.md
+++ b/docs/GraFx-Studio/concepts/actions/index.md
@@ -48,6 +48,6 @@ The second tab in the Trigger popup screen shows the Action editor.
 
 Enter your JavaScript code that should be executed.
 
-![screenshot](actioncode.png)
+![image](actioncode.png)
 
 See further [How to create an action](/GraFx-Studio/guides/actions/create/) and [Intro to writing JavaScript](/GraFx-Studio/guides/actions/javascript/)
\ No newline at end of file
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/action.png b/docs/GraFx-Studio/concepts/grafx-genie/action.png
new file mode 100644
index 00000000..7268daf9
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/action.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/action2.png b/docs/GraFx-Studio/concepts/grafx-genie/action2.png
new file mode 100644
index 00000000..79c71c78
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/action2.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/genie-icon.png b/docs/GraFx-Studio/concepts/grafx-genie/genie-icon.png
new file mode 100644
index 00000000..3199b8c9
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/genie-icon.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/genie-in-action.gif b/docs/GraFx-Studio/concepts/grafx-genie/genie-in-action.gif
new file mode 100644
index 00000000..fc48394a
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/genie-in-action.gif differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/genie1.png b/docs/GraFx-Studio/concepts/grafx-genie/genie1.png
new file mode 100644
index 00000000..8329170b
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/genie1.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/genie2.png b/docs/GraFx-Studio/concepts/grafx-genie/genie2.png
new file mode 100644
index 00000000..966fb6ea
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/genie2.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/index.md b/docs/GraFx-Studio/concepts/grafx-genie/index.md
new file mode 100644
index 00000000..43e5737d
--- /dev/null
+++ b/docs/GraFx-Studio/concepts/grafx-genie/index.md
@@ -0,0 +1,57 @@
+# GraFx Genie for Actions (experimental)
+
+!!! example "Experimental"
+	To give you early access to the latest and greatest, we will release some features as "**Experimental**". This means you can use them, but the final implementation might change. So don't use this in production.
+
+## Introduction
+
+You need to write an Action, to make your template into a Smart Template.
+
+Challenge: You don't know how to write JavaScript code, to make this happen.
+
+GraFx Genie is your go-to smart assistant for crafting [actions](/GraFx-Studio/guides/actions/create/) to support your templates. 
+
+It's designed to assist you in creating actions, which play a vital role within triggers. See also: [Introduction to Actions](/GraFx-Studio/concepts/actions/)
+
+## Example
+
+You have a retail template. A variable field allows the users of the template to enter a discount percentage.
+When the discount drops below — let's say — 30%, you (as a template designer) want to show an extra asset, to hi-light the steep discount.
+
+![image](template.png)
+
+A variable makes sure a user can change the discount.
+
+![image](variable.png)
+
+Now, let's make an action, that will be triggerd with a variable value changes.
+
+![image](trigger.png)
+
+To create the action, click on the Action tab.
+
+![image](action.png)
+
+You can now ask Genie to write the script for you.
+
+Click on the GraFx Genie icon.
+
+![image](genie-icon.png)
+
+![image](genie1.png)
+
+And ask Genie what functionality you need in your Smart Template
+
+![image](genie2.png)
+
+Genie will now suggest a JavaScript you can use to perform the functionality.
+
+![image](action2.png)
+
+As you see, Genie knows about the context. Without specifiing that discount is a variable name, it will understand and use this information to write the script.
+
+If you're not 100% convinced, you can still tweak the script, or ask a Developer colleague to take a look for the final touches.
+
+The result:
+
+![image](genie-in-action.gif)
\ No newline at end of file
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/template.png b/docs/GraFx-Studio/concepts/grafx-genie/template.png
new file mode 100644
index 00000000..6add5858
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/template.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/trigger.png b/docs/GraFx-Studio/concepts/grafx-genie/trigger.png
new file mode 100644
index 00000000..00c12a7f
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/trigger.png differ
diff --git a/docs/GraFx-Studio/concepts/grafx-genie/variable.png b/docs/GraFx-Studio/concepts/grafx-genie/variable.png
new file mode 100644
index 00000000..f24f377c
Binary files /dev/null and b/docs/GraFx-Studio/concepts/grafx-genie/variable.png differ
diff --git a/mkdocs.yml b/mkdocs.yml
index a3c47bfb..b0500298 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -185,6 +185,7 @@ nav:
             - 'Snapping':                       'GraFx-Studio/concepts/snapping/index.md'
             - 'Shapes':                         'GraFx-Studio/concepts/shapes/index.md'
             - 'Actions':                        'GraFx-Studio/concepts/actions/index.md'
+            - 'GraFx Genie':                    'GraFx-Studio/concepts/grafx-genie/index.md'
             - 'Action Helper Functions':        'GraFx-Studio/concepts/helper-functions/index.md'
             - 'Variables':                      'GraFx-Studio/concepts/variables/index.md'
             - 'Crop':                           'GraFx-Studio/concepts/crop/index.md'