5 files changed, 29 insertions, 9 deletions
diff --git a/public/css/index.css b/public/css/index.css
index b00eba41..3f391e27 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -156,6 +156,10 @@ body.night{
     left: 50%;
     transform: translate(-50%, -50%);
 }
+.night .ui-edit-area .ui-sync-toggle {
+    box-shadow: 2px 0px 2px #353535;
+}
+
 .ui-edit-area .ui-sync-toggle:active {
     box-shadow: inset 0 3px 5px rgba(0,0,0,.125), 2px 0px 2px #e7e7e7;
 }
@@ -292,6 +296,13 @@ body.night{
     background: #222;
 }
 
+.night .modal-content,
+.night .panel,
+.night .panel-heading {
+  color: #eee;
+  background-color: #333;
+}
+
 .dropdown-menu.CodeMirror-other-cursor {
     transition: none;
 }
@@ -340,7 +351,8 @@ div[contenteditable]:empty:not(:focus):before{
     background: inherit;
 }
 
-.night .navbar .btn-default{
+.night .navbar .btn-default,
+.night .close {
     background-color: #333;
     border-color: #565656;
     color: #eee;
@@ -372,8 +384,10 @@ div[contenteditable]:empty:not(:focus):before{
 
 .night .btn.focus,
 .night .btn:focus,
-.night .btn:hover{
+.night .btn:hover,
+.night .close {
     color: #fff;
+    background-color: #333;
 }
 
 .info-label {
diff --git a/public/css/markdown.css b/public/css/markdown.css
index eaa9ab5c..85a4c594 100644
--- a/public/css/markdown.css
+++ b/public/css/markdown.css
@@ -13,6 +13,10 @@
     border: inherit !important;
 }
 
+.night .markdown-body pre {
+  filter: invert(100%);
+}
+
 .markdown-body code {
     color: inherit !important;
 }
@@ -78,6 +82,7 @@
 .markdown-body code[data-gist-id] {
     background: none;
     padding: 0;
+    filter: invert(100%);
 }
 
 .markdown-body code[data-gist-id]:before {
diff --git a/public/views/shared/disqus.ejs b/public/views/shared/disqus.ejs
index cceaa85c..840d1e38 100644
--- a/public/views/shared/disqus.ejs
+++ b/public/views/shared/disqus.ejs
@@ -1,14 +1,13 @@
 <div id="disqus_thread"></div>
-<script>
+<script nonce="<%= cspNonce %>">
 var disqus_config = function () {
     this.page.identifier = window.location.pathname.split('/').slice(-1)[0];
 };
 (function() {
     var d = document, s = d.createElement('script');
-    s.src = '//<%= disqus %>.disqus.com/embed.js';
+    s.src = 'https://<%= disqus %>.disqus.com/embed.js';
     s.setAttribute('data-timestamp', +new Date());
     (d.head || d.body).appendChild(s);
 })();
 </script>
 <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-                                    
-\ No newline at end of file
diff --git a/public/views/shared/ga.ejs b/public/views/shared/ga.ejs
index 66d4acd9..27abb742 100644
--- a/public/views/shared/ga.ejs
+++ b/public/views/shared/ga.ejs
@@ -1,5 +1,5 @@
 <% if(typeof GA !== 'undefined' && GA) { %>
-<script>
+<script nonce="<%= cspNonce %>">
 (function (i, s, o, g, r, a, m) {
     i['GoogleAnalyticsObject'] = r;
     i[r] = i[r] || function () {
@@ -10,9 +10,9 @@
     a.async = 1;
     a.src = g;
     m.parentNode.insertBefore(a, m)
-})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
 
 ga('create', '<%= GA %>', 'auto');
 ga('send', 'pageview');
 </script>
-<% } %>
-\ No newline at end of file
+<% } %>
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs
index f5dc55c2..6bcf637e 100644
--- a/public/views/shared/help-modal.ejs
+++ b/public/views/shared/help-modal.ejs
@@ -17,7 +17,9 @@
                             <div class="panel-body">
                                 <a href="https://github.com/hackmdio/hackmd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a>
                                 <br>
-                                <a href="https://gitter.im/hackmdio/hackmd" target="_blank"><i class="fa fa-comments fa-fw"></i> <%= __('Meet us on Gitter') %></a>
+                                <a href="https://riot.im/app/#/room/#hackmd:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a>
+                                <br>
+                                <a href="https://gitter.im/hackmdio/hackmd" target="_blank"><i class="fa fa-comments fa-fw"></i> <%= __('Meet us on %s', 'Gitter') %></a>
                             </div>
                         </div>
                         <div class="panel panel-default">