diff --git a/css/dialogs.css b/css/dialogs.css
index 2da2ab9fc..fd910d58b 100644
--- a/css/dialogs.css
+++ b/css/dialogs.css
@@ -44,3 +44,11 @@
 .modal-content a {
     color: #E0E0E0;
 }
+
+.modal-content .table a {
+    text-decoration: none;
+}
+
+.modal-content .table strong {
+    color: white;
+}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 2c0aff6d3..60d7380c9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,7 +30,8 @@ var nightly = false; // for nightly builds
 
 
 // scripts are provided in order to prevent any problems with the load order
-var scripts = ['./js/ap*.js', './js/controllers/*.js', './js/controllers/*/*.js', './js/directives/*.js', './js/services/*.js', './js/services/*/*.js'];
+var scripts = ['./js/ap*.js', './js/controllers/*.js', './js/controllers/*/*.js', './js/directives/*.js', './js/services/*.js', './js/services/*/*.js', '!./js/**/**/Nyaa.js'];
+
 
 /**
  * Dependencies for the app, will be rolled into deps.js
diff --git a/js/services/TorrentSearchEngines/KickassTorrents.js b/js/services/TorrentSearchEngines/KickassTorrents.js
index 17c933f08..cd7f9d4c1 100644
--- a/js/services/TorrentSearchEngines/KickassTorrents.js
+++ b/js/services/TorrentSearchEngines/KickassTorrents.js
@@ -1,7 +1,7 @@
 DuckieTV.run(["TorrentSearchEngines", "$q", "$http", "$injector",
     function(TorrentSearchEngines, $q, $http, $injector) {
 
-        TorrentSearchEngines.registerSearchEngine('KickAssTorrents', new GenericTorrentSearchEngine({
+        TorrentSearchEngines.registerSearchEngine('KickAss', new GenericTorrentSearchEngine({
             mirror: 'https://kat.cr',
             mirrorSettingsKey: 'KickAssTorrents.mirror', // where to grab custom mirror from settings.
             mirrorResolver: null, //'KickassMirrorResolver'
diff --git a/js/services/TorrentSearchEngines/Nyaa.js b/js/services/TorrentSearchEngines/Nyaa.js
index c242fb02e..6b1088f69 100644
--- a/js/services/TorrentSearchEngines/Nyaa.js
+++ b/js/services/TorrentSearchEngines/Nyaa.js
@@ -1,7 +1,7 @@
 DuckieTV.run(["TorrentSearchEngines", "$q", "$http", "$injector",
     function(TorrentSearchEngines, $q, $http, $injector) {
 
-        TorrentSearchEngines.registerSearchEngine('nyaa.se', new GenericTorrentSearchEngine({
+        TorrentSearchEngines.registerSearchEngine('Nyaa', new GenericTorrentSearchEngine({
             mirror: 'http://www.nyaa.se',
             mirrorResolver: null,
             endpoints: {
diff --git a/js/services/TorrentSearchEngines/Torrentz.eu.js b/js/services/TorrentSearchEngines/Torrentz.eu.js
index 5a92b8d69..849897e8b 100644
--- a/js/services/TorrentSearchEngines/Torrentz.eu.js
+++ b/js/services/TorrentSearchEngines/Torrentz.eu.js
@@ -1,7 +1,7 @@
 DuckieTV.run(["TorrentSearchEngines", "$q", "$http", "$injector",
     function(TorrentSearchEngines, $q, $http, $injector) {
 
-        TorrentSearchEngines.registerSearchEngine('Torrentz.eu', new GenericTorrentSearchEngine({
+        TorrentSearchEngines.registerSearchEngine('Torrentz', new GenericTorrentSearchEngine({
             mirror: 'https://torrentz.eu',
             mirrorResolver: null,
             endpoints: {
diff --git a/templates/torrentDialog.html b/templates/torrentDialog.html
index 38613165f..dcb505940 100644
--- a/templates/torrentDialog.html
+++ b/templates/torrentDialog.html
@@ -12,7 +12,7 @@ <h1>{{'TORRENTDIALOG/hdr'|translate}}</h1>
 </div>
 
 <div class="btn-group">
- <button ng-repeat="name in clients" type="button" class="btn btn-default" ng-class="{'active': searchprovider == name}" ng-click="setProvider(name)">{{name}}</button>
+ <button ng-repeat="name in clients |orderBy: name" type="button" class="btn btn-default" ng-class="{'active': searchprovider == name}" ng-click="setProvider(name)">{{name}}</button>
 </div>
 
 <table class="torrents table table-condensed white">