diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug
index 46290fe..d2ae1e5 100644
--- a/src/templates/_macros/_navigation.pug
+++ b/src/templates/_macros/_navigation.pug
@@ -1,4 +1,4 @@
-include ../mixins/components
+include ../../../../pillar/src/templates/mixins/components
 
 | {% macro navigation_tabs(title) %}
 +nav-secondary()
diff --git a/src/templates/mixins/components.pug b/src/templates/mixins/components.pug
deleted file mode 100644
index 68826aa..0000000
--- a/src/templates/mixins/components.pug
+++ /dev/null
@@ -1,69 +0,0 @@
-// {#
-// Header of landing pages. title or text can be skipped:
-// +jumbotron("{{ page_title }}", null, "{{ page_header_image }}")
-// Any extra attributes added (in a separate group) will be passed as is:
-// +jumbotron("{{ page_title }}", null, "{{ page_header_image }}")(data-node-id='{{ node._id }}')
-// #}
-mixin jumbotron(title, text, image, url)
-	if url
-		a.jumbotron.jumbotron-overlay.text-white(
-			style='background-image: url(' + image + ');',
-			href=url)&attributes(attributes)
-			.container
-				.row
-					.col-md-9
-						if title
-							.display-4.text-uppercase.font-weight-bold
-								=title
-						if text
-							.lead
-								=text
-	else
-		.jumbotron.jumbotron-overlay.text-white(style='background-image: url(' + image + ');')&attributes(attributes)
-			.container
-				.row
-					.col-md-9
-						if title
-							.display-4.text-uppercase.font-weight-bold
-								=title
-						if text
-							.lead
-								=text
-
-// {# Secondary navigation.
-// e.g. Workshops, Courses. #}
-mixin nav-secondary(title)
-	ul.nav.nav-secondary&attributes(attributes)
-		if title
-			li.font-weight-bold.px-2
-				=title
-
-		if block
-			block
-		else
-			p No items defined.
-
-mixin nav-secondary-link()
-	li.nav-item
-		a.nav-link&attributes(attributes)
-			block
-
-// {# Takes as argument the number of columns to use in this deck. 1-6 #}
-mixin card-deck(columns)
-	.card-deck.card-padless(class='card-' + columns + '-columns')
-		if block
-			block
-		else
-			p No cards defined.
-
-// {#
-// Passes all attributes to the card.
-// You can do fun stuff in a loop even like:
-// +card(data-url="{{ url_for('projects.view', project_url=project.url) }}", tabindex='{{ loop.index }}')
-// #}
-mixin card()
-	.card.card-fade.cursor-pointer.mb-4.js-project-go&attributes(attributes)
-		if block
-			block
-		else
-			p No card content defined.
diff --git a/src/templates/nodes/custom/blog/_macros.pug b/src/templates/nodes/custom/blog/_macros.pug
index 84ec904..3093603 100644
--- a/src/templates/nodes/custom/blog/_macros.pug
+++ b/src/templates/nodes/custom/blog/_macros.pug
@@ -1,4 +1,4 @@
-include ../../../mixins/components
+include ../../../../../../pillar/src/templates/mixins/components
 
 | {% import 'projects/_macros.html' as projectmacros %}
 | {% macro render_blog_post(node, project=None, pages=None) %}
diff --git a/src/templates/organizations/index.pug b/src/templates/organizations/index.pug
index 4c3f6eb..0226603 100644
--- a/src/templates/organizations/index.pug
+++ b/src/templates/organizations/index.pug
@@ -1,6 +1,6 @@
 | {% extends 'layout.html' %}
 | {% from '_macros/_navigation.html' import navigation_tabs %}
-include ../mixins/components
+include ../../../../pillar/src/templates/mixins/components
 
 | {% set title = 'organizations' %}
 | {% block page_title %}Organizations{% endblock %}
diff --git a/src/templates/projects/home_layout.pug b/src/templates/projects/home_layout.pug
index 454f508..275bf70 100644
--- a/src/templates/projects/home_layout.pug
+++ b/src/templates/projects/home_layout.pug
@@ -1,6 +1,6 @@
 | {% extends 'layout.html' %}
 | {% from '_macros/_navigation.html' import navigation_tabs %}
-include ../mixins/components
+include ../../../../pillar/src/templates/mixins/components
 
 | {% set title = 'home' %}
 
diff --git a/src/templates/projects/index_dashboard.pug b/src/templates/projects/index_dashboard.pug
index 4297dd1..bc8a7c3 100644
--- a/src/templates/projects/index_dashboard.pug
+++ b/src/templates/projects/index_dashboard.pug
@@ -1,6 +1,6 @@
 | {% extends 'layout.html' %}
 | {% from '_macros/_navigation.html' import navigation_tabs %}
-include ../mixins/components
+include ../../../../pillar/src/templates/mixins/components
 
 | {% set title = 'dashboard' %}
 
diff --git a/src/templates/projects/view.pug b/src/templates/projects/view.pug
index fb5d031..e9b5d74 100644
--- a/src/templates/projects/view.pug
+++ b/src/templates/projects/view.pug
@@ -1,6 +1,6 @@
 | {% extends 'layout.html' %}
 | {% from '_macros/_add_new_menu.html' import add_new_menu %}
-include ../mixins/components
+include ../../../../pillar/src/templates/mixins/components
 
 | {% block page_title %}{{ project.name }}{% endblock%}
 | {% set title = 'project' %}
@@ -189,7 +189,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
 						i.button-add-icon.pi-collection-plus
 						| New...
 
-					ul.dropdown-menu.add_new-menu
+					ul.dropdown-menu.dropdown-menu-right(
+						class="add_new-menu")
 						| {{ add_new_menu(project.node_types) }}
 
 				li.button-edit
diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug
index baf1955..92a1445 100644
--- a/src/templates/projects_index_collection.pug
+++ b/src/templates/projects_index_collection.pug
@@ -1,6 +1,6 @@
 | {% extends 'layout.html' %}
 
-include mixins/components
+include ../../../pillar/src/templates/mixins/components
 
 | {# Default case is Open Projects #}
 | {% set page_title = 'Open Projects' %}
diff --git a/src/templates/services.pug b/src/templates/services.pug
index e29e4a3..b90ae8c 100644
--- a/src/templates/services.pug
+++ b/src/templates/services.pug
@@ -1,7 +1,7 @@
 | {% extends 'layout.html' %}
 | {% block page_title %}Services{% endblock %}
 | {% set title = 'services' %}
-include mixins/components
+include ../../../pillar/src/templates/mixins/components
 
 | {% block og %}
 meta(property="og:type", content="website")