diff --git a/CHANGELOG.md b/CHANGELOG.md
index 670585876..61cdddca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [0.58.0](https://github.com/gotson/komga/compare/v0.57.0...v0.58.0) (2020-08-24)
+
+
+### Bug Fixes
+
+* **webui:** update option title in library dialog ([29d9726](https://github.com/gotson/komga/commit/29d97266137a4f38497e75f1a1f24fbf9ae96f46))
+
+
+### Features
+
+* **webui:** handle new metadata fields ([5567adc](https://github.com/gotson/komga/commit/5567adc9460a20373e3a63f48995d1bbaca5bf50)), closes [#276](https://github.com/gotson/komga/issues/276)
+* add/rearrange metadata fields ([9e406e3](https://github.com/gotson/komga/commit/9e406e33167284f3803beb45243bf11992ec7e83)), closes [#276](https://github.com/gotson/komga/issues/276)
+
 # [0.57.0](https://github.com/gotson/komga/compare/v0.56.1...v0.57.0) (2020-08-20)
 
 
diff --git a/gradle.properties b/gradle.properties
index 65745eeed..1c9c29bc8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=0.57.0
+version=0.58.0
diff --git a/komga/docs/openapi.json b/komga/docs/openapi.json
index fb2ebb11e..eec25f65f 100644
--- a/komga/docs/openapi.json
+++ b/komga/docs/openapi.json
@@ -185,31 +185,35 @@
           "numberSortLock": {
             "type": "boolean"
           },
+          "tagsLock": {
+            "type": "boolean"
+          },
           "releaseDate": {
             "format": "date",
             "type": "string"
           },
+          "created": {
+            "format": "date-time",
+            "type": "string"
+          },
           "numberLock": {
             "type": "boolean"
           },
           "releaseDateLock": {
             "type": "boolean"
           },
-          "ageRating": {
-            "format": "int32",
-            "type": "integer"
-          },
           "title": {
             "type": "string"
           },
           "titleLock": {
             "type": "boolean"
           },
-          "readingDirection": {
-            "type": "string"
-          },
-          "ageRatingLock": {
-            "type": "boolean"
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           },
           "number": {
             "type": "string"
@@ -217,22 +221,17 @@
           "summaryLock": {
             "type": "boolean"
           },
-          "readingDirectionLock": {
-            "type": "boolean"
-          },
-          "publisherLock": {
-            "type": "boolean"
-          },
           "numberSort": {
             "format": "float",
             "type": "number"
           },
-          "publisher": {
-            "type": "string"
-          },
           "authorsLock": {
             "type": "boolean"
           },
+          "lastModified": {
+            "format": "date-time",
+            "type": "string"
+          },
           "authors": {
             "type": "array",
             "items": {
@@ -494,6 +493,9 @@
           "numberSortLock": {
             "type": "boolean"
           },
+          "tagsLock": {
+            "type": "boolean"
+          },
           "releaseDate": {
             "format": "date",
             "type": "string"
@@ -504,27 +506,18 @@
           "releaseDateLock": {
             "type": "boolean"
           },
-          "ageRating": {
-            "format": "int32",
-            "type": "integer"
-          },
           "title": {
             "type": "string"
           },
           "titleLock": {
             "type": "boolean"
           },
-          "ageRatingLock": {
-            "type": "boolean"
-          },
-          "readingDirection": {
-            "type": "string",
-            "enum": [
-              "LEFT_TO_RIGHT",
-              "RIGHT_TO_LEFT",
-              "VERTICAL",
-              "WEBTOON"
-            ]
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           },
           "number": {
             "type": "string"
@@ -532,19 +525,10 @@
           "summaryLock": {
             "type": "boolean"
           },
-          "readingDirectionLock": {
-            "type": "boolean"
-          },
-          "publisherLock": {
-            "type": "boolean"
-          },
           "numberSort": {
             "format": "float",
             "type": "number"
           },
-          "publisher": {
-            "type": "string"
-          },
           "authorsLock": {
             "type": "boolean"
           },
@@ -799,29 +783,80 @@
       "SeriesMetadataDto": {
         "type": "object",
         "properties": {
+          "summary": {
+            "type": "string"
+          },
           "titleSort": {
             "type": "string"
           },
+          "tagsLock": {
+            "type": "boolean"
+          },
           "created": {
             "format": "date-time",
             "type": "string"
           },
-          "statusLock": {
-            "type": "boolean"
-          },
-          "lastModified": {
-            "format": "date-time",
+          "language": {
             "type": "string"
           },
+          "ageRating": {
+            "format": "int32",
+            "type": "integer"
+          },
           "title": {
             "type": "string"
           },
           "titleLock": {
             "type": "boolean"
           },
+          "readingDirection": {
+            "type": "string"
+          },
+          "ageRatingLock": {
+            "type": "boolean"
+          },
+          "languageLock": {
+            "type": "boolean"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "summaryLock": {
+            "type": "boolean"
+          },
+          "readingDirectionLock": {
+            "type": "boolean"
+          },
+          "genres": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "publisherLock": {
+            "type": "boolean"
+          },
+          "statusLock": {
+            "type": "boolean"
+          },
+          "publisher": {
+            "type": "string"
+          },
+          "lastModified": {
+            "format": "date-time",
+            "type": "string"
+          },
           "titleSortLock": {
             "type": "boolean"
           },
+          "genresLock": {
+            "type": "boolean"
+          },
           "status": {
             "type": "string"
           }
@@ -971,21 +1006,78 @@
         "description": "Metadata fields to update. Set a field to null to unset the metadata. You can omit fields you don\u0027t want to update.",
         "type": "object",
         "properties": {
+          "summary": {
+            "type": "string"
+          },
           "titleSort": {
             "type": "string"
           },
-          "statusLock": {
+          "tagsLock": {
             "type": "boolean"
           },
+          "language": {
+            "type": "string"
+          },
+          "ageRating": {
+            "format": "int32",
+            "type": "integer"
+          },
           "title": {
             "type": "string"
           },
           "titleLock": {
             "type": "boolean"
           },
+          "ageRatingLock": {
+            "type": "boolean"
+          },
+          "languageLock": {
+            "type": "boolean"
+          },
+          "readingDirection": {
+            "type": "string",
+            "enum": [
+              "LEFT_TO_RIGHT",
+              "RIGHT_TO_LEFT",
+              "VERTICAL",
+              "WEBTOON"
+            ]
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "summaryLock": {
+            "type": "boolean"
+          },
+          "readingDirectionLock": {
+            "type": "boolean"
+          },
+          "genres": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "publisherLock": {
+            "type": "boolean"
+          },
+          "statusLock": {
+            "type": "boolean"
+          },
+          "publisher": {
+            "type": "string"
+          },
           "titleSortLock": {
             "type": "boolean"
           },
+          "genresLock": {
+            "type": "boolean"
+          },
           "status": {
             "type": "string",
             "enum": [
@@ -1997,6 +2089,30 @@
         ]
       }
     },
+    "/api/v1/genres": {
+      "get": {
+        "operationId": "getGenres",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "referential-controller"
+        ]
+      }
+    },
     "/api/v1/series/{seriesId}/read-progress": {
       "post": {
         "operationId": "markAsRead",
@@ -3520,6 +3636,30 @@
         ]
       }
     },
+    "/api/v1/tags": {
+      "get": {
+        "operationId": "getTags",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "referential-controller"
+        ]
+      }
+    },
     "/api/v1/collections/{id}/thumbnail": {
       "get": {
         "operationId": "getCollectionThumbnail",
@@ -3743,22 +3883,19 @@
         ]
       }
     },
-    "/api/v1/books/{bookId}/metadata": {
-      "patch": {
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/BookMetadataUpdateDto"
+    "/api/v1/books/{bookId}": {
+      "get": {
+        "operationId": "getOneBook",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BookDto"
+                }
               }
             }
-          },
-          "required": true
-        },
-        "operationId": "updateMetadata",
-        "responses": {
-          "204": {
-            "description": "No Content"
           }
         },
         "parameters": [
@@ -3776,19 +3913,22 @@
         ]
       }
     },
-    "/api/v1/books/{bookId}": {
-      "get": {
-        "operationId": "getOneBook",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/BookDto"
-                }
+    "/api/v1/books/{bookId}/metadata": {
+      "patch": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BookMetadataUpdateDto"
               }
             }
+          },
+          "required": true
+        },
+        "operationId": "updateMetadata",
+        "responses": {
+          "204": {
+            "description": "No Content"
           }
         },
         "parameters": [