diff --git a/build.py b/build.py
index 92bd19b..6a1ce3e 100755
--- a/build.py
+++ b/build.py
@@ -590,12 +590,12 @@ for header in fileStruct:
 	# but the basic fundamental organizing unit WRT content is still the
 	# chapter.
 	githubedit = ''
-	themechanger = '<span style="float:right;padding: 0 5px 5px 5px;"><button class="theme-changer" onclick="changetheme()" title="Change Theme"></button></span>'
+	themechanger = '<span style="float:right;padding: 0 5px 5px 5px;position:relative;bottom:-5px;"><button class="theme-changer" onclick="changetheme()" title="Change Theme"></button></span>'
 
 	if level > 0:
 		if 'include' in header:
 			srcFile = open('include/' + header['include'])
-			githubedit = '<span style="float:right;padding:5px;"><a class="github-link" title="Edit in GitHub" href="' + global_githuburl + header['include'] + '"><img src="/images/github.png" alt="Edit in GitHub"/></a></span>'
+			githubedit = '<span style="float:right;padding:5px;"><a class="github-link" title="Edit in GitHub" href="' + global_githuburl + header['include'] + '"></a></span>'
 			content = srcFile.read()
 			srcFile.close()
 
diff --git a/include/latency-and-latency-compensation.html b/include/latency-and-latency-compensation.html
index 59cb284..4ef5560 100644
--- a/include/latency-and-latency-compensation.html
+++ b/include/latency-and-latency-compensation.html
@@ -51,7 +51,10 @@
   backend. While many of the concepts are true, the specifics may be different.
 </p>
 <figure>
-  <img src="/images/latency-chain.png" alt="Latency chain">
+  <img
+    src="/images/latency-chain.png"
+    alt="Latency chain"
+    class="invert-in-dark">
   <figcaption>
     Latency chain
   </figcaption>
@@ -186,7 +189,10 @@
 </p>
 
 <figure>
-  <img src="/images/jack-latency-excerpt.png" alt="Jack Latency Compensation">
+  <img
+    src="/images/jack-latency-excerpt.png"
+    alt="Jack Latency Compensation"
+    class="invert-in-dark">
   <figcaption>
     Jack Latency Compensation
   </figcaption>
diff --git a/include/timecode-generators-and-slaves.html b/include/timecode-generators-and-slaves.html
index 81ba10f..e775298 100644
--- a/include/timecode-generators-and-slaves.html
+++ b/include/timecode-generators-and-slaves.html
@@ -230,7 +230,10 @@
 </p>
 
 <figure class="center">
-  <img src="/images/ltc-transport-alignment.png" alt="LTC frame alignment">
+  <img
+    src="/images/ltc-transport-alignment.png"
+    alt="LTC frame alignment"
+    class="invert-in-dark">
   <figcaption>
     LTC frame alignment for the 525/60 TV standard
   </figcaption>
diff --git a/source/css/screen.css b/source/css/screen.css
index ef6804b..2337e19 100644
--- a/source/css/screen.css
+++ b/source/css/screen.css
@@ -343,7 +343,7 @@ body.dark-theme #content kbd.input {
 }
 
 body.dark-theme #content .warning {
-background-color: #995555;
+background-color: darkred;
 }
 
 body.dark-theme #content table tr:nth-child(2n+1) {
@@ -415,3 +415,13 @@ body.dark-theme #tree a {
   color: white;
   text-shadow: 0 0 0 white;
 }
+
+
+body.dark-theme #tree .active > a {
+  color: #FF8080;
+  text-shadow: 0 0 0 #FF8080;
+}
+
+body.dark-theme .invert-in-dark {
+  filter: invert(1);
+}