diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
deleted file mode 100644
index 1bd982319..000000000
--- a/res/values-de/arrays.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Copyright (C) 2014 Arpit Khurana <arpitkh96@gmail.com>, Vishal Nehra <vishalmeham2@gmail.com>
-    This file is part of Amaze File Manager.
-    Amaze File Manager is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-
-<resources>
-    <string-array name="uimode">
-        <item>Einfache Darstellung</item>
-        <item>Kartendarstellung</item>
-
-    </string-array>
-    <string-array name="theme">
-        <item>Hell</item>
-        <item>Dunkel</item>
-        <item>Tageslicht</item>
-
-    </string-array>
-    <string-array name="skin">
-        <item>Rot</item>
-        <item>Pink</item>
-        <item>Violett</item>
-        <item>Dunkles lila</item>
-        <item>Indigo</item>
-        <item>Blau</item>
-        <item>Hellblau</item>
-        <item>Cyan</item>
-        <item>Teal</item>
-        <item>Grün</item>
-        <item>Hellgrün</item>
-        <item>Bernstein</item>
-        <item>Orange</item>
-        <item>Dunkles Orange</item>
-        <item>Braun</item>
-        <item>Schwarz</item>
-        <item>Blaugrau</item>
-
-    </string-array>
-    <string-array name="directorysortmode">
-        <item>Ordner oben</item>
-        <item>Dateien oben</item>
-        <item>Nichts davon oben</item>
-    </string-array>
-    <string-array name="sortby">
-        <item>Name</item>
-        <item>Änderungsdatum</item>
-        <item>Größe</item>
-        <item>Name (Absteigend)</item>
-        <item>Änderungsdatum (Absteigend)</item>
-        <item>Größe (Absteigend)</item>
-    </string-array>
-
-
-    <string-array name="ints2">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-    <string-array name="ints1">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="listmode">
-        <item>Detailierte Ansicht</item>
-        <item>Einfache Ansicht</item>
-    </string-array>
-    <string-array name="folder">
-        <item>Orange</item>
-        <item>Gelb</item>
-        <item>Blau</item>
-    </string-array>
-
-    <string-array name="ints">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 97593ea3e..47dc58ecf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,14 +1,18 @@
 <!--
-    Copyright (C) 2014 Arpit Khurana <arpitkh96@gmail.com>, Vishal Nehra <vishalmeham2@gmail.com>
+    Copyright (C) 2014 Arpit Khurana <arpitkh96@gmail.com>, Vishal Nehra <vishalmeham2@gmail.com>, SimplicityApks <simplicityapks@gmail.com>
+
     This file is part of Amaze File Manager.
+
     Amaze File Manager is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
     -->
@@ -127,4 +131,111 @@
     <!-- Changelog -->
     <string name="changelog_version_1">&lt;font color="#524ef8">&lt;b>v1.0&lt;/font>&lt;/b>&lt;i>&lt;font color="#5299f2">&lt;br>Nov 11, 2014&lt;/i>&lt;/font>&lt;br>&lt;br></string>
     <string name="changelog_change_1">- Initial release&lt;br>&lt;br></string>
+
+    <!-- New -->
+    <!-- Array -->
+
+    <!-- UI -->
+    <string name="simple">Einfache Darstellung</string>
+    <string name="card">Kartendarstellung</string>
+    <!-- Theme -->
+    <string name="light">Hell</string>
+    <string name="dark">Dunkel</string>
+    <string name="daytime">Tageslicht</string>
+    <!--Skin-->
+    <string name="red">Rot</string>
+    <string name="pink">Pink</string>
+    <string name="purple">Violett</string>
+    <string name="deep_purple">Dunkles lila</string>
+    <string name="indigo">Indigo</string>
+    <string name="blue">Blau</string>
+    <string name="light_blue">Hellblau</string>
+    <string name="cyan">Cyan</string>
+    <string name="teal">Teal</string>
+    <string name="green">Grün</string>
+    <string name="light_green">Hellgrün</string>
+    <string name="amber">Bernstein</string>
+    <string name="orange">Orange</string>
+    <string name="deep_orange">Dunkles Orange</string>
+    <string name="brown">Braun</string>
+    <string name="black">Schwarz</string>
+    <string name="blue_grey">Blaugrau</string>
+    <!--DirectorySortMode-->
+    <string name="foldersOnTop">Ordner oben</string>
+    <string name="filesOnTop">Dateien oben</string>
+    <string name="noneOnTop">Nichts davon oben</string>
+    <!--SortBy-->
+    <string name="sortName">Name</string>
+    <string name="lastModified">Änderungsdatum</string>
+    <string name="sortSize">Größe</string>
+    <string name="sortNameDesc">Name (absteigend)</string>
+    <string name="lastModifiedDesc">Änderungsdatum (absteigend)</string>
+    <string name="sortSizeDesc">Größe (absteigend)</string>
+    <!--ListMode-->
+    <string name="detailedView">Detaillierte Ansicht</string>
+    <string name="simpleView">Einfache Ansicht</string>
+    <!--Folder-->
+    <string name="Yellow">Gelb</string>
+    <string name="pick_a_file">Datei auswählen</string>
+    <string name="process_viewer">Prozessanzeige</string>
+    <string name="in_safe">Nicht genügend Speicherplatz</string>
+    <string name="no_file_overwrite">Keine Datei überschrieben</string>
+    <string name="skip">Überspringen</string>
+    <string name="overwrite">Überschreiben</string>
+    <string name="cant_read_file">Kann Datei nicht lesen</string>
+    <string name="not_allowed">Nicht erlaubt</string>
+    <string name="processes">Prozessse</string>
+    <string name="searching">Suche</string>
+    <string name="copying_fles">Kopiere Dateien</string>
+    <string name="done">Fertig</string>
+    <string name="Extracting_fles">Extrahiere Dateien</string>
+    <string name="Zipping_fles">Komprimiere Dateien</string>
+    <string name="items">Elemente</string>
+    <string name="set">Setzen</string>
+    <string name="enablerootmde">Root-Modus aktivieren</string>
+    <string name="goback">Zurück</string>
+    <string name="foldercreated">Ordner erstellt</string>
+    <string name="newfile">Neue Datei</string>
+    <string name="nofiles">Keine Dateien</string>
+    <string name="tapnhold">Tippe und halte Datei für mehr Optionen</string>
+    <string name="pathcopied">Pfad in Zwischenspeicher kopiert</string>
+    <string name="used">Benutzt :  </string>
+    <string name="free">Frei :  </string>
+    <string name="atroot">Oberstes Verzeichnis erreicht</string>
+    <string name="listview">Listenansicht</string>
+    <string name="gridview">Tabellenansicht</string>
+    <string name="setlistview">Setzte Listenansicht</string>
+    <string name="setgridview">Setzte Tabellenansicht</string>
+    <string name="permission">Berechtigungen</string>
+    <string name="hide">Verstecken</string>
+    <string name="exit">Schließen</string>
+    <string name="enternewname">Neuen Namen eingeben</string>
+    <string name="doforall">Für alle Elemente</string>
+    <string name="gridcolumnno">Anzahl der Spalten in Tabellenansicht</string>
+    <string name="randomDialog">Zufällig</string>
+    <string name="setRandom">Änderungen werden nach einem Neustart der App durchgeführt</string>
+    <string name="authors">Autoren</string>
+    <string name="changelog">Changelog</string>
+    <string name="fullChangelog">Alle Änderungen</string>
+    <string name="ok">OK</string>
+    <string name="chooseUI">Wähle Elementansicht</string>
+    <string name="ui">Aussehen</string>
+    <string name="general">Allgemein</string>
+    <string name="thumbSummary">Zeige Miniaturansicht von Apps und Bildern</string>
+    <string name="thumb">Thumbnails anzeigen</string>
+    <string name="hidden">Zeige versteckte Dateien und Ordner an</string>
+    <string name="lastModifiedSummary">Zeige Datum und Zeit der letzten Dateiänderung an</string>
+    <string name="lastModifiedPref">Änderungsdatum anzeigen</string>
+    <string name="sizePrefSummary">Zeige die Größe bei Dateien und Anzahl der enthaltenen Elemente bei Ordnern an</string>
+    <string name="sizePref">Größe anzeigen</string>
+    <string name="miscellaneous">Verschiedenes</string>
+    <string name="rootPrefSummary">Zeige die Berechtigungen der Dateien und Ordner an</string>
+    <string name="rootPref">Dateiberechtigungen anzeigen</string>
+    <string name="aboutFileManager">Über Amaze File Manager</string>
+    <string name="version">Version</string>
+    <string name="rate">Diese App bewerten</string>
+    <string name="license">Open Source Lizenzen</string>
+    <string name="feedback">Feedback senden</string>
+    <string name="hiddenfiles">Versteckte Dateien</string>
 </resources>
+	
diff --git a/src/com/amaze/filemanager/fragments/Main.java b/src/com/amaze/filemanager/fragments/Main.java
index 99f54e7b7..fe08b43e5 100644
--- a/src/com/amaze/filemanager/fragments/Main.java
+++ b/src/com/amaze/filemanager/fragments/Main.java
@@ -1261,15 +1261,9 @@ if(history!=null)
                         ma.loadlist(new File(ma.current), false);
                         break;
                     case R.id.view:
-                        if (aBoolean) {
-                            Toast.makeText(getActivity(), res.getString(R.string.setgridview), Toast.LENGTH_SHORT).show();
-                            sharedPreferences.edit().putBoolean("view", false).commit();
-
-                        } else {
-                            Toast.makeText(getActivity(),res.getString(R.string.setlistview), Toast.LENGTH_SHORT).show();
-                            sharedPreferences.edit().putBoolean("view", true).commit();
-
-                        }restartPC(getActivity());
+                        // Save the changes, but don't show a disruptive Toast:
+                        sharedPreferences.edit().putBoolean("view", aBoolean).commit();
+                        restartPC(getActivity());
                         break;
                 }
                 return false;
diff --git a/src/com/amaze/filemanager/utils/Futils.java b/src/com/amaze/filemanager/utils/Futils.java
index 0dbbcc547..dc3275231 100644
--- a/src/com/amaze/filemanager/utils/Futils.java
+++ b/src/com/amaze/filemanager/utils/Futils.java
@@ -562,6 +562,8 @@ public class Futils {
                 m.Sp.edit().putString("dirontop", "" + i).commit();
                 m.getSortModes();
                 m.loadlist(new File(m.current), false);
+                // dismiss the dialog since we don't want it open after selection:
+                dialogInterface.dismiss();
             }
         });