diff --git a/bin/svgs.js b/bin/svgs.js
index c3df6eda..8952ad41 100644
--- a/bin/svgs.js
+++ b/bin/svgs.js
@@ -18,4 +18,5 @@ module.exports = [
{id:'fa-user-times', src:'node_modules/font-awesome-svg-png/white/svg/user-times.svg', title: 'Stop Following'},
{id:'fa-user-plus', src:'node_modules/font-awesome-svg-png/white/svg/user-plus.svg', title: 'Follow'},
{id:'fa-external-link', src:'node_modules/font-awesome-svg-png/white/svg/external-link.svg', title: 'External Link'},
+ {id:'fa-search', src:'node_modules/font-awesome-svg-png/white/svg/search.svg', title: 'Search'},
]
\ No newline at end of file
diff --git a/routes/_components/LoadingPage.html b/routes/_components/LoadingPage.html
new file mode 100644
index 00000000..0314c649
--- /dev/null
+++ b/routes/_components/LoadingPage.html
@@ -0,0 +1,24 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/routes/_components/Nav.html b/routes/_components/Nav.html
index a0a4e3ae..0d81a53f 100644
--- a/routes/_components/Nav.html
+++ b/routes/_components/Nav.html
@@ -12,6 +12,9 @@
+
+
+
diff --git a/routes/_components/search/AccountSearchResult.html b/routes/_components/search/AccountSearchResult.html
new file mode 100644
index 00000000..e0f0c5b4
--- /dev/null
+++ b/routes/_components/search/AccountSearchResult.html
@@ -0,0 +1,49 @@
+
+
+
+
+ {{account.display_name}}
+
+
+ {{'@' + account.acct}}
+
+
+
+
+
\ No newline at end of file
diff --git a/routes/_components/search/HashtagSearchResult.html b/routes/_components/search/HashtagSearchResult.html
new file mode 100644
index 00000000..881f1c3d
--- /dev/null
+++ b/routes/_components/search/HashtagSearchResult.html
@@ -0,0 +1,13 @@
+
+ {{'#' + hashtag}}
+
+
+
\ No newline at end of file
diff --git a/routes/_components/search/Search.html b/routes/_components/search/Search.html
new file mode 100644
index 00000000..7240f6ec
--- /dev/null
+++ b/routes/_components/search/Search.html
@@ -0,0 +1,93 @@
+
+{{#if loading}}
+
+{{/if}}
+
+
\ No newline at end of file
diff --git a/routes/_components/search/SearchResult.html b/routes/_components/search/SearchResult.html
new file mode 100644
index 00000000..1e7d30a7
--- /dev/null
+++ b/routes/_components/search/SearchResult.html
@@ -0,0 +1,28 @@
+
+
\ No newline at end of file
diff --git a/routes/_components/search/SearchResults.html b/routes/_components/search/SearchResults.html
new file mode 100644
index 00000000..362eab72
--- /dev/null
+++ b/routes/_components/search/SearchResults.html
@@ -0,0 +1,34 @@
+
+ {{#each $searchResults.hashtags as hashtag}}
+
+ {{/each}}
+ {{#each $searchResults.accounts as account}}
+
+ {{/each}}
+ {{#each $searchResults.statuses as status, index}}
+
+ {{/each}}
+
+
+
\ No newline at end of file
diff --git a/routes/_components/search/StatusSearchResult.html b/routes/_components/search/StatusSearchResult.html
new file mode 100644
index 00000000..f3f16100
--- /dev/null
+++ b/routes/_components/search/StatusSearchResult.html
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/routes/_components/status/Avatar.html b/routes/_components/status/Avatar.html
index b531120b..6be1c640 100644
--- a/routes/_components/status/Avatar.html
+++ b/routes/_components/status/Avatar.html
@@ -1,12 +1,12 @@
{{#if error}}
-