diff --git a/templates/default/currency.html b/templates/default/currency.html
new file mode 100644
index 000000000..8eb198e88
--- /dev/null
+++ b/templates/default/currency.html
@@ -0,0 +1,25 @@
+{extends file="layout.tpl"}
+
+{* Body Class *}
+{block name="body-class"}page-currency{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['title' => {intl l="Currency"}, 'url'=>{url path="/currency"}]
+    ]}
+{/block}
+
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main" role="main" aria-labelledby="main-label">
+            <h1 id="main-label" class="page-header">{intl l="SELECT YOUR CURRENCY"}</h1>
+            <ul class="nav nav-tabs nav-justified" style="margin-bottom:60px;">
+            {loop type="currency" name="currency_available"}
+              <li{if $ID eq "{currency attr="id"}"} class="active"{/if}><a href="{url path="{navigate to="current"}" currency={$ISOCODE}}">{$SYMBOL} - {$NAME}</a></li>
+            {/loop}
+            </ul>
+        </article>
+    </div>
+{/block}
diff --git a/templates/default/language.html b/templates/default/language.html
new file mode 100644
index 000000000..d1ced33cf
--- /dev/null
+++ b/templates/default/language.html
@@ -0,0 +1,25 @@
+{extends file="layout.tpl"}
+
+{* Body Class *}
+{block name="body-class"}page-language{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['title' => {intl l="Language"}, 'url'=>{url path="/language"}]
+    ]}
+{/block}
+
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main" role="main" aria-labelledby="main-label">
+            <h1 id="main-label" class="page-header">{intl l="SELECT YOUR LANGUAGE"}</h1>
+            <ul class="nav nav-tabs nav-justified" style="margin-bottom:60px;">
+            {loop type="lang" name="lang_available"}
+              <li{if $ID eq "{lang attr="id"}"} class="active"{/if}><a href="{url path="{navigate to="current"}" lang={$CODE}}">{$TITLE}</a></li>
+            {/loop}
+            </ul>
+        </article>
+    </div>
+{/block}