diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aafeace
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+#MacOS
+.DS_Store
+
+# Environment variables
+.env
\ No newline at end of file
diff --git a/api/spotify.py b/api/spotify.py
index efba289..b36d4c2 100644
--- a/api/spotify.py
+++ b/api/spotify.py
@@ -84,9 +84,10 @@ def barGen(barCount):
         left += 4
     return barCSS
 
+
 def getTemplate():
     try:
-        file = open("api/templates.json","r")
+        file = open("api/templates.json", "r")
         templates = json.loads(file.read())
         return templates["templates"][templates["current-theme"]]
     except Exception as e:
@@ -114,20 +115,24 @@ def makeSVG(data):
     else:
         item = data["item"]
         currentStatus = "Vibing to:"
-    
+
     if item["album"]["images"] == []:
         image = PLACEHOLDER_IMAGE
-    else : 
+    else:
         image = loadImageB64(item["album"]["images"][1]["url"])
 
     artistName = item["artists"][0]["name"].replace("&", "&")
     songName = item["name"].replace("&", "&")
+    songURI = item["external_urls"]["spotify"]
+    artistURI = item["artists"][0]["external_urls"]["spotify"]
 
     dataDict = {
         "contentBar": contentBar,
         "barCSS": barCSS,
         "artistName": artistName,
         "songName": songName,
+        "songURI": songURI,
+        "artistURI": artistURI,
         "image": image,
         "status": currentStatus,
     }
diff --git a/api/templates/spotify-dark.html.j2 b/api/templates/spotify-dark.html.j2
index 5d832b8..34b28e3 100644
--- a/api/templates/spotify-dark.html.j2
+++ b/api/templates/spotify-dark.html.j2
@@ -32,6 +32,7 @@
                 }
 
                 .song {
+                    width: 300px;
                     color: #f7f7f7;
                     overflow:hidden;
                     margin-top: 3px;
@@ -42,6 +43,7 @@
                 }
 
                 .artist {
+                    width: 300px;
                     color: #9f9f9f;
                     font-size: 20px;
                     margin-top: 4px;
@@ -72,6 +74,18 @@
                     animation: sound 0ms -800ms linear infinite alternate;
                 }
                 
+                .spotify-logo {
+                    position: fixed;
+                    right: 20px;
+                    top: 10px;
+                    width: 25px;
+                    filter: invert(1);
+                }
+
+                a {
+                    text-decoration: none;
+                }
+
                 div {
                     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
                 }
@@ -101,9 +115,16 @@
                 </a>
 
                 <div class="content">
-                    <div class="song">{{songName}}</div>
-                    <div class="artist">{{artistName}}</div>
-                    <div id="bars">{{contentBar|safe}}</div>
+                    <a href="{{songURI}}" target="_blank">
+                        <div class="song">{{songName}}</div>
+                    </a>
+                    <a href="{{artistURI}}" target="_blank">
+                        <div class="artist">{{artistName}}</div>
+                    </a>
+                    <div id="bars">{{contentBar|safe}}</div> 
+                    <a href="{{songURI}}" class="spotify-logo">
+                        <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Spotify</title><path d="M12 0C5.4 0 0 5.4 0 12s5.4 12 12 12 12-5.4 12-12S18.66 0 12 0zm5.521 17.34c-.24.359-.66.48-1.021.24-2.82-1.74-6.36-2.101-10.561-1.141-.418.122-.779-.179-.899-.539-.12-.421.18-.78.54-.9 4.56-1.021 8.52-.6 11.64 1.32.42.18.479.659.301 1.02zm1.44-3.3c-.301.42-.841.6-1.262.3-3.239-1.98-8.159-2.58-11.939-1.38-.479.12-1.02-.12-1.14-.6-.12-.48.12-1.021.6-1.141C9.6 9.9 15 10.561 18.72 12.84c.361.181.54.78.241 1.2zm.12-3.36C15.24 8.4 8.82 8.16 5.16 9.301c-.6.179-1.2-.181-1.38-.721-.18-.601.18-1.2.72-1.381 4.26-1.26 11.28-1.02 15.721 1.621.539.3.719 1.02.419 1.56-.299.421-1.02.599-1.559.3z"/></svg>
+                    </a>
                 </div>
             </div>
 
diff --git a/api/templates/spotify.html.j2 b/api/templates/spotify.html.j2
index a2614ac..e817bc1 100644
--- a/api/templates/spotify.html.j2
+++ b/api/templates/spotify.html.j2
@@ -31,6 +31,7 @@
                 }
 
                 .song {
+                    width: 300px;
                     color: #666;
                     overflow:hidden;
                     margin-top: 3px;
@@ -41,6 +42,7 @@
                 }
 
                 .artist {
+                    width: 300px;
                     color: #b3b3b3;
                     font-size: 20px;
                     margin-top: 4px;
@@ -71,6 +73,17 @@
                     animation: sound 0ms -800ms linear infinite alternate;
                 }
                 
+                .spotify-logo {
+                    position: fixed;
+                    right: 20px;
+                    top: 10px;
+                    width: 25px;
+                }
+
+                a {
+                    text-decoration: none;
+                }
+
                 div {
                     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
                 }
@@ -100,9 +113,16 @@
                 </a>
 
                 <div class="content">
-                    <div class="song">{{songName}}</div>
-                    <div class="artist">{{artistName}}</div>
+                    <a href="{{songURI}}" target="_blank">
+                        <div class="song">{{songName}}</div>
+                    </a>
+                    <a href="{{artistURI}}" target="_blank">
+                        <div class="artist">{{artistName}}</div>
+                    </a>
                     <div id="bars">{{contentBar|safe}}</div>
+                    <a href="{{songURI}}" class="spotify-logo">
+                        <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Spotify</title><path d="M12 0C5.4 0 0 5.4 0 12s5.4 12 12 12 12-5.4 12-12S18.66 0 12 0zm5.521 17.34c-.24.359-.66.48-1.021.24-2.82-1.74-6.36-2.101-10.561-1.141-.418.122-.779-.179-.899-.539-.12-.421.18-.78.54-.9 4.56-1.021 8.52-.6 11.64 1.32.42.18.479.659.301 1.02zm1.44-3.3c-.301.42-.841.6-1.262.3-3.239-1.98-8.159-2.58-11.939-1.38-.479.12-1.02-.12-1.14-.6-.12-.48.12-1.021.6-1.141C9.6 9.9 15 10.561 18.72 12.84c.361.181.54.78.241 1.2zm.12-3.36C15.24 8.4 8.82 8.16 5.16 9.301c-.6.179-1.2-.181-1.38-.721-.18-.601.18-1.2.72-1.381 4.26-1.26 11.28-1.02 15.721 1.621.539.3.719 1.02.419 1.56-.299.421-1.02.599-1.559.3z"/></svg>
+                    </a>
                 </div>
             </div>