diff --git a/README.md b/README.md
index 7de816df..7262a756 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 **It's in BETA** - [Get in touch](https://shuffler.io/contact), send a mail to [frikky@shuffler.io](mailto:frikky@shuffler.io) or poke me on twitter [@frikkylikeme](https://twitter.com/frikkylikeme)
 
-![Example Shuffle webhook integration](shuffle_webhook.png)
+![Example Shuffle webhook integration](https://github.com/frikky/Shuffle/blob/master/frontend/src/assets/img/shuffle_webhook.png)
 
 ## Getting started 
 * Self-hosted: Check out the [installation guide](https://github.com/frikky/shuffle/blob/master/install-guide.md) and [getting started](https://shuffler.io/docs/getting_started)
diff --git a/frontend/src/assets/img/logo.png b/frontend/src/assets/img/logo.png
new file mode 100644
index 00000000..c6826517
Binary files /dev/null and b/frontend/src/assets/img/logo.png differ
diff --git a/frontend/src/assets/img/logo.svg b/frontend/src/assets/img/logo.svg
new file mode 100644
index 00000000..3c516967
--- /dev/null
+++ b/frontend/src/assets/img/logo.svg
@@ -0,0 +1,26 @@
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
+ <!---->
+ <defs>
+  <linearGradient y2="0%" x2="100%" y1="0%" x1="0%" id="30c29011-a081-4741-b6bb-e06d8873e7b7" gradientTransform="rotate(25)">
+   <stop stop-color=" rgb(169, 37, 128)" offset="0%"/>
+   <stop stop-color=" rgb(247, 188, 0)" offset="100%"/>
+  </linearGradient>
+ </defs>
+ <!---->
+ <!---->
+ <!---->
+ <g>
+  <title>background</title>
+  <rect fill="none" id="canvas_background" height="202" width="202" y="-1" x="-1"/>
+ </g>
+ <g>
+  <title>Layer 1</title>
+  <g fill="url(#30c29011-a081-4741-b6bb-e06d8873e7b7)" transform="matrix(1.1414221157695137,0,0,1.1414221157695137,-10.343879888974278,-11.465698853151771) " id="1085c47b-b6bc-4e6d-b1f9-4301cfb34be7">
+   <switch transform="translate(2.6282968521118164,0) translate(0.0000033420565159758553,0) translate(-0.2776981592178345,0) translate(44.68110275268555,47.30940246582031) ">
+    <g id="svg_2">
+     <path id="svg_3" d="m89.141,35.617c-2.891,-12.765 -11.297,-21.212 -20.442,-25.253c11.371,10.018 21.846,29.405 8.814,47.069c-5.406,7.331 -16.217,10.228 -20.746,8.184c0,0 7.002,-1.487 11.357,-5.295c8.469,-8.017 11.299,-20.932 4.52,-32.673a25.839,25.839 0 0 0 -3.357,-4.575c-0.018,-0.021 -0.033,-0.042 -0.051,-0.062c-4.764,-5.683 -11.307,-9.075 -18.337,-10.116c-9.127,-1.715 -20.896,0.515 -29.71,8.666c-9.609,8.888 -12.721,20.391 -11.647,30.333c2.989,-14.858 14.542,-33.622 36.355,-31.171c9.053,1.019 16.965,8.932 17.461,13.877c0,0 -5.277,-8.281 -18.365,-8.281c-0.24,0.004 -0.747,0.024 -0.761,0.024l-0.167,0.01c-8.51,0.333 -16.783,4.784 -21.83,13.526a25.819,25.819 0 0 0 -2.284,5.195l-0.028,0.074c-2.539,6.968 -2.205,14.33 0.407,20.938c3.079,8.763 10.896,17.841 22.361,21.397c12.502,3.878 24.02,0.82 32.092,-5.079c-14.363,4.837 -36.389,4.216 -45.173,-15.899c-3.645,-8.35 -0.749,-19.159 3.287,-22.061c0,0 -4.534,8.71 2.012,20.044c4.482,7.484 12.617,12.658 22.949,12.658c0.498,0 4.488,-0.311 5.926,-0.633l0.08,-0.011c7.303,-1.286 13.512,-5.256 17.928,-10.822c6.05,-7.046 10.003,-18.356 7.349,-30.064z"/>
+    </g>
+   </switch>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/frontend/src/assets/img/logo.webp b/frontend/src/assets/img/logo.webp
new file mode 100644
index 00000000..d1dadedd
Binary files /dev/null and b/frontend/src/assets/img/logo.webp differ
diff --git a/shuffle_adminaccount.png b/frontend/src/assets/img/shuffle_adminaccount.png
similarity index 100%
rename from shuffle_adminaccount.png
rename to frontend/src/assets/img/shuffle_adminaccount.png
diff --git a/shuffle_webhook.png b/frontend/src/assets/img/shuffle_webhook.png
similarity index 100%
rename from shuffle_webhook.png
rename to frontend/src/assets/img/shuffle_webhook.png
diff --git a/setup.sh b/setup.sh
deleted file mode 100644
index 6ceb1699..00000000
--- a/setup.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# Build script to make it work as an open source platform 
-
-# 1. Grab builtin functions - Done in backend as a button click 
-# 2. Upload to database & build docker images
-# 3. Run docker-compose: frontend, backend, database & orborus
-# 4. Set up docker swarm for apps?
-
-# Basic overview of how it works:
-# 
-# Backend:			o
-# 							|
-# Orborus:			o
-#  		 				 / \
-# Workers: 		o   o
-# 	 				 /   / \
-# Apps: 		o   o   o
-
-# 1. Grab builtin functions
-# Where should I have these? Maybe OpenAPI github repo and just preload?
-
-echo "Building frontend"
-cd frontend
-npm run build
-rm -rf ../backend/go-app/build
-cp -r build/ ../backend/go-app/build
-
-echo "Setting up backend"
-cd ../backend/go-app
-go build
-go test
-
-#gcloud app deploy $GOPATH/src/github.com/frikky/shuffle/app.yaml
-echo "This script is not finished. Please follow the docker installation guide here: https://github.com/frikky/shuffle/blob/master/install-guide.md"