diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..5fb836f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.sh]
+indent_size = 4
diff --git a/Dockerfile b/Dockerfile
index e2b249a..0afc9e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,45 +1,52 @@
 FROM jfloff/alpine-python:2.7
 
-ENV PUID="${PUID:-1000}" PGID="${PGID:-1000}"
+ENV PUID="${PUID:-1000}"
+ENV PGID="${PGID:-1000}"
 ENV PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages"
 
 WORKDIR /mopidy
 
 RUN \
   echo "* Updating Package Repositories" \
-    && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
-    && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
-    && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+    && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
+    && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
+    && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
     && apk upgrade --no-cache \
     && pip install --upgrade pip \
   && echo "* Installing Runtime Packages" \
     && apk add -U --no-cache \
       libcdio \
       libcaca \
-      libvpx@edge \
+      libxml2-dev \
+      libxslt-dev \
+      libvpx \
       libffi-dev \
       openssl-dev \
-      v4l-utils-libs@edge \
-      python2-dev@edge \
-      py2-gst@edge \
-      py-gobject@edge \
-      su-exec@edge \
-      gstreamer@edge \
-      gst-plugins-base@edge \
-      gst-plugins-good@edge \
-      gst-plugins-ugly@edge \
+      v4l-utils-libs \
+      python2-dev \
+      py2-crypto \
+      py2-gst \
+      py-gobject \
+      su-exec \
+      gstreamer \
+      gst-plugins-base \
+      gst-plugins-good \
+      gst-plugins-ugly \
     && pip install -U \
       pyopenssl \
+      youtube-dl \
   && echo "* Installing Mopidy + Extensions" \
     && pip install -U \
       Mopidy \
       Mopidy-Iris \
+      Mopidy-SoundCloud \
+      Mopidy-GMusic \
       Mopidy-Local-Images \
       Mopidy-Local-SQLite \
   && echo "* Creating Mopidy User" \
     && addgroup -g ${PGID} mopidy \
     && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \
-  && echo "* Fixing privileges" \
+  && echo "* Fixing Privileges" \
     && mkdir -p /data/{.config,.cache} \
     && chown -R mopidy:mopidy /data \
   && echo "* Cleaning up" \
diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh
index b06e135..b8e0066 100755
--- a/root/usr/local/bin/run.sh
+++ b/root/usr/local/bin/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ ! -r /data/.config/mopidy.conf ]; then
-  mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config
+    mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config
 fi
 
 trap "kill $PID" HUP INT TERM