diff --git a/core/0001.patch b/core/0001.patch
index e4b19fc..8660afe 100644
--- a/core/0001.patch
+++ b/core/0001.patch
@@ -256,24 +256,50 @@ index 7a7ce9e..4749d4c 100644
 -    </form>
  {% endblock main %}
 diff --git a/youtube/templates/subscription_manager.html b/youtube/templates/subscription_manager.html
-index 92cd024..c8eb603 100644
+deleted file mode 100644
+index 62a8bed..0000000
 --- a/youtube/templates/subscription_manager.html
-+++ b/youtube/templates/subscription_manager.html
-@@ -16,52 +16,5 @@
- {% endmacro %}
- 
- {% block main %}
++++ /dev/null
+@@ -1,77 +0,0 @@
+-{% set page_title = 'Subscription Manager' %}
+-{% extends "base.html" %}
+-{% block style %}
+-    <link href="/youtube.com/static/subscription_manager.css" rel="stylesheet"/>
+-{% endblock style %}
+-
+-
+-{% macro subscription_list(sub_list) %}
+-    {% for subscription in sub_list %}
+-        <li class="sub-list-item {{ 'muted' if subscription['muted'] else '' }}">
+-            <input class="sub-list-checkbox" name="channel_ids" value="{{ subscription['channel_id'] }}" form="subscription-manager-form" type="checkbox">
+-            <a href="{{ subscription['channel_url'] }}" class="sub-list-item-name" title="{{ subscription['channel_name'] }}">{{ subscription['channel_name'] }}</a>
+-            <span class="tag-list">{{ ', '.join(subscription['tags']) }}</span>
+-        </li>
+-    {% endfor %}
+-{% endmacro %}
+-
+-{% block main %}
 -    <div class="import-export">
 -        <form class="subscriptions-import-form" enctype="multipart/form-data" action="/youtube.com/import_subscriptions" method="POST">
 -            <h2>Import subscriptions</h2>
--            <input type="file" id="subscriptions-import" accept="application/json, application/xml, text/x-opml" name="subscriptions_file">
--            <input type="submit" value="Import" class="import-submit-button">
+-            <div class="subscriptions-import-options">
+-                <input type="file" id="subscriptions-import" accept="application/json, application/xml, text/x-opml" name="subscriptions_file">
+-                <input type="submit" value="Import">
+-            </div>
 -        </form>
 -
--        <!--<ul class="subscriptions-export-links">
--            <li><a href="/youtube.com/subscriptions.opml">Export subscriptions (OPML)</a></li>
--            <li><a href="/youtube.com/subscriptions.xml">Export subscriptions (RSS)</a></li>
--        </ul>-->
+-        <form class="subscriptions-export-form" action="/youtube.com/export_subscriptions" method="POST">
+-            <h2>Export subscriptions</h2>
+-            <div class="subscriptions-export-options">
+-                <select id="export-type" name="export_format" title="Export format">
+-                    <option value="json">JSON</option>
+-                    <option value="opml">OPML (RSS, no tags)</option>
+-                </select>
+-                <label for="include-muted">Include muted</label>
+-                <input id="include-muted" type="checkbox" name="include_muted" checked>
+-                <input type="submit" value="Export">
+-            </div>
+-        </form>
 -    </div>
 -
 -    <hr>
@@ -310,8 +336,8 @@ index 92cd024..c8eb603 100644
 -            {{ subscription_list(sub_list) }}
 -        </ol>
 -    {% endif %}
- 
- {% endblock main %}
+-
+-{% endblock main %}
 diff --git a/youtube/templates/subscriptions.html b/youtube/templates/subscriptions.html
 index b528e5c..6302fcc 100644
 --- a/youtube/templates/subscriptions.html