diff --git a/Grafana.md b/Grafana.md
index 28ddc86..1451a87 100644
--- a/Grafana.md
+++ b/Grafana.md
@@ -1,21 +1,24 @@
-# Grafana Themes
+<h1 align="center"> <img src="https://raw.githubusercontent.com/causefx/Organizr/v2-develop/plugins/images/tabs/grafana.png" alt="logo" width="30" height="30"> Grafana</h1>
 
 Custom [Grafana](https://github.com/grafana/grafana) CSS for [Organizr](https://github.com/causefx/Organizr) homepage integration and consistent UI.
 
-![](https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/grafana.gif)
+<p align="center"> Organizr Dark Theme </p>
+
+![](https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/organizr-dark.png)
 
 ```
 https://gilbn.github.io/theme.park/CSS/themes/grafana/XXX.css
 aquamarine.css
 hotline.css
-dark.css
 plex.css
+dark.css
 space-gray.css
-organizr-dashboard.css
 organizr-dark.css
 ```
 
-### 🛠️ Installation
+
+## 🛠️ Installation
+### [[Setup|Setup]]
 Can be installed with reverse-proxy/ Stylus ect. (See wiki)
 
 Or use the theme plugin: [https://grafana.com/grafana/plugins/yesoreyeram-boomtheme-panel](https://grafana.com/grafana/plugins/yesoreyeram-boomtheme-panel)
@@ -27,7 +30,8 @@ NOTE: When viewing Grafana in Organizr iframe using `organizr-dashboard.css` it
 
 ### Check out https://technicalramblings.com/blog/spice-up-your-homepage-part-ii/
 
-![](https://technicalramblings.com/wp-content/uploads/2019/01/orgdash.jpg)
+
+<img src="https://technicalramblings.com/wp-content/uploads/2019/01/orgdash.jpg" height="500px"></img>
 
 ### **TIP:**
 Click the `kiosk` button and use that link if you don't want to show the top bar and side bar inside Organizr! There are two modes, one where the side menu and variables ect disappear and one where just the panels are visible.
@@ -36,21 +40,8 @@ Click the `kiosk` button and use that link if you don't want to show the top bar
 
 Check out my Varken dashboard here: https://grafana.com/dashboards/9558
 
-### Screenshots
-<details><summary>Expand</summary>
-<p>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/aquamarine.png"></img>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/hotline.png"></img>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/space-gray.png"></img>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/plex.jpg"></img>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/dark.png"></img>
-<img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/graforg/2.jpg"></img>
-</p>
-</details>
-
 ### Custom HTML for Organizr Homepage
 
-
 ![](https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/graforg/3.jpg)
 
 <details><summary>Expand</summary>
@@ -165,4 +156,30 @@ If you dont want the ***Panel name*** text, just remove the `<h5><span>` line en
 	</div>
 </div>
 ```
-</details>
\ No newline at end of file
+</details>
+
+## Screenshots
+
+<p align="center"> Dark Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/dark.png"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/dark.png"></img>
+
+<p align="center"> Space Gray Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/space-gray.png"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/space-gray.png"></img>
+
+<p align="center"> Plex Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/plex.jpg"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/plex.jpg"></img>
+
+<p align="center"> Organizr Dark Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/organizr-dark.png"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/organizr-dark.png"></img>
+
+<p align="center"> Hotline Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/hotline.png"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/hotline.png"></img>
+
+<p align="center"> Aquamarine Theme </p>
+
+<a href="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/aquamarine.png"><img src="https://raw.githubusercontent.com/gilbN/theme.park/master/Screenshots/grafana/aquamarine.png"></img>