diff --git a/resources/views/nova/meta/index.twig b/resources/views/nova/meta/index.twig
index 2b809e6..a63157b 100644
--- a/resources/views/nova/meta/index.twig
+++ b/resources/views/nova/meta/index.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@nova/master.twig' %}
 
 {% set banner_classes = user.isActive ? "banner--large" : "banner--insane landing__banner" %}
 {% set banner = user.isActive ? route('user.header', user.id) : "https://i.flash.moe/7131467636550.jpg" %}
diff --git a/resources/views/nova/status/index.twig b/resources/views/nova/status/index.twig
index 5443154..8ec8bf8 100644
--- a/resources/views/nova/status/index.twig
+++ b/resources/views/nova/status/index.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@nova/master.twig' %}
 
 {% set title = 'Status' %}
 {% set banner = '/images/status-banner.png' %}
diff --git a/resources/views/yuuno/auth/activate.twig b/resources/views/yuuno/auth/activate.twig
index 3662578..9f3d1b9 100644
--- a/resources/views/yuuno/auth/activate.twig
+++ b/resources/views/yuuno/auth/activate.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Request activation' %}
 
diff --git a/resources/views/yuuno/auth/activate_failed.twig b/resources/views/yuuno/auth/activate_failed.twig
index c43fc65..bc30d55 100644
--- a/resources/views/yuuno/auth/activate_failed.twig
+++ b/resources/views/yuuno/auth/activate_failed.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Activation failed' %}
 
diff --git a/resources/views/yuuno/auth/register.twig b/resources/views/yuuno/auth/register.twig
index 33ad330..36cd855 100644
--- a/resources/views/yuuno/auth/register.twig
+++ b/resources/views/yuuno/auth/register.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Register' %}
 
diff --git a/resources/views/yuuno/auth/resetpassword.twig b/resources/views/yuuno/auth/resetpassword.twig
index a1e6daf..2f2900f 100644
--- a/resources/views/yuuno/auth/resetpassword.twig
+++ b/resources/views/yuuno/auth/resetpassword.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Reset password' %}
 {% set verified = get.u is defined and get.k is defined %}
diff --git a/resources/views/yuuno/elements/comment.twig b/resources/views/yuuno/elements/comment.twig
index 12a4df6..7543d18 100644
--- a/resources/views/yuuno/elements/comment.twig
+++ b/resources/views/yuuno/elements/comment.twig
@@ -29,7 +29,7 @@
     <ul class="comment__replies">
         {% set comment_depth = comment_depth + 1 %}
         {% for comment in comment.replies %}
-            {% include 'elements/comment.twig' %}
+            {% include '@yuuno/elements/comment.twig' %}
         {% endfor %}
     </ul>
 </li>
diff --git a/resources/views/yuuno/elements/comments.twig b/resources/views/yuuno/elements/comments.twig
index af7abdc..05c1001 100644
--- a/resources/views/yuuno/elements/comments.twig
+++ b/resources/views/yuuno/elements/comments.twig
@@ -27,7 +27,7 @@
             {% if comments %}
                 {% for comment in comments %}
                     {% set comment_depth = 0 %}
-                    {% include 'elements/comment.twig' %}
+                    {% include '@yuuno/elements/comment.twig' %}
                 {% endfor %}
             {% else %}
                 <h1 class="comments__placeholder">There are no comments yet!</h1>
diff --git a/resources/views/yuuno/errors/403.twig b/resources/views/yuuno/errors/403.twig
index 19d0844..33a29ab 100644
--- a/resources/views/yuuno/errors/403.twig
+++ b/resources/views/yuuno/errors/403.twig
@@ -1 +1 @@
-{% include 'errors/404.twig' %}
+{% include '@yuuno/errors/404.twig' %}
diff --git a/resources/views/yuuno/forum/elements/forumBase.twig b/resources/views/yuuno/forum/elements/forumBase.twig
index 94cc0fc..3d84c4d 100644
--- a/resources/views/yuuno/forum/elements/forumBase.twig
+++ b/resources/views/yuuno/forum/elements/forumBase.twig
@@ -13,11 +13,11 @@
                     {% endif %}
                 </div>
                 {% for forum in forum.forums %}
-                    {% include 'forum/elements/forumEntry.twig' %}
+                    {% include '@yuuno/forum/elements/forumEntry.twig' %}
                 {% endfor %}
             {% endif %}
         {% else %}
-            {% include 'forum/elements/forumEntry.twig' %}
+            {% include '@yuuno/forum/elements/forumEntry.twig' %}
         {% endif %}
     {% endfor %}
 </div>
@@ -27,15 +27,15 @@
     {% set pagination_pages = topics %}
     {% set pagination_url %}{{ route('forums.forum', forum.id) }}{% endset %}
 
-    {% include 'forum/elements/forumBtns.twig' %}
+    {% include '@yuuno/forum/elements/forumBtns.twig' %}
 
     {% if forum.topics %}
         {% for topic in topics[get.page|default(1) - 1] %}
-            {% include 'forum/elements/topicEntry.twig' %}
+            {% include '@yuuno/forum/elements/topicEntry.twig' %}
         {% endfor %}
     {% else %}
         <h1 class="forum-list__empty">There are no posts in this forum!</h1>
     {% endif %}
 
-    {% include 'forum/elements/forumBtns.twig' %}
+    {% include '@yuuno/forum/elements/forumBtns.twig' %}
 {% endif %}
diff --git a/resources/views/yuuno/forum/elements/forumBtns.twig b/resources/views/yuuno/forum/elements/forumBtns.twig
index e4e42f0..aebeef0 100644
--- a/resources/views/yuuno/forum/elements/forumBtns.twig
+++ b/resources/views/yuuno/forum/elements/forumBtns.twig
@@ -1,4 +1,4 @@
-{% from 'macros.twig' import pagination %}
+{% from '@yuuno/macros.twig' import pagination %}
 
 <div class="forum-list__buttons">
     <div>
@@ -15,7 +15,7 @@
             <a href="{{ forumMarkRead }}" class="input__button"><span class="fa fa-check-square-o"></span> Mark as Read</a>
         {% endif %}
         {% if topic.id is defined and showMod is defined %}
-            {% include 'forum/elements/forumMod.twig' %}
+            {% include '@yuuno/forum/elements/forumMod.twig' %}
         {% endif %}
     </div>
     {% if pagination_url is defined %}
diff --git a/resources/views/yuuno/forum/forum.twig b/resources/views/yuuno/forum/forum.twig
index 4fae375..054125f 100644
--- a/resources/views/yuuno/forum/forum.twig
+++ b/resources/views/yuuno/forum/forum.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Forums / ' ~ forum.name %}
 {% set forumBackLink = route('forums.index') %}
@@ -7,6 +7,6 @@
 
 {% block content %}
     <div class="content">
-        {% include 'forum/elements/forumBase.twig' %}
+        {% include '@yuuno/forum/elements/forumBase.twig' %}
     </div>
 {% endblock %}
diff --git a/resources/views/yuuno/forum/index.twig b/resources/views/yuuno/forum/index.twig
index 096d591..64b9594 100644
--- a/resources/views/yuuno/forum/index.twig
+++ b/resources/views/yuuno/forum/index.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Forums' %}
 
@@ -63,7 +63,7 @@
             </div>
         </div>
         <div class="content--left">
-            {% include 'forum/elements/forumBase.twig' %}
+            {% include '@yuuno/forum/elements/forumBase.twig' %}
         </div>
         <div class="clear"></div>
     </div>
diff --git a/resources/views/yuuno/forum/topic.twig b/resources/views/yuuno/forum/topic.twig
index b939f0d..a58a9ca 100644
--- a/resources/views/yuuno/forum/topic.twig
+++ b/resources/views/yuuno/forum/topic.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set forumBackLink = route('forums.forum', forum.id) %}
 {% set title = topic is defined ? topic.title : 'Creating topic in ' ~ forum.name %}
@@ -158,7 +158,7 @@
             </span>
         </div>
 
-        {% include 'forum/elements/forumBtns.twig' %}
+        {% include '@yuuno/forum/elements/forumBtns.twig' %}
 
         <div class="posts">
 
@@ -280,9 +280,9 @@
         </div>
 
         {% if forumReplyLink is defined or topic is not defined %}
-            {% include 'forum/elements/replyForm.twig' %}
+            {% include '@yuuno/forum/elements/replyForm.twig' %}
         {% endif %}
 
-        {% include 'forum/elements/forumBtns.twig' %}
+        {% include '@yuuno/forum/elements/forumBtns.twig' %}
     </div>
 {% endblock %}
diff --git a/resources/views/yuuno/home/index.twig b/resources/views/yuuno/home/index.twig
index 4cb5f20..e0d36a8 100644
--- a/resources/views/yuuno/home/index.twig
+++ b/resources/views/yuuno/home/index.twig
@@ -1,5 +1,5 @@
-{% extends 'master.twig' %}
-{% from 'macros.twig' import news_post %}
+{% extends '@yuuno/master.twig' %}
+{% from '@yuuno/macros.twig' import news_post %}
 
 {% block content %}
     <div class="content">
diff --git a/resources/views/yuuno/info/contact.twig b/resources/views/yuuno/info/contact.twig
index 4a9d18a..05ce3ae 100644
--- a/resources/views/yuuno/info/contact.twig
+++ b/resources/views/yuuno/info/contact.twig
@@ -1,4 +1,4 @@
-{% extends 'info/master.twig' %}
+{% extends '@yuuno/info/master.twig' %}
 
 {% set title = 'Contact' %}
 
diff --git a/resources/views/yuuno/info/master.twig b/resources/views/yuuno/info/master.twig
index 11e827d..76a28ed 100644
--- a/resources/views/yuuno/info/master.twig
+++ b/resources/views/yuuno/info/master.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% block content %}
     <div class="content content--alt bbcode">
diff --git a/resources/views/yuuno/info/privacy.twig b/resources/views/yuuno/info/privacy.twig
index bfb059a..cce5728 100644
--- a/resources/views/yuuno/info/privacy.twig
+++ b/resources/views/yuuno/info/privacy.twig
@@ -1,4 +1,4 @@
-{% extends 'info/master.twig' %}
+{% extends '@yuuno/info/master.twig' %}
 
 {% set title = 'Privacy Policy' %}
 
diff --git a/resources/views/yuuno/info/rules.twig b/resources/views/yuuno/info/rules.twig
index 0402ecc..e28840d 100644
--- a/resources/views/yuuno/info/rules.twig
+++ b/resources/views/yuuno/info/rules.twig
@@ -1,4 +1,4 @@
-{% extends 'info/master.twig' %}
+{% extends '@yuuno/info/master.twig' %}
 
 {% set title = 'Rules' %}
 
diff --git a/resources/views/yuuno/info/terms.twig b/resources/views/yuuno/info/terms.twig
index b66f57d..5e66b49 100644
--- a/resources/views/yuuno/info/terms.twig
+++ b/resources/views/yuuno/info/terms.twig
@@ -1,4 +1,4 @@
-{% extends 'info/master.twig' %}
+{% extends '@yuuno/info/master.twig' %}
 
 {% set title = 'Terms of Service' %}
 
diff --git a/resources/views/yuuno/info/welcome.twig b/resources/views/yuuno/info/welcome.twig
index 9aaa8bd..abd49e4 100644
--- a/resources/views/yuuno/info/welcome.twig
+++ b/resources/views/yuuno/info/welcome.twig
@@ -1,4 +1,4 @@
-{% extends 'info/master.twig' %}
+{% extends '@yuuno/info/master.twig' %}
 
 {% set title = 'Welcome!' %}
 
diff --git a/resources/views/yuuno/manage/master.twig b/resources/views/yuuno/manage/master.twig
index 6d462b6..9d1dccd 100644
--- a/resources/views/yuuno/manage/master.twig
+++ b/resources/views/yuuno/manage/master.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = category ~ ' / ' ~ mode %}
 
diff --git a/resources/views/yuuno/manage/overview/index.twig b/resources/views/yuuno/manage/overview/index.twig
index a63f2af..c3724d4 100644
--- a/resources/views/yuuno/manage/overview/index.twig
+++ b/resources/views/yuuno/manage/overview/index.twig
@@ -1,4 +1,4 @@
-{% extends 'manage/overview/master.twig' %}
+{% extends '@yuuno/manage/overview/master.twig' %}
 
 {% set mode = 'Index' %}
 
diff --git a/resources/views/yuuno/manage/overview/master.twig b/resources/views/yuuno/manage/overview/master.twig
index f61f9aa..e7645e2 100644
--- a/resources/views/yuuno/manage/overview/master.twig
+++ b/resources/views/yuuno/manage/overview/master.twig
@@ -1,3 +1,3 @@
-{% extends 'manage/master.twig' %}
+{% extends '@yuuno/manage/master.twig' %}
 
 {% set category = 'Overview' %}
diff --git a/resources/views/yuuno/master.twig b/resources/views/yuuno/master.twig
index f51d5e2..0f9dbeb 100644
--- a/resources/views/yuuno/master.twig
+++ b/resources/views/yuuno/master.twig
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-        {% include '_layout/metadata.twig' %}
+        {% include '@yuuno/_layout/metadata.twig' %}
         <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
         <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
 
@@ -59,7 +59,7 @@
                 </div>
             </div>
 
-            {% include 'auth/header_auth.twig' %}
+            {% include '@yuuno/auth/header_auth.twig' %}
 
             <div id="contentwrapper" class="container__content">
                 <div id="notifications" class="alerts"></div>
diff --git a/resources/views/yuuno/news/category.twig b/resources/views/yuuno/news/category.twig
index 6892adb..af7bb7a 100644
--- a/resources/views/yuuno/news/category.twig
+++ b/resources/views/yuuno/news/category.twig
@@ -1,5 +1,5 @@
-{% extends 'master.twig' %}
-{% from 'macros.twig' import news_post, pagination %}
+{% extends '@yuuno/master.twig' %}
+{% from '@yuuno/macros.twig' import news_post, pagination %}
 
 {% set title = 'News' %}
 {% set posts = category.posts|batch(3) %}
diff --git a/resources/views/yuuno/news/index.twig b/resources/views/yuuno/news/index.twig
index 655570f..8aa2863 100644
--- a/resources/views/yuuno/news/index.twig
+++ b/resources/views/yuuno/news/index.twig
@@ -1,5 +1,5 @@
-{% extends 'master.twig' %}
-{% from 'macros.twig' import news_post %}
+{% extends '@yuuno/master.twig' %}
+{% from '@yuuno/macros.twig' import news_post %}
 
 {% block content %}
     <div class="content">
diff --git a/resources/views/yuuno/news/post.twig b/resources/views/yuuno/news/post.twig
index 37494f9..c8e7949 100644
--- a/resources/views/yuuno/news/post.twig
+++ b/resources/views/yuuno/news/post.twig
@@ -1,5 +1,5 @@
-{% extends 'master.twig' %}
-{% from 'macros.twig' import news_post %}
+{% extends '@yuuno/master.twig' %}
+{% from '@yuuno/macros.twig' import news_post %}
 
 {% set title = post.title %}
 
@@ -11,7 +11,7 @@
         <div class="content__header">{{ post.title }}</div>
         {{ news_post(post) }}
         <a href="{{ route('news.category', post.category.id) }}" class="input__button"><span class="fa fa-backward"></span> Back</a>
-        {% include 'elements/comments.twig' %}
+        {% include '@yuuno/elements/comments.twig' %}
     </div>
 {% endblock %}
 
diff --git a/resources/views/yuuno/premium/complete.twig b/resources/views/yuuno/premium/complete.twig
index 4c82e0d..0399f9a 100644
--- a/resources/views/yuuno/premium/complete.twig
+++ b/resources/views/yuuno/premium/complete.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Purchase complete!' %}
 
diff --git a/resources/views/yuuno/premium/error.twig b/resources/views/yuuno/premium/error.twig
index 751297b..ed2b7b3 100644
--- a/resources/views/yuuno/premium/error.twig
+++ b/resources/views/yuuno/premium/error.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Something went wrong!' %}
 
diff --git a/resources/views/yuuno/premium/index.twig b/resources/views/yuuno/premium/index.twig
index 3b5cb22..812406f 100644
--- a/resources/views/yuuno/premium/index.twig
+++ b/resources/views/yuuno/premium/index.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title %}Support {{ config('general.name') }}{% endset %}
 
diff --git a/resources/views/yuuno/profile/comments.twig b/resources/views/yuuno/profile/comments.twig
index 4fee8b1..052beca 100644
--- a/resources/views/yuuno/profile/comments.twig
+++ b/resources/views/yuuno/profile/comments.twig
@@ -3,4 +3,4 @@
 <div class="new-profile-mode-title">
     <h1>Comments</h1>
 </div>
-{% include 'elements/comments.twig' %}
+{% include '@yuuno/elements/comments.twig' %}
diff --git a/resources/views/yuuno/profile/friends.twig b/resources/views/yuuno/profile/friends.twig
index 8d52877..606aa1d 100644
--- a/resources/views/yuuno/profile/friends.twig
+++ b/resources/views/yuuno/profile/friends.twig
@@ -1,4 +1,4 @@
-{% from 'macros.twig' import pagination %}
+{% from '@yuuno/macros.twig' import pagination %}
 
 {% set friends = profile.friends(2)|batch(12) %}
 
diff --git a/resources/views/yuuno/settings/account/details.twig b/resources/views/yuuno/settings/account/details.twig
index 0aaa365..373d49c 100644
--- a/resources/views/yuuno/settings/account/details.twig
+++ b/resources/views/yuuno/settings/account/details.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/account/master.twig' %}
+{% extends '@yuuno/settings/account/master.twig' %}
 
 {% set mode = 'Details' %}
 
diff --git a/resources/views/yuuno/settings/account/master.twig b/resources/views/yuuno/settings/account/master.twig
index 3748acb..f648f67 100644
--- a/resources/views/yuuno/settings/account/master.twig
+++ b/resources/views/yuuno/settings/account/master.twig
@@ -1,3 +1,3 @@
-{% extends 'settings/master.twig' %}
+{% extends '@yuuno/settings/master.twig' %}
 
 {% set category = 'Account' %}
diff --git a/resources/views/yuuno/settings/account/profile.twig b/resources/views/yuuno/settings/account/profile.twig
index 717eb9e..5f29362 100644
--- a/resources/views/yuuno/settings/account/profile.twig
+++ b/resources/views/yuuno/settings/account/profile.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/account/master.twig' %}
+{% extends '@yuuno/settings/account/master.twig' %}
 
 {% set mode = 'Profile' %}
 
diff --git a/resources/views/yuuno/settings/account/ranks.twig b/resources/views/yuuno/settings/account/ranks.twig
index 68195aa..21d2fd8 100644
--- a/resources/views/yuuno/settings/account/ranks.twig
+++ b/resources/views/yuuno/settings/account/ranks.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/account/master.twig' %}
+{% extends '@yuuno/settings/account/master.twig' %}
 
 {% set mode = 'Ranks' %}
 
diff --git a/resources/views/yuuno/settings/account/signature.twig b/resources/views/yuuno/settings/account/signature.twig
index a0c894f..52b1043 100644
--- a/resources/views/yuuno/settings/account/signature.twig
+++ b/resources/views/yuuno/settings/account/signature.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/account/master.twig' %}
+{% extends '@yuuno/settings/account/master.twig' %}
 
 {% set mode = 'Signature' %}
 
@@ -18,5 +18,5 @@
         <button type="reset" class="input__button">Reset</button>
         <button type="button" class="input__button" onclick="settingsPreview()">Preview</button>
     </form>
-    {% include 'settings/account/_preview.twig' %}
+    {% include '@yuuno/settings/account/_preview.twig' %}
 {% endblock %}
diff --git a/resources/views/yuuno/settings/account/userpage.twig b/resources/views/yuuno/settings/account/userpage.twig
index 81a2c09..924090a 100644
--- a/resources/views/yuuno/settings/account/userpage.twig
+++ b/resources/views/yuuno/settings/account/userpage.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/account/master.twig' %}
+{% extends '@yuuno/settings/account/master.twig' %}
 
 {% set mode = 'Userpage' %}
 
@@ -18,5 +18,5 @@
         <button type="reset" class="input__button">Reset</button>
         <button type="button" class="input__button" onclick="settingsPreview()">Preview</button>
     </form>
-    {% include 'settings/account/_preview.twig' %}
+    {% include '@yuuno/settings/account/_preview.twig' %}
 {% endblock %}
diff --git a/resources/views/yuuno/settings/advanced/deactivate.twig b/resources/views/yuuno/settings/advanced/deactivate.twig
index 9c45abf..7cde762 100644
--- a/resources/views/yuuno/settings/advanced/deactivate.twig
+++ b/resources/views/yuuno/settings/advanced/deactivate.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/advanced/master.twig' %}
+{% extends '@yuuno/settings/advanced/master.twig' %}
 
 {% set mode = 'Deactivate' %}
 
diff --git a/resources/views/yuuno/settings/advanced/master.twig b/resources/views/yuuno/settings/advanced/master.twig
index 7405e89..51b9fb5 100644
--- a/resources/views/yuuno/settings/advanced/master.twig
+++ b/resources/views/yuuno/settings/advanced/master.twig
@@ -1,3 +1,3 @@
-{% extends 'settings/master.twig' %}
+{% extends '@yuuno/settings/master.twig' %}
 
 {% set category = 'Advanced' %}
diff --git a/resources/views/yuuno/settings/advanced/sessions.twig b/resources/views/yuuno/settings/advanced/sessions.twig
index ba845c4..16530ef 100644
--- a/resources/views/yuuno/settings/advanced/sessions.twig
+++ b/resources/views/yuuno/settings/advanced/sessions.twig
@@ -1,4 +1,4 @@
-{% extends 'settings/advanced/master.twig' %}
+{% extends '@yuuno/settings/advanced/master.twig' %}
 
 {% set mode = 'Sessions' %}
 
diff --git a/resources/views/yuuno/settings/friends/listing.twig b/resources/views/yuuno/settings/friends/listing.twig
index 689a354..bba235d 100644
--- a/resources/views/yuuno/settings/friends/listing.twig
+++ b/resources/views/yuuno/settings/friends/listing.twig
@@ -1,5 +1,5 @@
-{% extends 'settings/friends/master.twig' %}
-{% from 'macros.twig' import pagination %}
+{% extends '@yuuno/settings/friends/master.twig' %}
+{% from '@yuuno/macros.twig' import pagination %}
 
 {% set friends = user.friends(1)|batch(12) %}
 
diff --git a/resources/views/yuuno/settings/friends/master.twig b/resources/views/yuuno/settings/friends/master.twig
index 4aae8c9..7a52562 100644
--- a/resources/views/yuuno/settings/friends/master.twig
+++ b/resources/views/yuuno/settings/friends/master.twig
@@ -1,3 +1,3 @@
-{% extends 'settings/master.twig' %}
+{% extends '@yuuno/settings/master.twig' %}
 
 {% set category = 'Friends' %}
diff --git a/resources/views/yuuno/settings/friends/requests.twig b/resources/views/yuuno/settings/friends/requests.twig
index 7f7c182..3de65f6 100644
--- a/resources/views/yuuno/settings/friends/requests.twig
+++ b/resources/views/yuuno/settings/friends/requests.twig
@@ -1,5 +1,5 @@
-{% extends 'settings/friends/master.twig' %}
-{% from 'macros.twig' import pagination %}
+{% extends '@yuuno/settings/friends/master.twig' %}
+{% from '@yuuno/macros.twig' import pagination %}
 
 {% set friends = user.friends(-1)|batch(12) %}
 
diff --git a/resources/views/yuuno/settings/master.twig b/resources/views/yuuno/settings/master.twig
index 33dd8ce..f87385f 100644
--- a/resources/views/yuuno/settings/master.twig
+++ b/resources/views/yuuno/settings/master.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = category ~ ' / ' ~ mode %}
 
diff --git a/resources/views/yuuno/status/index.twig b/resources/views/yuuno/status/index.twig
index 4a93bb9..69e1e5a 100644
--- a/resources/views/yuuno/status/index.twig
+++ b/resources/views/yuuno/status/index.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% set title = 'Status' %}
 
diff --git a/resources/views/yuuno/user/members.twig b/resources/views/yuuno/user/members.twig
index 63e2f55..cd95bfd 100644
--- a/resources/views/yuuno/user/members.twig
+++ b/resources/views/yuuno/user/members.twig
@@ -1,5 +1,5 @@
-{% extends 'master.twig' %}
-{% from 'macros.twig' import pagination %}
+{% extends '@yuuno/master.twig' %}
+{% from '@yuuno/macros.twig' import pagination %}
 
 {% set sorts = ['boxes', 'rectangles', 'list'] %}
 {% set sort = get is defined and get.sort is defined and get.sort in sorts ? get.sort : sorts[0] %}
diff --git a/resources/views/yuuno/user/profile.twig b/resources/views/yuuno/user/profile.twig
index e8f7d9c..18e1643 100644
--- a/resources/views/yuuno/user/profile.twig
+++ b/resources/views/yuuno/user/profile.twig
@@ -1,6 +1,6 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
-{% from 'user/profile_macros.twig' import profile_image_changer %}
+{% from '@yuuno/user/profile_macros.twig' import profile_image_changer %}
 
 {% set title = 'Profile of ' ~ profile.username %}
 {% set description = 'Everything you ever wanted to know about ' ~ profile.username ~ '!' %}
@@ -112,7 +112,7 @@
 
     <div class="content profile">
         <div class="profile__container">
-            {% include 'user/profile_header.twig' %}
+            {% include '@yuuno/user/profile_header.twig' %}
             <div class="profile__content">
                 <div class="profile__mode">
                     {% if profile.lastfm %}
@@ -131,7 +131,7 @@
                     <noscript><h1 style="text-align: center;">Please enable Javascript!</h1></noscript>
                     {% for name, data in sections %}
                         <div id="profile-mode-{{ name }}" class="hidden">
-                            {% include 'profile/' ~ name ~ '.twig' %}
+                            {% include '@yuuno/profile/' ~ name ~ '.twig' %}
                         </div>
                     {% endfor %}
                 </div>
diff --git a/resources/views/yuuno/user/profile_header.twig b/resources/views/yuuno/user/profile_header.twig
index 60b5ff4..10c718a 100644
--- a/resources/views/yuuno/user/profile_header.twig
+++ b/resources/views/yuuno/user/profile_header.twig
@@ -1,4 +1,4 @@
-{% from 'user/profile_macros.twig' import profile_image_changer %}
+{% from '@yuuno/user/profile_macros.twig' import profile_image_changer %}
 
 <div class="profile__header" style="background-image: url({{ route('user.header', profile.id) }});">
     <div class="profile__info">
diff --git a/resources/views/yuuno/user/report.twig b/resources/views/yuuno/user/report.twig
index 01f002f..cd4f0e8 100644
--- a/resources/views/yuuno/user/report.twig
+++ b/resources/views/yuuno/user/report.twig
@@ -1,4 +1,4 @@
-{% extends 'master.twig' %}
+{% extends '@yuuno/master.twig' %}
 
 {% block content %}
     <h1 style="text-align: center; margin: 2em auto;">I'll actually make reporting a thing, someday...</h1>