diff --git a/mRemoteNGDocumentation/images/themes/themes.png b/mRemoteNGDocumentation/images/themes/themes.png
index 8d5f7147..8f5bd65e 100644
Binary files a/mRemoteNGDocumentation/images/themes/themes.png and b/mRemoteNGDocumentation/images/themes/themes.png differ
diff --git a/mRemoteNGDocumentation/themes/darculaNG.rst b/mRemoteNGDocumentation/themes/darculaNG.rst
index 7af698af..68b46e90 100644
--- a/mRemoteNGDocumentation/themes/darculaNG.rst
+++ b/mRemoteNGDocumentation/themes/darculaNG.rst
@@ -2,7 +2,7 @@
 darculaNG
 ***********
 
-.. figure:: /images/darculaNG.png
+.. figure:: /images/themes/darculaNG.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2012Blue.rst b/mRemoteNGDocumentation/themes/vs2012Blue.rst
index 1bce77c5..9001d2fb 100644
--- a/mRemoteNGDocumentation/themes/vs2012Blue.rst
+++ b/mRemoteNGDocumentation/themes/vs2012Blue.rst
@@ -2,7 +2,7 @@
 vs2012Blue
 ***********
 
-.. figure:: /images/vs2012Blue.png
+.. figure:: /images/themes/vs2012Blue.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2012Dark.rst b/mRemoteNGDocumentation/themes/vs2012Dark.rst
index d0d3a4b4..4c9b5496 100644
--- a/mRemoteNGDocumentation/themes/vs2012Dark.rst
+++ b/mRemoteNGDocumentation/themes/vs2012Dark.rst
@@ -2,7 +2,7 @@
 vs2012Dark
 ***********
 
-.. figure:: /images/vs2012Dark.png
+.. figure:: /images/themes/vs2012Dark.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2012Light.rst b/mRemoteNGDocumentation/themes/vs2012Light.rst
index 148f0b63..6da64e17 100644
--- a/mRemoteNGDocumentation/themes/vs2012Light.rst
+++ b/mRemoteNGDocumentation/themes/vs2012Light.rst
@@ -2,7 +2,7 @@
 vs2012Light
 ***********
 
-.. figure:: /images/vs2012Light.png
+.. figure:: /images/themes/vs2012Light.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2013Blue.rst b/mRemoteNGDocumentation/themes/vs2013Blue.rst
index 4562ebbf..4c79c6b5 100644
--- a/mRemoteNGDocumentation/themes/vs2013Blue.rst
+++ b/mRemoteNGDocumentation/themes/vs2013Blue.rst
@@ -2,7 +2,7 @@
 vs2013Blue
 ***********
 
-.. figure:: /images/vs2013Blue.png
+.. figure:: /images/themes/vs2013Blue.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2013Dark.rst b/mRemoteNGDocumentation/themes/vs2013Dark.rst
index dc8980ed..937850b9 100644
--- a/mRemoteNGDocumentation/themes/vs2013Dark.rst
+++ b/mRemoteNGDocumentation/themes/vs2013Dark.rst
@@ -2,7 +2,7 @@
 vs2013Dark
 ***********
 
-.. figure:: /images/vs2013Dark.png
+.. figure:: /images/themes/vs2013Dark.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2013Light.rst b/mRemoteNGDocumentation/themes/vs2013Light.rst
index 15615f7b..42ce118b 100644
--- a/mRemoteNGDocumentation/themes/vs2013Light.rst
+++ b/mRemoteNGDocumentation/themes/vs2013Light.rst
@@ -2,7 +2,7 @@
 vs2013Light
 ***********
 
-.. figure:: /images/vs2013Light.png
+.. figure:: /images/themes/vs2013Light.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015Blue.rst b/mRemoteNGDocumentation/themes/vs2015Blue.rst
index 6ad5bf77..abd2aeb3 100644
--- a/mRemoteNGDocumentation/themes/vs2015Blue.rst
+++ b/mRemoteNGDocumentation/themes/vs2015Blue.rst
@@ -2,7 +2,7 @@
 vs2015Blue
 ***********
 
-.. figure:: /images/vs2015Blue.png
+.. figure:: /images/themes/vs2015Blue.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015Dark.rst b/mRemoteNGDocumentation/themes/vs2015Dark.rst
index c073746a..f25f3cc7 100644
--- a/mRemoteNGDocumentation/themes/vs2015Dark.rst
+++ b/mRemoteNGDocumentation/themes/vs2015Dark.rst
@@ -2,7 +2,7 @@
 vs2015Dark
 ***********
 
-.. figure:: /images/vs2015Dark.png
+.. figure:: /images/themes/vs2015Dark.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015Light.rst b/mRemoteNGDocumentation/themes/vs2015Light.rst
index 60b35b11..1cb9da4c 100644
--- a/mRemoteNGDocumentation/themes/vs2015Light.rst
+++ b/mRemoteNGDocumentation/themes/vs2015Light.rst
@@ -2,7 +2,7 @@
 vs2015Light
 ***********
 
-.. figure:: /images/vs2015Light.png
+.. figure:: /images/themes/vs2015Light.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015blueNG.rst b/mRemoteNGDocumentation/themes/vs2015blueNG.rst
index fa81c346..9ba35995 100644
--- a/mRemoteNGDocumentation/themes/vs2015blueNG.rst
+++ b/mRemoteNGDocumentation/themes/vs2015blueNG.rst
@@ -2,7 +2,7 @@
 vs2015blueNG
 ***********
 
-.. figure:: /images/vs2015blueNG.png
+.. figure:: /images/themes/vs2015blueNG.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015darkNG.rst b/mRemoteNGDocumentation/themes/vs2015darkNG.rst
index 0dfaa4ad..a83ecec3 100644
--- a/mRemoteNGDocumentation/themes/vs2015darkNG.rst
+++ b/mRemoteNGDocumentation/themes/vs2015darkNG.rst
@@ -2,7 +2,7 @@
 vs2015darkNG
 ***********
 
-.. figure:: /images/vs2015darkNG.png
+.. figure:: /images/themes/vs2015darkNG.png
 
 
 
diff --git a/mRemoteNGDocumentation/themes/vs2015lightNG.rst b/mRemoteNGDocumentation/themes/vs2015lightNG.rst
index 29425709..3366f920 100644
--- a/mRemoteNGDocumentation/themes/vs2015lightNG.rst
+++ b/mRemoteNGDocumentation/themes/vs2015lightNG.rst
@@ -2,7 +2,7 @@
 vs2015lightNG
 ***********
 
-.. figure:: /images/vs2015lightNG.png
+.. figure:: /images/themes/vs2015lightNG.png