diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
new file mode 100644
index 0000000..c3d5729
--- /dev/null
+++ b/pagure/templates/_render_repo.html
@@ -0,0 +1,103 @@
+{% macro render_row(items) -%}
+    {% for repo in items %}
+        {% if loop.index == 1 %}
+    <div class="project_row">
+        {% endif %}
+        {% if repo.is_fork %}
+        {% set url = url_for('view_repo', username=repo.user.username, repo=repo.name) %}
+        {% else %}
+        {% set url = url_for('view_repo', repo=repo.name) %}
+        {% endif %}
+        <a class="project_link logo_link"
+            href="{{ url }}"
+            style="background-image: url({{ url_for('static', filename='placebo.png') }})">
+            {# TODO: get project logo #}
+            <span class="repo_name">{{ repo.name }}</span>
+            {% if repo.description %}
+            <span class="repo_desc">{{ repo.description | wraps(20) }}</span>
+            {% endif %}
+        </a>
+        {% if loop.last %}
+    </div>
+        {% elif loop.index is divisibleby(3) or loop.last %}
+    </div>
+    <div class="project_row">
+        {% endif %}
+    {% else %}
+    <p>No project found</p>
+    {% endfor %}
+{%- endmacro %}
+
+
+{% macro render_repos(list, total, page, title, count, id, username=None) %}
+<section class="project_list" id="{{ id }}">
+        <header>
+            {% set title_lvl = 3 if username else 2 %}
+            <h{{ title_lvl }}>{{ title }} ({{ count }})</h{{ title_lvl }}>
+        </header>
+        {% if total and total > 1 %}
+        <aside>
+            <table>
+                <tr>
+                    <td>
+                    {% if page > 1%}
+                        <a href="{{ url_for('index') }}?page={{page - 1}}">
+                            &lt; Previous
+                        </a>
+                    {% else %}
+                        &lt; Previous
+                    {% endif %}
+                    </td>
+                    <td>{{ page }} / {{ total }}</td>
+                    <td>
+                        {% if page < total %}
+                        <a href="{{ url_for('index') }}?page={{page + 1}}">
+                            Next &gt;
+                        </a>
+                        {% else %}
+                        Next >
+                        {% endif %}
+                    </td>
+                </tr>
+            </table>
+        </aside>
+        {% endif %}
+        <div>
+            {{ render_row(list) }}
+        </div>
+    </section>
+{% endmacro %}
+
+
+{% macro repos_switch(all = True) %}
+    <aside class="show_parts">
+        <div class="container">
+        <strong>
+            {% if all %}My repos:{% else %}Repos:{% endif %}
+        </strong>
+
+            <label class="switch">
+                <input type="checkbox" class="switch-input"
+                    name="{% if all %}my{% endif %}repos" checked>
+                <span class="switch-label" data-on="On" data-off="Off"></span>
+                <span class="switch-handle"></span>
+            </label>
+        <strong>Forks:</strong>
+            <label class="switch">
+                <input type="checkbox" class="switch-input"
+                    name="{% if all %}my{% endif %}forks" checked>
+                <span class="switch-label" data-on="On" data-off="Off"></span>
+                <span class="switch-handle"></span>
+            </label>
+        {% if all %}
+        <strong>All repos:</strong>
+            <label class="switch">
+                <input type="checkbox" class="switch-input"
+                    name="repos" id="allrepos" checked />
+                <span class="switch-label" data-on="On" data-off="Off"></span>
+                <span class="switch-handle"></span>
+            </label>
+        {% endif %}
+        </div>
+    </aside>
+{% endmacro %}
diff --git a/pagure/templates/index.html b/pagure/templates/index.html
index cd8875f..c68df97 100644
--- a/pagure/templates/index.html
+++ b/pagure/templates/index.html
@@ -9,8 +9,8 @@
         href="{{ url_for('static', filename='toggle.css') }}"/>
 {% endblock %}
 
-{% from "render_repo.html" import render_repos %}
-{% from "render_repo.html" import repos_switch %}
+{% from "_render_repo.html" import render_repos %}
+{% from "_render_repo.html" import repos_switch %}
 
 {% block content %}
     {% if username %}
diff --git a/pagure/templates/render_repo.html b/pagure/templates/render_repo.html
deleted file mode 100644
index c3d5729..0000000
--- a/pagure/templates/render_repo.html
+++ /dev/null
@@ -1,103 +0,0 @@
-{% macro render_row(items) -%}
-    {% for repo in items %}
-        {% if loop.index == 1 %}
-    <div class="project_row">
-        {% endif %}
-        {% if repo.is_fork %}
-        {% set url = url_for('view_repo', username=repo.user.username, repo=repo.name) %}
-        {% else %}
-        {% set url = url_for('view_repo', repo=repo.name) %}
-        {% endif %}
-        <a class="project_link logo_link"
-            href="{{ url }}"
-            style="background-image: url({{ url_for('static', filename='placebo.png') }})">
-            {# TODO: get project logo #}
-            <span class="repo_name">{{ repo.name }}</span>
-            {% if repo.description %}
-            <span class="repo_desc">{{ repo.description | wraps(20) }}</span>
-            {% endif %}
-        </a>
-        {% if loop.last %}
-    </div>
-        {% elif loop.index is divisibleby(3) or loop.last %}
-    </div>
-    <div class="project_row">
-        {% endif %}
-    {% else %}
-    <p>No project found</p>
-    {% endfor %}
-{%- endmacro %}
-
-
-{% macro render_repos(list, total, page, title, count, id, username=None) %}
-<section class="project_list" id="{{ id }}">
-        <header>
-            {% set title_lvl = 3 if username else 2 %}
-            <h{{ title_lvl }}>{{ title }} ({{ count }})</h{{ title_lvl }}>
-        </header>
-        {% if total and total > 1 %}
-        <aside>
-            <table>
-                <tr>
-                    <td>
-                    {% if page > 1%}
-                        <a href="{{ url_for('index') }}?page={{page - 1}}">
-                            &lt; Previous
-                        </a>
-                    {% else %}
-                        &lt; Previous
-                    {% endif %}
-                    </td>
-                    <td>{{ page }} / {{ total }}</td>
-                    <td>
-                        {% if page < total %}
-                        <a href="{{ url_for('index') }}?page={{page + 1}}">
-                            Next &gt;
-                        </a>
-                        {% else %}
-                        Next >
-                        {% endif %}
-                    </td>
-                </tr>
-            </table>
-        </aside>
-        {% endif %}
-        <div>
-            {{ render_row(list) }}
-        </div>
-    </section>
-{% endmacro %}
-
-
-{% macro repos_switch(all = True) %}
-    <aside class="show_parts">
-        <div class="container">
-        <strong>
-            {% if all %}My repos:{% else %}Repos:{% endif %}
-        </strong>
-
-            <label class="switch">
-                <input type="checkbox" class="switch-input"
-                    name="{% if all %}my{% endif %}repos" checked>
-                <span class="switch-label" data-on="On" data-off="Off"></span>
-                <span class="switch-handle"></span>
-            </label>
-        <strong>Forks:</strong>
-            <label class="switch">
-                <input type="checkbox" class="switch-input"
-                    name="{% if all %}my{% endif %}forks" checked>
-                <span class="switch-label" data-on="On" data-off="Off"></span>
-                <span class="switch-handle"></span>
-            </label>
-        {% if all %}
-        <strong>All repos:</strong>
-            <label class="switch">
-                <input type="checkbox" class="switch-input"
-                    name="repos" id="allrepos" checked />
-                <span class="switch-label" data-on="On" data-off="Off"></span>
-                <span class="switch-handle"></span>
-            </label>
-        {% endif %}
-        </div>
-    </aside>
-{% endmacro %}
diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html
index 9609144..61ed74a 100644
--- a/pagure/templates/user_info.html
+++ b/pagure/templates/user_info.html
@@ -10,8 +10,8 @@
 {% endblock %}
 
 
-{% from "render_repo.html" import render_repos %}
-{% from "render_repo.html" import repos_switch %}
+{% from "_render_repo.html" import render_repos %}
+{% from "_render_repo.html" import repos_switch %}
 
 
 {% block content %}