diff --git a/package-lock.json b/package-lock.json
index e8cbb8c5..d8f15d7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "scanservjs",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "scanservjs",
-      "version": "2.16.2",
+      "version": "2.17.0",
       "hasInstallScript": true,
       "license": "GPL-2.0"
     }
diff --git a/package.json b/package.json
index 81c713aa..ab2e550d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scanservjs",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation.",
   "scripts": {
     "clean": "rm -rf ./dist",
diff --git a/packages/client/package-lock.json b/packages/client/package-lock.json
index 9611b793..425aab2b 100644
--- a/packages/client/package-lock.json
+++ b/packages/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "scanservjs",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "scanservjs",
-      "version": "2.16.2",
+      "version": "2.17.0",
       "license": "GPL-2.0",
       "dependencies": {
         "@mdi/font": "^5.9.55",
diff --git a/packages/client/package.json b/packages/client/package.json
index e157822b..2f9fa654 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scanservjs",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation.",
   "author": "Sam Strachan",
   "scripts": {
diff --git a/packages/client/src/components/Files.vue b/packages/client/src/components/Files.vue
index b8d4eb9e..4bc70a23 100644
--- a/packages/client/src/components/Files.vue
+++ b/packages/client/src/components/Files.vue
@@ -1,24 +1,51 @@
 <template>
-  <v-simple-table>
-    <thead>
-      <tr>
-        <th><v-checkbox @change="selectToggle" /></th>
-        <th>{{ $t('files.filename') }}</th>
-        <th class="file-date">{{ $t('files.date') }}</th>
-        <th>{{ $t('files.size') }}</th>
-        <th><v-btn v-if="selectedFiles.length > 0" color="red" v-on:click="multipleDelete()" icon><v-icon>mdi-delete</v-icon></v-btn></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr v-for="file in files" v-bind:key="file.name">
-        <td><v-checkbox v-model="selectedFiles" :value="file.name" /></td>
-        <td><a @click="open(file)">{{ file.name }}</a></td>
-        <td class="file-date">{{ $d(new Date(file.lastModified), 'long', $i18n.locale) }}</td>
-        <td>{{ file.sizeString }}</td>
-        <td><v-btn color="secondary" v-on:click="fileRemove(file)" icon><v-icon>mdi-delete</v-icon></v-btn></td>
-      </tr>
-    </tbody>
-  </v-simple-table> 
+  <v-data-table
+      :headers="headers"
+      :items="files"
+      v-model="selectedFiles"
+      item-key="name"
+      show-select>
+    <template v-slot:top>
+      <v-toolbar flat>
+      <v-spacer></v-spacer>
+      <v-btn @click="multipleDelete" color="primary">{{ $t('files.button:delete-selected') }}</v-btn>
+      <v-dialog v-model="dialogEdit" max-width="500px">
+        <v-card>
+          <v-card-title class="text-h5">{{ $t('files.dialog:rename') }}</v-card-title>
+          <v-card-text>
+            <v-container>
+              <v-text-field v-model="editedItem.newName" :label="$t('files.filename')">
+              </v-text-field>
+            </v-container>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn @click="closeRename">
+              {{ $t('files.dialog:rename-cancel') }}
+            </v-btn>
+            <v-btn @click="renameFileConfirm" color="primary">
+              {{ $t('files.dialog:rename-save') }}
+            </v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+      </v-toolbar>
+    </template>
+    <template v-slot:[`item.lastModified`]="{ item }">
+      {{ $d(new Date(item.lastModified), 'long', $i18n.locale) }}
+    </template>
+    <template v-slot:[`item.actions`]="{ item }">
+      <v-icon @click="open(item)" class="mr-2">
+        mdi-download
+      </v-icon>
+      <v-icon @click="fileRename(item)" class="mr-2">
+        mdi-pencil
+      </v-icon>
+      <v-icon @click="fileRemove(item)" class="mr-2">
+        mdi-delete
+      </v-icon>
+    </template>
+  </v-data-table>
 </template>
 
 <script>
@@ -33,11 +60,46 @@ export default {
 
   data() {
     return {
+      dialogDelete: false,
+      dialogEdit: false,
+      headers: [
+        {
+          text: this.$t('files.filename'),
+          align: 'start',
+          sortable: true,
+          value: 'name',
+        }, {
+          text: this.$t('files.date'),
+          align: 'start',
+          sortable: true,
+          value: 'lastModified',
+        }, {
+          text: this.$t('files.size'),
+          align: 'start',
+          sortable: true,
+          value: 'sizeString',
+        },
+        {text: this.$t('files.actions'), value: 'actions', sortable: false},
+      ],
       files: [],
+      editedItem: {
+        name: '',
+        newName: ''
+      },
+      defaultItem: {
+        name: '',
+        newName: ''
+      },
       selectedFiles: []
     };
   },
 
+  watch: {
+    dialogEdit(val) {
+      val || this.closeRename();
+    },
+  },
+
   methods: {
     fileList() {
       this.$emit('mask', 1);
@@ -45,7 +107,7 @@ export default {
         this.files = files;
         this.$emit('mask', -1);
       }).catch(error => {
-        this.$emit('notify', { type: 'e', message: error });
+        this.$emit('notify', {type: 'e', message: error});
         this.$emit('mask', -1);
       });
     },
@@ -55,12 +117,48 @@ export default {
       Common.fetch(`files/${file.name}`, {
         method: 'DELETE'
       }).then(data => {
-        this.$emit('notify', { type: 'i', message: `${this.$t('files.message:deleted')} ${data.name}` });
+        this.$emit('notify', {type: 'i', message: `${this.$t('files.message:deleted')} ${data.name}`});
+        this.fileList();
+        this.$emit('mask', -1);
+      }).catch(error => {
+        this.$emit('notify', {type: 'e', message: error});
+        this.$emit('mask', -1);
+      });
+    },
+
+    fileRename(file) {
+      this.editedIndex = this.files.indexOf(file);
+      this.editedItem = Object.assign({}, file);
+      this.editedItem.newName = this.editedItem.name;
+      this.dialogEdit = true;
+    },
+
+    renameFileConfirm() {
+      this.$emit('mask', 1);
+      Common.fetch(`files/${this.editedItem.name}`, {
+        method: 'PUT',
+        headers: {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({newName: this.editedItem.newName})
+      }).then(() => {
+        this.$emit('notify', {type: 'i', message: `${this.$t('files.message:renamed')}`});
         this.fileList();
         this.$emit('mask', -1);
       }).catch(error => {
-        this.$emit('notify', { type: 'e', message: error });
+        this.$emit('notify', {type: 'e', message: error});
         this.$emit('mask', -1);
+      }).finally(() => {
+        this.closeRename();
+      });
+    },
+
+    closeRename() {
+      this.dialogEdit = false;
+      this.$nextTick(() => {
+        this.editedItem = Object.assign({}, this.defaultItem);
+        this.editedIndex = -1;
       });
     },
 
@@ -68,12 +166,12 @@ export default {
       let refresh = false;
       while (this.selectedFiles.length > 0) {
         refresh = true;
-        const name = this.selectedFiles[0];
+        const name = this.selectedFiles[0].name;
         try {
-          await Common.fetch(`files/${name}`, { method: 'DELETE' });
-          this.$emit('notify', { type: 'i', message: `${this.$t('files.message:deleted')} ${name}` });
+          await Common.fetch(`files/${name}`, {method: 'DELETE'});
+          this.$emit('notify', {type: 'i', message: `${this.$t('files.message:deleted')} ${name}`});
         } catch (error) {
-          this.$emit('notify', { type: 'e', message: error });
+          this.$emit('notify', {type: 'e', message: error});
         }
         this.selectedFiles.splice(0, 1);
       }
@@ -96,4 +194,4 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/client/src/components/Navigation.vue b/packages/client/src/components/Navigation.vue
index 61c4a277..5033f41a 100644
--- a/packages/client/src/components/Navigation.vue
+++ b/packages/client/src/components/Navigation.vue
@@ -22,7 +22,7 @@
           <v-list-item-icon><v-icon>mdi-camera</v-icon></v-list-item-icon>
           <v-list-item-title>{{ $t('navigation.scan') }}</v-list-item-title>
         </v-list-item>
-    
+
         <v-list-item @click="go('/files')">
           <v-list-item-icon><v-icon>mdi-file-document-multiple</v-icon></v-list-item-icon>
           <v-list-item-title>{{ $t('navigation.files') }}</v-list-item-title>
@@ -55,7 +55,7 @@
       </template>
 
     </v-navigation-drawer>
-  </div>  
+  </div>
 </template>
 
 <script>
@@ -95,4 +95,4 @@ export default {
   -ms-user-select: none;
   user-select: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/client/src/components/Scan.vue b/packages/client/src/components/Scan.vue
index 84a1a06d..03092791 100644
--- a/packages/client/src/components/Scan.vue
+++ b/packages/client/src/components/Scan.vue
@@ -73,7 +73,7 @@
           <template v-slot:activator="{ on, attrs }">
             <v-btn color="primary" v-bind="attrs" v-on="on">{{ $t('scan.paperSize') }}</v-btn>
           </template>
-          <v-list>
+          <v-list dense>
             <v-list-item
               v-for="(item, index) in paperSizes"
               @click="updatePaperSize(item)"
@@ -223,9 +223,15 @@ export default {
         y: this.device.features['-y'].limits[1]
       };
 
-      const paperSizes = this.context.paperSizes
-        .filter(paper => paper.dimensions.x <= deviceSize.x && paper.dimensions.y <= deviceSize.y);
-      return paperSizes;
+      return this.context.paperSizes
+        .filter(paper => paper.dimensions.x <= deviceSize.x && paper.dimensions.y <= deviceSize.y)
+        .map(paper => {
+          const variables = (paper.name.match(/@:[a-z-.]+/ig) || []).map(s => s.substr(2));
+          variables.forEach(v => {
+            paper.name = paper.name.replaceAll(`@:${v}`, this.$t(v));
+          });
+          return paper;
+        });
     },
 
     pipelines() {
diff --git a/packages/client/src/locales/cs.json b/packages/client/src/locales/cs.json
index 91237e37..0c54f35e 100644
--- a/packages/client/src/locales/cs.json
+++ b/packages/client/src/locales/cs.json
@@ -35,7 +35,7 @@
   "batch-dialog": {
     "btn-cancel": "Zrušení",
     "btn-finish": "Dokončit",
-    "btn-rescan": "Znovu oskenovat",
+    "btn-rescan": "Oskenovat znovu",
     "btn-next": "Další"
   },
 
@@ -43,7 +43,13 @@
     "filename": "Název souboru",
     "date": "Datum",
     "size": "Velikost",
-    "message:deleted": "Odstraněno"
+    "message:deleted": "Odstraněno",
+    "message:renamed": "Soubor byl přejmenován",
+    "button:delete-selected": "Odstranit vybrané",
+    "dialog:rename": "Změnit název souboru",
+    "dialog:rename-cancel": "Zrušit",
+    "dialog:rename-save": "Uložit",
+    "actions": "Akce"
   },
 
   "navigation": {
@@ -65,7 +71,7 @@
   "filter": {
     "auto-level": "Automatické zarovnání",
     "threshold": "Práh",
-    "blur": "Rozmazané"
+    "blur": "Rozostření"
   },
 
   "mode": {
@@ -107,6 +113,17 @@
     "text-file": "Textový soubor"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Na výšku",
+    "landscape": "Na šířku"
+  },
+
   "scan": {
     "device": "Zařízení",
     "source": "Zdroj",
@@ -141,7 +158,7 @@
     "locale": "Lokalizace",
     "locale:description": "Vyberte vaši lokalizaci",
     "theme": "Motiv",
-    "theme:description": "Motiv. Pokud použijete systémový motiv a ten se změní, budete potřebovat aktualizovat stránku s aplikací.",
+    "theme:description": "Motiv. Pokud použijete systémový motiv a dojde ke změně, budete potřebovat aktualizovat stránku s aplikací.",
     "theme:system": "Podle systému",
     "theme:light": "Světlý",
     "theme:dark": "Tmavý",
diff --git a/packages/client/src/locales/de.json b/packages/client/src/locales/de.json
index 56053523..10733b57 100644
--- a/packages/client/src/locales/de.json
+++ b/packages/client/src/locales/de.json
@@ -43,7 +43,13 @@
     "filename": "Dateiname",
     "date": "Datum",
     "size": "Größe",
-    "message:deleted": "Gelöscht"
+    "message:deleted": "Gelöscht",
+    "message:renamed": "Datei umbenannt",
+    "button:delete-selected": "Auswahl löschen",
+    "dialog:rename": "Datei umbennen",
+    "dialog:rename-cancel": "Abbruch",
+    "dialog:rename-save": "Speichern",
+    "actions": "Aktionen"
   },
 
   "navigation": {
@@ -51,7 +57,7 @@
     "files": "Dateien",
     "settings": "Einstellungen",
     "about": "Über",
-    "version": "Version"  
+    "version": "Version"
   },
 
   "batch-mode": {
@@ -61,7 +67,7 @@
     "auto-collate-standard": "Automatisch (Sortiert 1, 3... 4, 2)",
     "auto-collate-reverse": "Automatisch (umgekehrte Reihenfolge 1, 3... 2, 4)"
   },
-  
+
   "filter": {
     "auto-level": "Automatische Farbjustierung",
     "threshold": "Schwellwert",
@@ -105,7 +111,18 @@
     "lzw-compressed": "LZW komprimiert",
     "ocr": "OCR (Texterkennung)",
     "text-file": "Text-Datei"
-  },  
+  },
+
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
 
   "scan": {
     "device": "Gerät",
@@ -132,7 +149,7 @@
     "message:no-devices": "Keine Geräte gefunden",
     "message:deleted-preview": "Vorschau gelöscht",
     "message:turn-documents": "Dokumente umdrehen",
-    "message:preview-of-page": "Vorschau der Seite"  
+    "message:preview-of-page": "Vorschau der Seite"
   },
 
   "settings": {
diff --git a/packages/client/src/locales/en.json b/packages/client/src/locales/en.json
index b802880f..4a57aa2f 100644
--- a/packages/client/src/locales/en.json
+++ b/packages/client/src/locales/en.json
@@ -43,7 +43,13 @@
     "filename": "Filename",
     "date": "Date",
     "size": "Size",
-    "message:deleted": "Deleted"
+    "message:deleted": "Deleted",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -51,7 +57,7 @@
     "files": "Files",
     "settings": "Settings",
     "about": "About",
-    "version": "Version"  
+    "version": "Version"
   },
 
   "batch-mode": {
@@ -61,7 +67,7 @@
     "auto-collate-standard": "Auto (Collate 1, 3... 4, 2)",
     "auto-collate-reverse": "Auto (Reverse 1, 3... 2, 4)"
   },
-    
+
   "filter": {
     "auto-level": "Auto level",
     "threshold": "Threshold",
@@ -105,7 +111,18 @@
     "lzw-compressed": "LZW Compressed",
     "ocr": "OCR",
     "text-file": "Text file"
-  },  
+  },
+
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
 
   "scan": {
     "device": "Device",
@@ -132,7 +149,7 @@
     "message:no-devices": "Found no devices",
     "message:deleted-preview": "Deleted preview",
     "message:turn-documents": "Turn documents over",
-    "message:preview-of-page": "Preview of page"  
+    "message:preview-of-page": "Preview of page"
   },
 
   "settings": {
diff --git a/packages/client/src/locales/es.json b/packages/client/src/locales/es.json
index 550605e1..c9bbaf20 100644
--- a/packages/client/src/locales/es.json
+++ b/packages/client/src/locales/es.json
@@ -43,7 +43,13 @@
     "filename": "Nombre de fichero",
     "date": "Fecha",
     "size": "Tamaño",
-    "message:deleted": "Borrado"
+    "message:deleted": "Borrado",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -107,6 +113,17 @@
     "text-file": "Fichero de texto"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "Dispositivo",
     "source": "Origen",
diff --git a/packages/client/src/locales/fr.json b/packages/client/src/locales/fr.json
index ebcdad2f..f68706b5 100644
--- a/packages/client/src/locales/fr.json
+++ b/packages/client/src/locales/fr.json
@@ -43,7 +43,13 @@
     "filename": "Nom de fichier",
     "date": "Date",
     "size": "Taille",
-    "message:deleted": "Supprimé"
+    "message:deleted": "Supprimé",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -107,6 +113,17 @@
     "text-file": "Fichier texte"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "Scanner",
     "source": "Source",
diff --git a/packages/client/src/locales/it.json b/packages/client/src/locales/it.json
index 992414af..74ac8f93 100644
--- a/packages/client/src/locales/it.json
+++ b/packages/client/src/locales/it.json
@@ -43,7 +43,13 @@
     "filename": "Nome file",
     "date": "Data",
     "size": "Dimensione",
-    "message:deleted": "Eliminato"
+    "message:deleted": "Eliminato",
+    "message:renamed": "File rinominato",
+    "button:delete-selected": "Elimina selezionati",
+    "dialog:rename": "Rinomina file",
+    "dialog:rename-cancel": "Annulla",
+    "dialog:rename-save": "Salva",
+    "actions": "Azioni"
   },
 
   "navigation": {
@@ -107,6 +113,17 @@
     "text-file": "File di testo"
   },
 
+  "paper-size": {
+    "letter": "Lettera",
+    "legal": "Legale",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legale",
+    "half-letter": "Mezza lettera",
+    "portrait": "Verticale",
+    "landscape": "Orizzontale"
+  },
+
   "scan": {
     "device": "Dispositivo",
     "source": "Sorgente",
diff --git a/packages/client/src/locales/pl.json b/packages/client/src/locales/pl.json
index e2bd409c..bac20ea1 100644
--- a/packages/client/src/locales/pl.json
+++ b/packages/client/src/locales/pl.json
@@ -43,7 +43,13 @@
     "filename": "Nazwa pliku",
     "date": "Data",
     "size": "Rozmiar",
-    "message:deleted": "Usunięto"
+    "message:deleted": "Usunięto",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -107,6 +113,17 @@
     "text-file": "Plik tekstowy"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "Urządzenie",
     "source": "Źródło",
diff --git a/packages/client/src/locales/pt-BR.json b/packages/client/src/locales/pt-BR.json
index 4be37ded..ea8fd9e5 100644
--- a/packages/client/src/locales/pt-BR.json
+++ b/packages/client/src/locales/pt-BR.json
@@ -43,7 +43,13 @@
     "filename": "Nome do arquivo",
     "date": "Data",
     "size": "Tamanho",
-    "message:deleted": "Excluído"
+    "message:deleted": "Excluído",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -107,6 +113,17 @@
     "text-file": "Arquivo de texto"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "Dispositivo",
     "source": "Origem",
diff --git a/packages/client/src/locales/ru.json b/packages/client/src/locales/ru.json
index 3e135911..3030badd 100644
--- a/packages/client/src/locales/ru.json
+++ b/packages/client/src/locales/ru.json
@@ -6,30 +6,30 @@
   "about": {
     "main": "scanservjs - простой веб-интерфейс для сканеров, который предоставляет общий доступ к сканерам по сети (используя SANE) без необходимости устанавливать драйверы и исключая сложную процедуру настройки. Поддерживаются форматы TIF, JPG, PNG, PDF и TXT (используется Tesseract OCR) с возможностью задать степень сжатия. Доступно сканирование многостраничных документов. Работает со всеми SANE-совместимыми устройствами.",
     "issue": "Обратная связь, исходный код:",
-    "system-info": "System information"
+    "system-info": "Информация о системе"
   },
 
   "colors": {
-    "accent-4": "Default",
-    "red": "Red",
-    "pink": "Pink",
-    "purple": "Purple",
-    "deep-purple": "Deep purple",
-    "indigo": "Indigo",
-    "blue": "Blue",
-    "light-blue": "Light blue",
-    "cyan": "Cyan",
-    "teal": "Teal",
-    "green": "Green",
-    "light-green": "Light green",
-    "lime": "Lime",
-    "yellow": "Yellow",
-    "amber": "Amber",
-    "orange": "Orange",
-    "deep-orange": "Deep orange",
-    "brown": "Brown",
-    "blue-grey": "Blue grey",
-    "grey": "Grey"
+    "accent-4": "По умолчанию",
+    "red": "Красный",
+    "pink": "Розовый",
+    "purple": "Фиолетовый",
+    "deep-purple": "Темно-фиолетовый",
+    "indigo": "Индиго",
+    "blue": "Синий",
+    "light-blue": "Светло-синий",
+    "cyan": "Голубой",
+    "teal": "Бирюзовый",
+    "green": "Зеленый",
+    "light-green": "Светло-зеленый",
+    "lime": "Лайм",
+    "yellow": "Желтый",
+    "amber": "Янтарный",
+    "orange": "Оранжевый",
+    "deep-orange": "Темно-оранжевый",
+    "brown": "Коричневый",
+    "blue-grey": "Серо-голубой",
+    "grey": "Серый"
   },
 
   "batch-dialog": {
@@ -43,7 +43,13 @@
     "filename": "Имя файла",
     "date": "Дата",
     "size": "Размер",
-    "message:deleted": "Удален"
+    "message:deleted": "Удален",
+    "message:renamed": "Файл переименован",
+    "button:delete-selected": "Удалить выбранное",
+    "dialog:rename": "Переименовать",
+    "dialog:rename-cancel": "Отмена",
+    "dialog:rename-save": "Сохранить",
+    "actions": "Действие"
   },
 
   "navigation": {
@@ -69,10 +75,10 @@
   },
 
   "mode": {
-    "color": "Colour",
-    "halftone": "Halftone",
-    "gray": "Grey",
-    "lineart": "Lineart",
+    "color": "Цветной",
+    "halftone": "Полутона",
+    "gray": "Серый",
+    "lineart": "Черно-белый",
 
     "24bitcolor":"@:mode.color",
     "black & white": "@:mode.lineart",
@@ -82,11 +88,11 @@
   },
 
   "source": {
-    "flatbed": "Flatbed",
-    "adf": "Automatic Document Feeder",
-    "auto": "Auto",
-    "left-aligned": "Left Aligned",
-    "centrally-aligned": "Centrally Aligned",
+    "flatbed": "Планшет",
+    "adf": "Автоподача документов",
+    "auto": "Авто",
+    "left-aligned": "Выровнено по левому краю",
+    "centrally-aligned": "Выровнено по центру",
     "duplex": "Duplex",
     "transparency unit": "Transparency Unit",
 
@@ -107,6 +113,17 @@
     "text-file": "Текстовый файл"
   },
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "Устройство",
     "source": "Источник",
@@ -145,12 +162,12 @@
     "theme:system": "Как в системе",
     "theme:light": "Светлая",
     "theme:dark": "Темная",
-    "color": "Colour",
-    "color:description": "Colour. This will change the colour of the top app bar.",
-    "devices": "Devices and storage",
-    "reset:description": "Clears stored scanner devices and forces a reload",
+    "color": "Цвет",
+    "color:description": "Выбор цвета заголовка приложения",
+    "devices": "Устройства и хранилище",
+    "reset:description": "Очистить сохраненные устройства сканера и перезагрузиться",
     "reset": "Сбросить",
-    "clear-storage:description": "Clears local storage of any cached parameters",
-    "clear-storage": "Clear"
+    "clear-storage:description": "Очистить локальное хранилище и сбросить настройки по умолчанию",
+    "clear-storage": "Очистить"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/client/src/locales/test.json b/packages/client/src/locales/test.json
index 5030ce45..b9cf38db 100644
--- a/packages/client/src/locales/test.json
+++ b/packages/client/src/locales/test.json
@@ -43,7 +43,13 @@
     "filename": "##FILENAME",
     "date": "##DATE",
     "size": "##SIZE",
-    "message:deleted": "##MESSAGE:DELETED"
+    "message:deleted": "##MESSAGE:DELETED",
+    "message:renamed": "##FILE-RENAMED",
+    "button:delete-selected": "##DELETE-SELECTED",
+    "dialog:rename": "##RENAME",
+    "dialog:rename-cancel": "##CANCEL",
+    "dialog:rename-save": "##SAVE",
+    "actions": "##ACTIONS"
   },
 
   "navigation": {
@@ -106,7 +112,18 @@
     "lzw-compressed": "##LZW-COMPRESSED",
     "ocr": "##OCR",
     "text-file": "##TEXT-FILE"
-  },  
+  },
+
+  "paper-size": {
+    "letter": "##LETTER",
+    "legal": "##LEGAL",
+    "tabloid": "##TABLOID",
+    "ledger": "##LEDGER",
+    "junior-legal": "##JUNIOR-LEGAL",
+    "half-letter": "##HALF-LETTER",
+    "portrait": "##PORTRAIT",
+    "landscape": "##LANDSCAPE"
+  },
 
   "scan": {
     "device": "##SCAN.DEVICE",
diff --git a/packages/client/src/locales/zh.json b/packages/client/src/locales/zh.json
index ea80a562..f5b6ebca 100644
--- a/packages/client/src/locales/zh.json
+++ b/packages/client/src/locales/zh.json
@@ -43,7 +43,13 @@
     "filename": "文件名",
     "date": "日期",
     "size": "大小",
-    "message:deleted": "已删除"
+    "message:deleted": "已删除",
+    "message:renamed": "File renamed",
+    "button:delete-selected": "Delete Selected",
+    "dialog:rename": "Change file name",
+    "dialog:rename-cancel": "Cancel",
+    "dialog:rename-save": "Save",
+    "actions": "Actions"
   },
 
   "navigation": {
@@ -106,6 +112,17 @@
     "text-file": "文本文档"
   },  
 
+  "paper-size": {
+    "letter": "Letter",
+    "legal": "Legal",
+    "tabloid": "Tabloid",
+    "ledger": "Ledger",
+    "junior-legal": "Junior legal",
+    "half-letter": "Half letter",
+    "portrait": "Portrait",
+    "landscape": "Landscape"
+  },
+
   "scan": {
     "device": "设备",
     "source": "来源",
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index 11149ae6..7634417c 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "scanservjs-server",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "scanservjs-server",
-      "version": "2.16.2",
+      "version": "2.17.0",
       "license": "GPL-2.0",
       "dependencies": {
         "adm-zip": "^0.5.5",
diff --git a/packages/server/package.json b/packages/server/package.json
index fb37f376..9ac0410b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scanservjs-server",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation.",
   "scripts": {
     "lint": "gulp lint",
diff --git a/packages/server/src/config.js b/packages/server/src/config.js
index ad8407fd..c2084814 100644
--- a/packages/server/src/config.js
+++ b/packages/server/src/config.js
@@ -79,24 +79,30 @@ class Config {
       ],
     
       paperSizes: [
-        { name: 'A3', dimensions: { x: 297, y: 420 } },
-        { name: 'A4', dimensions: { x: 210, y: 297 } },
-        { name: 'A5', dimensions: { x: 148, y: 210 } },
-        { name: 'A6', dimensions: { x: 105, y: 148 } },
-        { name: 'B3', dimensions: { x: 353, y: 500 } },
-        { name: 'B4', dimensions: { x: 250, y: 353 } },
-        { name: 'B5', dimensions: { x: 176, y: 250 } },
-        { name: 'B6', dimensions: { x: 125, y: 176 } },
-        { name: 'DIN D3', dimensions: { x: 272, y: 385 } },
-        { name: 'DIN D4', dimensions: { x: 192, y: 272 } },
-        { name: 'DIN D5', dimensions: { x: 136, y: 192 } },
-        { name: 'DIN D6', dimensions: { x: 96, y: 136 } },
-        { name: 'Letter', dimensions: { x: 216, y: 279 } },
-        { name: 'Legal', dimensions: { x: 216, y: 356 } },
-        { name: 'Tabloid', dimensions: { x: 279, y: 432 } },
-        { name: 'Ledger', dimensions: { x: 432, y: 279 } },
-        { name: 'Junior legal', dimensions: { x: 127, y: 203 } },
-        { name: 'Half letter', dimensions: { x: 140, y: 216 } }
+        { name: 'A3 @:paper-size.portrait', dimensions: { x: 297, y: 420 } },
+        { name: 'A4 @:paper-size.portrait', dimensions: { x: 210, y: 297 } },
+        { name: 'A5 @:paper-size.portrait', dimensions: { x: 148, y: 210 } },
+        { name: 'A5 @:paper-size.landscape', dimensions: { x: 210, y: 148 } },
+        { name: 'A6 @:paper-size.portrait', dimensions: { x: 105, y: 148 } },
+        { name: 'A6 @:paper-size.landscape', dimensions: { x: 148, y: 105 } },
+        { name: 'B3 @:paper-size.portrait', dimensions: { x: 353, y: 500 } },
+        { name: 'B4 @:paper-size.portrait', dimensions: { x: 250, y: 353 } },
+        { name: 'B5 @:paper-size.portrait', dimensions: { x: 176, y: 250 } },
+        { name: 'B5 @:paper-size.landscape', dimensions: { x: 250, y: 176 } },
+        { name: 'B6 @:paper-size.portrait', dimensions: { x: 125, y: 176 } },
+        { name: 'B6 @:paper-size.landscape', dimensions: { x: 176, y: 125 } },
+        { name: 'DIN D3 @:paper-size.portrait', dimensions: { x: 272, y: 385 } },
+        { name: 'DIN D4 @:paper-size.portrait', dimensions: { x: 192, y: 272 } },
+        { name: 'DIN D5 @:paper-size.portrait', dimensions: { x: 136, y: 192 } },
+        { name: 'DIN D5 @:paper-size.landscape', dimensions: { x: 192, y: 136 } },
+        { name: 'DIN D6 @:paper-size.portrait', dimensions: { x: 96, y: 136 } },
+        { name: 'DIN D6 @:paper-size.landscape', dimensions: { x: 136, y: 96 } },
+        { name: '@:paper-size.letter @:paper-size.portrait', dimensions: { x: 216, y: 279 } },
+        { name: '@:paper-size.legal @:paper-size.portrait', dimensions: { x: 216, y: 356 } },
+        { name: '@:paper-size.tabloid @:paper-size.portrait', dimensions: { x: 279, y: 432 } },
+        { name: '@:paper-size.ledger @:paper-size.portrait', dimensions: { x: 432, y: 279 } },
+        { name: '@:paper-size.junior-legal @:paper-size.portrait', dimensions: { x: 127, y: 203 } },
+        { name: '@:paper-size.half-letter @:paper-size.portrait', dimensions: { x: 140, y: 216 } }
       ],
     });
 
diff --git a/packages/server/src/configure.js b/packages/server/src/configure.js
index 637ae0ef..268676cd 100644
--- a/packages/server/src/configure.js
+++ b/packages/server/src/configure.js
@@ -133,6 +133,19 @@ function configure(app, rootPath) {
     }
   });
 
+  app.put('/files/*', async (req, res) => {
+    logRequest(req);
+    try {
+      const name = req.params[0];
+      const newName = req.body.newName;
+      await FileInfo.unsafe(Config.outputDirectory, name)
+        .move(`${Config.outputDirectory}/${newName}`);
+      res.send('200');
+    } catch (error) {
+      sendError(res, 500, error);
+    }
+  });
+
   app.post('/preview', async (req, res) => {
     logRequest(req);
     try {
diff --git a/packages/server/src/file-info.js b/packages/server/src/file-info.js
index 5b2b30ad..3d74379b 100644
--- a/packages/server/src/file-info.js
+++ b/packages/server/src/file-info.js
@@ -132,6 +132,7 @@ class FileInfo {
    * @returns {Promise.<void>}
    */
   async move(destination) {
+    FileInfo.assertPath(destination);
     return await new Promise((resolve, reject) => {
       mv(this.fullname, destination, (err) => {
         if (err) {
diff --git a/packages/server/test/device.test.js b/packages/server/test/device.test.js
index 90df1d8a..eb6517f0 100644
--- a/packages/server/test/device.test.js
+++ b/packages/server/test/device.test.js
@@ -188,7 +188,7 @@ describe('Device', () => {
     assert.deepStrictEqual(device.features['--mode'].options, ['Monochrome', 'Grayscale', 'Color']);
     assert.strictEqual(device.features['--mode'].default, 'Color');
     assert.strictEqual(device.features['--source'], undefined);
-    assert.deepStrictEqual(device.features['--resolution'].options, [50,75, 150, 300, 600, 1200]);
+    assert.deepStrictEqual(device.features['--resolution'].options, [50, 75, 150, 300, 600, 1200]);
     assert.strictEqual(device.features['--resolution'].default, 75);
     assert.strictEqual(device.features['-l'].limits[0], 0);
     assert.strictEqual(device.features['-l'].limits[1], 215.9);