diff --git a/.gitignore b/.gitignore
index e3a264c..1b83512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,5 @@ mopidy.log*
 node_modules/
 nosetests.xml
 .project
-
 *.pbxproj
-
-Mopidy Webclient/Mopidy Webclient.xcodeproj/project.pbxproj
+*.egg-info
diff --git a/AUTHORS b/AUTHORS
index ff4fdd8..ba92d46 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ Webclient
 - Wouter van Wijk
 - Flat Interface: Ulrich Lichtenegger
 - Kingosticks
+- Szymon Nowak
 
 Mopidy:
 https://github.com/mopidy/mopidy/blob/develop/AUTHORS
diff --git a/MANIFEST.in b/MANIFEST.in
index e713a31..6c97bbd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,5 +4,4 @@ include MANIFEST.in
 include README.rst
 include mopidy_musicbox_webclient/ext.conf
 
-recursive-include screenshots *
 recursive-include mopidy_musicbox_webclient/static *
diff --git a/README.rst b/README.rst
index 72e5453..a3b5b64 100644
--- a/README.rst
+++ b/README.rst
@@ -54,7 +54,19 @@ Project resources
 Changelog
 =========
 
-v1.0.0
+v1.0.2 Dev
+-------------------
+
+- Search: select service to search in
+- Youtube icons
+- Fixed single quote bug #39
+
+v1.0.1 (20-9-2014)
+-------------------
+
+- Small fixes for Pypi distro
+
+v1.0.0 (20-9-2014)
 -------------------
 
 - Compatible with Mopidy v0.19
diff --git a/mopidy_musicbox_webclient/__init__.py b/mopidy_musicbox_webclient/__init__.py
index 5e12549..d517b27 100644
--- a/mopidy_musicbox_webclient/__init__.py
+++ b/mopidy_musicbox_webclient/__init__.py
@@ -5,7 +5,7 @@ import os
 from mopidy import config, ext
 
 
-__version__ = '1.0.0'
+__version__ = '1.0.2'
 
 
 class MusicBoxExtension(ext.Extension):
diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
index 928e9f8..b77bf42 100644
--- a/mopidy_musicbox_webclient/static/index.html
+++ b/mopidy_musicbox_webclient/static/index.html
@@ -283,6 +283,9 @@
 <div data-role="content" class="pane" id="searchpane">
     <div class="">
         <form>
+            <select id="selectSearchService" data-native-menu="false"> <!-- multiple="multiple" data-native-menu="false">
+                <option data-placeholder="true">Choose services</option> -->
+            </select>
             <input id="searchinput" class="span2" data-clear-btn="true"
                    onkeypress="return searchPressed(event.keyCode);" id="appendedInputButton" type="text"/>
             <button class="btn" type="button" onclick="return initSearch(event.value);">
diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index db507aa..825974e 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -312,9 +312,9 @@ function setRepeat(nwrepeat) {
         return
     }
     if (!nwrepeat) {
-        $("#repeatbt").attr('src', 'images/icons/reload_alt_18x21.png');
+        $("#repeatbt").attr('style', 'color:#7cc4e7');
     } else {
-        $("#repeatbt").attr('src', 'images/icons/reload_18x21.png');
+        $("#repeatbt").attr('style', 'color:#66FF33');
     }
     repeat = nwrepeat;
 }
@@ -324,9 +324,9 @@ function setRandom(nwrandom) {
         return
     }
     if (!nwrandom) {
-        $("#randombt").attr('src', 'images/icons/loop_alt2_24x21.png');
+        $("#randombt").attr('style', 'color:#7cc4e7');
     } else {
-        $("#randombt").attr('src', 'images/icons/loop_24x24.png');
+        $("#randombt").attr('style', 'color:#66FF33');
     }
     random = nwrandom;
 }
@@ -612,13 +612,13 @@ function saveRadioStations() {
 }
 
 function haltSystem() {
-    $.post("/haltSystem");
+    $.post("/settings/shutdown");
     toast('Stopping system...', 10000);
     setTimeout(function(){window.history.back();}, 10000);
 }
 
 function rebootSystem() {
-    $.post("/rebootSystem");
+    $.post("/settings/reboot");
     toast('Rebooting...', 10000);
     setTimeout(function(){window.history.back();}, 10000);
 }
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 70b553f..2cda817 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -77,11 +77,14 @@ TRACK_TIMER = 1000;
 //check status timer, every 5 or 10 sec
 STATUS_TIMER = 10000;
 
+//var uriHumanList = [ ['spotify', 'Spotify'], ['local', 'Local Files'], ['podcast', 'Podcasts'], ['dirble', 'Dirble'],
+//    ['tunein', 'TuneIn'], ['soundcloud', 'SoundCloud'], ['sc', 'SoundCloud'], ['gmusic', 'Google Music'], ['internetarchive', 'Internet Archive'], ['somafm', 'Soma FM'], ['yt', 'YouTube'], ['youtube', 'YouTube'], ['subsonic', 'Subsonic'] ];
+
 var uriClassList = [ ['spotify', 'fa-spotify'], ['local', 'fa-file-sound-o'], ['podcast', 'fa-rss-square'], ['dirble', 'fa-microphone'],
-    ['tunein', 'fa-headphones'], ['soundcloud', 'fa-soundcloud'], ['gmusic', 'fa-google'], ['internetarchive', 'fa-university'], ['somafm', 'fa-flask'], ['subsonic', 'fa-folder-open'] ];
+    ['tunein', 'fa-headphones'], ['soundcloud', 'fa-soundcloud'], ['sc', 'fa-soundcloud'], ['gmusic', 'fa-google'], ['internetarchive', 'fa-university'], ['somafm', 'fa-flask'], ['youtube', 'fa-youtube'], ['yt', 'fa-youtube'], ['subsonic', 'fa-folder-open'] ];
 
 var uriHumanList = [ ['spotify', 'Spotify'], ['local', 'Local Files'], ['podcast', 'Podcasts'], ['dirble', 'Dirble'],
-    ['tunein', 'TuneIn'], ['soundcloud', 'SoundCloud'], ['gmusic', 'Google Music'], ['internetarchive', 'Internet Archive'], ['somafm', 'Soma FM'], ['subsonic', 'Subsonic'] ];
+    ['tunein', 'TuneIn'], ['soundcloud', 'SoundCloud'], ['gmusic', 'Google Music'], ['internetarchive', 'Internet Archive'], ['somafm', 'Soma FM'], ['youtube', 'YouTube'], ['subsonic', 'Subsonic'] ];
 
 function scrollToTop() {
     var divtop = 0;
@@ -166,7 +169,6 @@ function renderSongLi(song, liID, uri, playlistType){
 }
 
 function resultsToTables(results, target, uri) {
-//console.log(results, target, uri);
     if (!results) { return }
     if (target == '#currenttable') {
         playlistType = 'playTrackQueueByUri';
@@ -279,7 +281,6 @@ function resultsToTables(results, target, uri) {
 	  } //albums name
         }
     }
-//  console.log(html);
     tableid = "#" + tableid;
     $(target).html(html);
     $(target).attr('data', uri);
@@ -414,7 +415,6 @@ $.event.special.swipe = $.extend($.event.special.swipe, {
                         origin: $( event.target ),
                         offset: $('body').scrollTop()
                 };
-//	    console.log('start');
         },
 
         stop: function( event ) {
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index c4d677b..44d490d 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -120,8 +120,8 @@ function setSongInfo(data) {
         getCover(artiststext, data.album.name, '#infocover, #controlspopupimage', 'extralarge');
     } else {
 	$("#modalalbum").html('');
-	$("#infocover").attr('src', '../images/default_cover.png');
-        $("#controlspopupimage").attr('src', '../images/default_cover.png');
+	$("#infocover").attr('src', 'images/default_cover.png');
+        $("#controlspopupimage").attr('src', 'images/default_cover.png');
     }
 
     $("#modalartist").html(arttmp);
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index 1abf0e1..5c4f653 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -15,10 +15,11 @@ function searchPressed(key) {
 //init search
 function initSearch() {
     var value = $('#searchinput').val();
+    var searchService = $('#selectSearchService').val();
 
     if ((value.length < 100) && (value.length > 0)) {
         showLoading(true);
-        //hide ios/android keyboard 
+        //hide ios/android keyboard
         document.activeElement.blur();
         $("input").blur();
 
@@ -27,10 +28,29 @@ function initSearch() {
         delete customTracklists['albumresultscache'];
         delete customTracklists['trackresultscache'];
         $("#searchresults").hide();
-        mopidy.library.search({
-            any: [value]
-        }).then(processSearchResults, console.error);
-//       console.log('search sent', value);
+
+        if (searchService != 'all') {
+            mopidy.library.search({any:[value]}, [searchService + ':']).then(processSearchResults, console.error);
+        } else {
+            mopidy.getUriSchemes().then(function (schemes) {
+                var query = {},
+                    uris = [];
+
+                var regexp = $.map(schemes, function (scheme) {
+                    return '^' + scheme + ':';
+                }).join('|');
+
+                var match = value.match(regexp);
+                if (match) {
+                    var scheme = match[0];
+                    query = {uri: [value]};
+                    uris = [scheme];
+                } else {
+                    query = {any: [value]};
+                }
+                mopidy.library.search(query, uris).then(processSearchResults, console.error);
+            });
+        }
     }
 }
 
@@ -38,7 +58,6 @@ function initSearch() {
  * process results of a search
  *********************************************************/
 function processSearchResults(resultArr) {
-//    console.log('srch', resultArr);
     $(SEARCH_TRACK_TABLE).empty();
     $(SEARCH_ARTIST_TABLE).empty();
     $(SEARCH_ALBUM_TABLE).empty();
@@ -106,7 +125,7 @@ function processSearchResults(resultArr) {
     child = '';
     pattern = '<li><a href="#" onclick="return showAlbum(this.id)" id="{albumId}">';
     pattern += '<h5 data-role="heading"><i class="{class}"></i> {albumName}</h5>';
-    pattern += '<p data-role="desc">{artistName} ({albumYear})</p>';
+    pattern += '<p data-role="desc">{artistName}</p>';
     pattern += '</a></li>';
 
     for (var i = 0; i < results.albums.length; i++) {
@@ -117,13 +136,16 @@ function processSearchResults(resultArr) {
             'albumYear': results.albums[i].date,
             'class': getMediaClass(results.albums[i].uri)
         };
-
-        //console.log(i, results.albums[i].artists.length);
         if (results.albums[i].artists) {
             for (var j = 0; j < results.albums[i].artists.length; j++) {
-                tokens.artistName += results.albums[i].artists[j].name + ' ';
+                if (results.albums[i].artists[j].name) {
+                    tokens.artistName += results.albums[i].artists[j].name + ' ';
+                }
             }
         }
+        if (tokens.albumYear) {
+            tokens.artistName += '(' + tokens.albumYear + ')';
+        }
         // Add 'Show all' item after a certain number of hits.
         if (i == 4 && results.albums.length > 5) {
             child += theme(showMorePattern, {'count': results.albums.length - i});
@@ -133,7 +155,6 @@ function processSearchResults(resultArr) {
         child += theme(pattern, tokens);
     }
     // Inject list items, refresh listview and hide superfluous items.
-//    console.log(child, results.albums.length);
     $(SEARCH_ALBUM_TABLE).html(child).listview('refresh').find('.overflow').hide();
 
     $('#expandsearch').show();
@@ -259,3 +280,21 @@ function showAlbum(uri) {
     setSongInfo();
     return false;
 }
+
+function getSearchSchemes() {
+    mopidy.getUriSchemes().then(
+        function(schemesArray) {
+            var humanIndex;
+            $("#selectSearchService").children().remove().end();
+            $("#selectSearchService").append(new Option('All services', 'all'));
+            for (var i = 0; i < schemesArray.length; i++) {
+                for (var j = 0; j < uriHumanList.length; j++) {
+                    if (uriHumanList[j][0] == schemesArray[i].toLowerCase() ) {
+                        $("#selectSearchService").append(new Option(uriHumanList[j][1], schemesArray[i]));
+                    }
+                }
+            }
+            $("#selectSearchService").selectmenu( "refresh", true );
+        }, console.error
+    );
+}
\ No newline at end of file
diff --git a/setup.py b/setup.py
index b566fbf..a06411d 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
     ],
     entry_points={
         'mopidy.ext': [
-            'musicbox = mopidy_musicbox_webclient:MusicBoxExtension',
+            'musicbox_webclient = mopidy_musicbox_webclient:MusicBoxExtension',
         ],
     },
     classifiers=[