diff --git a/src/Makefile.am b/src/Makefile.am
index 6e6946f..f3f6b8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-extensionurl = https://github.com/Neroth/gnome-shell-extension-weather
+url = https://github.com/Neroth/gnome-shell-extension-weather
 
 # Change these to modify how installation is performed
 topextensiondir = $(datadir)/gnome-shell/extensions
@@ -25,7 +25,7 @@ EXTRA_DIST = metadata.json.in weather-settings.js.in weather-settings.desktop.in
 metadata.json: metadata.json.in $(top_builddir)/config.status
 	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
 	    -e "s|[@]uuid@|$(uuid)|" \
-	    -e "s|[@]url@|$(extensionurl)|" $< > $@
+	    -e "s|[@]url@|$(url)|" $< > $@
 
 weather-settings: weather-settings.js.in $(top_builddir)/config.status
 	$(AM_V_GEN) sed -e "s|[@]EXTENSIONDIR@|$(extensiondir)|" $< > $@
diff --git a/src/metadata.json.in b/src/metadata.json.in
index c4811af..f438d83 100644
--- a/src/metadata.json.in
+++ b/src/metadata.json.in
@@ -1,8 +1,8 @@
 {
 "uuid": "@uuid@",
-"name": "Weather indicator",
-"description": "Adds weather information menu",
-"shell-version": [ "3.1.90", "3.1.91", "3.1.92", "3.2", "3.3", "3.4" ],
+"name": "Gnome Shell Extension Weather by Neroth",
+"description": "A simple extension for displaying weather informations from several cities in GNOME Shell",
+"shell-version": [ "3.2", "3.3", "3.4" ],
 "localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
diff --git a/src/weather-settings.js.in b/src/weather-settings.js.in
index 35e5763..4fcf54f 100644
--- a/src/weather-settings.js.in
+++ b/src/weather-settings.js.in
@@ -571,7 +571,7 @@ print(location);
 	var that = this;
 	this.Window = new Gtk.Builder();
 
-	this.Window.add_from_file("/usr/share/gnome-shell/extensions/weather@gnome-shell-extensions.gnome.org/weather-settings.ui");
+	this.Window.add_from_file("@EXTENSIONDIR@/weather-settings.ui");
 
 	this.Window.get_object("main-window").title = _("Weather Settings");