diff --git a/src/App.vue b/src/App.vue
index b90afa25c7494eedbd6fa228f1ce909b7b10b4e6..c3967eaaece5c0ae5a50f329c382128268979cef 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -66,9 +66,6 @@ body {
 
 }
 
-a {
-  text-decoration: none;
-}
 
 h1 {
   font-family: Inria Serif;
@@ -83,6 +80,7 @@ h1 > a.xs, h1 > a.sm {
 
 header > h1 > a {
   color: var(--v-primary-base) !important;
+  text-decoration: none;
   font-size: 48px;
   margin: 0px;
 }
@@ -111,7 +109,7 @@ header > p {
   text-decoration: none;
   border-bottom: solid var(--v-primary-base) 2px;
   font-size: 12px;
-  color: var(--v-primary-base);
+  color: var(--v-primary-base) !important;
 }
 
 header {
@@ -131,6 +129,10 @@ footer  a {
   color: #ffffff !important;
 }
 
+a {
+  text-decoration: none;
+}
+
 header {
   padding-top: 20px;
   background-color: var(--v-tertiary-base);
@@ -140,6 +142,11 @@ header {
   font-size: 18px;
   margin: 0px;
   margin-bottom: 0px !important;
+  
+}
+
+.sub-title a {
+  color: var(--v-primary-base) !important;
 }
 
 footer {
diff --git a/src/components/Article.vue b/src/components/Article.vue
index 0bd81f0afc2c88487f507686d1e0ec345061ae2e..c951ba4144c8cb394126c1e127c82cb0bfdb7d52 100644
--- a/src/components/Article.vue
+++ b/src/components/Article.vue
@@ -27,8 +27,8 @@
         </ul>
       </section>
       <div class="fade">
-        <router-link :to="link_to_self.ref" @click.native="details_click(link_to_self)">
-          Velg <img class="nav_arrow" src="../assets/arrow_right.svg">
+        <router-link class="choose" :to="link_to_self.ref" @click.native="details_click(link_to_self)">
+          Velg <v-icon large class="nav_arrow">arrow_right</v-icon>
         </router-link>
       </div>
     </div>
@@ -216,4 +216,26 @@ ul li.definition {
   vertical-align: sub;
 }
 
+
+
+@media (hover: none) {
+  article a:not(.choose):not(.return_to_results a) {
+     text-decoration: underline;
+  } 
+}
+
+@media (hover: hover) {
+  article  a {
+     text-decoration: none;
+  } 
+  article a:hover:not(.choose):not(.return_to_results a) {
+  text-decoration: underline;
+  }
+}
+
+.choose {
+  color: var(--v-primary-base) !important;
+}
+
+
 </style>
diff --git a/src/components/ArticleFooter.vue b/src/components/ArticleFooter.vue
index 5bf7540408b52a83629930066851fafee3a421ee..6d5beb55343fef6b90086d946a7a62882c1ad5e2 100644
--- a/src/components/ArticleFooter.vue
+++ b/src/components/ArticleFooter.vue
@@ -82,6 +82,7 @@ export default {
   font-size: 14px;
 }
 
+
 .article_footer {
   color: var(--v-primary-base);
   padding-top: 24px;
diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index 1ac5facb424a4edd257f7424d93ff927d0fdef82..c7a588ff2d3b5e0cbf3609e2492ce6cdb1543a33 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -103,7 +103,7 @@
                             let match = item[0]
                             let hit = {q: q, match: match, label: match, time: time}
 
-                            hit.article_promise = self.api.get('articles?', {params: {lord: match, dict: self.$parent.lang}})
+                            hit.article_promise = self.api.get('articles?', {params: {lord: match}})
 
                             hit.lang = item[1]
                             hits.push(hit)
diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue
index 03783034781e6c99da4744206df613d6308d025d..916799ec06da8b99f29dcccb03eb48ee06a9b2d1 100644
--- a/src/components/DictionaryView.vue
+++ b/src/components/DictionaryView.vue
@@ -44,7 +44,7 @@
     <div id="single_article_container" v-if="article">
         <div class="return_to_results" v-if="search_results && search_results.length">
           <router-link :to="article.source" @click.native="return_to_results()">
-            <img class="nav_arrow" src="../assets/arrow_left.svg">Tilbake til {{article.dictionary == 'bob' ? 'søkeresultater' : 'søkjeresultat'}}
+            <v-icon class="nav_arrow">arrow_left</v-icon>Tilbake til {{article.dictionary == 'bob' ? 'søkeresultater' : 'søkjeresultat'}}
           </router-link>
         </div>
       <Article :key="article_key" :article="article" @article-click="article_link_click" />
@@ -219,10 +219,13 @@ export default {
           this.$router.push(source)
           let unwrapped = []
           for (const d in event.article_ids) {
-            event.article_ids[d].forEach(i => unwrapped.push({
-              dictionary: d,
-              id: i
-            }))
+            if (d == this.lang || this.lang == "bob,nob") {
+              event.article_ids[d].forEach(i => unwrapped.push({
+                dictionary: d,
+                id: i
+              }))
+            }
+
           }
 
           let self = this
@@ -265,9 +268,6 @@ export default {
                 error: self.error
               }, '')
             })
-
-
-
         } else {
           this.waiting_for_articles = true
           this.article = null
@@ -282,11 +282,10 @@ export default {
         }
       },
       update_lang_form: function (event) {
-        if (this.event) {
+        this.lang = event
+        if (this.event && !this.article) {
           this.event.articles = null
           this.select_result(this.event)
-        } else {
-          navigate_to_search(this, this.$router.history.current.params.word || this.$router.history.current.params.query)
         }
       },
     article_link_click: function(item) {
@@ -457,8 +456,17 @@ li.suggestion {
   display: table-cell;
 }
 
+.return_to_results a {
+  color: var(--v-primary-base) !important;
+}
+
 .nav_arrow {
-  vertical-align: middle;
+  vertical-align: top !important;
+  color: var(--v-primary-base) !important;
+}
+
+.choose > .nav_arrow {
+  vertical-align: -30% !important;
 }
 
 </style>
diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
index 9a38c46979e3250f23aa3bc170b6d584b91769ce..b492c4eefcdd3a21f5b8d94e255e659698d9a29a 100644
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@@ -56,7 +56,7 @@ export default new Vuetify({
         primary: '#560027',
         secondary: '#BC477B',
         tertiary: '#FDF4F5',
-        anchor: '#560027',
+        anchor: '#880E4F',
         error: '#FDF4F5',
         border: '#9E9E9E',
         text: '#2c3e50'