diff --git a/index.html b/index.html
index 9dc964c..b62b9d7 100644
--- a/index.html
+++ b/index.html
@@ -185,7 +185,7 @@
           </a>
           <button ng-if="debugMode" ng-click="countWatchers()">Count<br />Watchers</button>
         </div>
-        <div class="title" ng-bind-html="activeBuffer().title | linky:'_blank' | DOMfilter:'irclinky'" title="{{activeBuffer().title}}"></div>
+        <div class="title" ng-bind-html="activeBuffer().title | linky:'_system' | DOMfilter:'irclinky'" title="{{activeBuffer().title}}"></div>
         <div class="actions pull-right vertical-line-left">
           <div class="pull-left">
             <a class="settings-toggle" ng-click="showModal('settingsModal')" title="Options menu">
@@ -240,7 +240,7 @@
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text"></span></a></td><!--
            --><td class="message"><!--
              --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
-             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'inlinecolour'"></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_system' | DOMfilter:'irclinky' | DOMfilter:'inlinecolour'"></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
diff --git a/js/filters.js b/js/filters.js
index 3ca8297..a476e60 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -124,5 +124,4 @@ weechat.filter('getBufferQuickKeys', function () {
         return obj;
     };
 });
-
 })();
diff --git a/js/plugins.js b/js/plugins.js
index 88d9cae..d1b7d95 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -338,6 +338,7 @@ plugins.factory('userPlugins', function() {
     );
     yrPlugin.name = "meteogram";
 
+/*
     // Embed GitHub gists
     var gistPlugin = new Plugin(
         urlPlugin(function(url) {
@@ -390,9 +391,10 @@ plugins.factory('userPlugins', function() {
         })
     );
     tweetPlugin.name = 'Tweet';
+*/
 
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, tweetPlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin]
     };
 
 
diff --git a/test/unit/plugins.js b/test/unit/plugins.js
index 774e724..0e22980 100644
--- a/test/unit/plugins.js
+++ b/test/unit/plugins.js
@@ -119,6 +119,7 @@ describe('filter', function() {
             plugins);
         }));
 
+/*
         it('should recognize gists', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://gist.github.com/lorenzhs/e8c1a7d56fa170320eb8',
@@ -135,6 +136,7 @@ describe('filter', function() {
             'Tweet',
             plugins);
         }));
+*/
 
     });
 });