diff --git a/build/screenshots/Screenshot-Database.json b/build/screenshots/Screenshot-Database.json
new file mode 100644
index 0000000000000000000000000000000000000000..7184848cd8016dbd5cf192bde16a65b535944a82
--- /dev/null
+++ b/build/screenshots/Screenshot-Database.json
@@ -0,0 +1,238 @@
+{
+  "TYPE": "BUDGETMASTER_DATABASE",
+  "VERSION": 3,
+  "categories": [
+    {
+      "ID": 1,
+      "name": "No Category",
+      "color": "#FFFFFF",
+      "type": "NONE"
+    },
+    {
+      "ID": 2,
+      "name": "Rest",
+      "color": "#FFFF00",
+      "type": "REST"
+    },
+    {
+      "ID": 3,
+      "name": "Salary",
+      "color": "#4cd964",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 4,
+      "name": "Misc",
+      "color": "#333333",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 5,
+      "name": "Mobile Phone/Internet",
+      "color": "#5ac8fa",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 6,
+      "name": "Electricity/Gas",
+      "color": "#888888",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 7,
+      "name": "Car",
+      "color": "#007afa",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 8,
+      "name": "Cash",
+      "color": "#ff5197",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 9,
+      "name": "Electronics",
+      "color": "#ff9500",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 10,
+      "name": "Rent",
+      "color": "#9b59b6",
+      "type": "CUSTOM"
+    }
+  ],
+  "accounts": [
+    {
+      "ID": 1,
+      "name": "Placeholder",
+      "type": "ALL"
+    },
+    {
+      "ID": 2,
+      "name": "Default Account",
+      "type": "CUSTOM"
+    },
+    {
+      "ID": 3,
+      "name": "Savings Bank",
+      "type": "CUSTOM"
+    }
+  ],
+  "transactions": [
+    {
+      "ID": 10,
+      "amount": -6500,
+      "date": "2018-08-21",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 6,
+        "name": "Electricity/Gas",
+        "color": "#888888",
+        "type": "CUSTOM"
+      },
+      "name": "Electricity",
+      "description": "",
+      "tags": [],
+      "repeatingOption": {
+        "ID": 3,
+        "startDate": "2018-08-21",
+        "modifier": {
+          "ID": 3,
+          "quantity": 1,
+          "localizationKey": "repeating.modifier.months"
+        },
+        "endOption": {
+          "ID": 3,
+          "localizationKey": "repeating.end.key.never"
+        }
+      }
+    },
+    {
+      "ID": 11,
+      "amount": -2764,
+      "date": "2018-08-17",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 5,
+        "name": "Mobile Phone/Internet",
+        "color": "#5ac8fa",
+        "type": "CUSTOM"
+      },
+      "name": "Internet and Phone \t",
+      "description": "",
+      "tags": [],
+      "repeatingOption": {
+        "ID": 5,
+        "startDate": "2018-08-17",
+        "modifier": {
+          "ID": 5,
+          "quantity": 1,
+          "localizationKey": "repeating.modifier.months"
+        },
+        "endOption": {
+          "ID": 5,
+          "localizationKey": "repeating.end.key.never"
+        }
+      }
+    },
+    {
+      "ID": 13,
+      "amount": -450,
+      "date": "2018-08-14",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 4,
+        "name": "Misc",
+        "color": "#333333",
+        "type": "CUSTOM"
+      },
+      "name": "Pizza",
+      "description": "",
+      "tags": []
+    },
+    {
+      "ID": 14,
+      "amount": -5223,
+      "date": "2018-08-04",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 7,
+        "name": "Car",
+        "color": "#007afa",
+        "type": "CUSTOM"
+      },
+      "name": "Fuel",
+      "description": "",
+      "tags": []
+    },
+    {
+      "ID": 15,
+      "amount": -27738,
+      "date": "2018-07-14",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 1,
+        "name": "No Category",
+        "color": "#FFFFFF",
+        "type": "NONE"
+      },
+      "name": "Payment",
+      "description": "",
+      "tags": []
+    },
+    {
+      "ID": 17,
+      "amount": 150000,
+      "date": "2018-08-01",
+      "account": {
+        "ID": 2,
+        "name": "Default Account",
+        "type": "CUSTOM"
+      },
+      "category": {
+        "ID": 3,
+        "name": "Salary",
+        "color": "#4cd964",
+        "type": "CUSTOM"
+      },
+      "name": "Salary",
+      "description": "Lorem Ipsum dolor sit amet",
+      "tags": [],
+      "repeatingOption": {
+        "ID": 4,
+        "startDate": "2018-08-01",
+        "modifier": {
+          "ID": 4,
+          "quantity": 1,
+          "localizationKey": "repeating.modifier.months"
+        },
+        "endOption": {
+          "ID": 4,
+          "localizationKey": "repeating.end.key.never"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/build/screenshots/dark/accounts.png b/build/screenshots/dark/accounts.png
index ad4ec0acb7623efec47c609e28e07c4a7fc8d782..9c6b8d56997dfca46a0388b2848521f6e578a86b 100644
Binary files a/build/screenshots/dark/accounts.png and b/build/screenshots/dark/accounts.png differ
diff --git a/build/screenshots/dark/categories.png b/build/screenshots/dark/categories.png
index 8784020454473284393870e1dac1ccd0d4b0bdf5..ddc71b1180eeceebb2ed5e17db27f2806d6e70b5 100644
Binary files a/build/screenshots/dark/categories.png and b/build/screenshots/dark/categories.png differ
diff --git a/build/screenshots/dark/home.png b/build/screenshots/dark/home.png
index 04c60732d6884b38b240502d537da08e723dd0c7..4dc81266e7af1bb18cbc3ac7656cae1bf79f817b 100644
Binary files a/build/screenshots/dark/home.png and b/build/screenshots/dark/home.png differ
diff --git a/build/screenshots/dark/new_category.png b/build/screenshots/dark/new_category.png
index 9045490219f8bfa8c5bc8d27f8f2468ae6776e3b..22e2021e4ee0884e48caa9546ed9329c1518fd61 100644
Binary files a/build/screenshots/dark/new_category.png and b/build/screenshots/dark/new_category.png differ
diff --git a/build/screenshots/dark/new_transaction_1.png b/build/screenshots/dark/new_transaction_1.png
index 7a8f4ad6f079b6414c9e805368d18efd9a094e9e..9106ad259cf8caabc17884b8de880b89e13bfa6c 100644
Binary files a/build/screenshots/dark/new_transaction_1.png and b/build/screenshots/dark/new_transaction_1.png differ
diff --git a/build/screenshots/dark/new_transaction_2.png b/build/screenshots/dark/new_transaction_2.png
index 24b7fb4c18891090b29650c449847b5ff115589b..a86bb58d75e572e8f948155d964320174b7e9104 100644
Binary files a/build/screenshots/dark/new_transaction_2.png and b/build/screenshots/dark/new_transaction_2.png differ
diff --git a/build/screenshots/dark/settings.png b/build/screenshots/dark/settings.png
index 8238df3b490f098eaba4ec84be986225d1e028c5..3d1e4570fe3b3d5301555f4173c748d35364a102 100644
Binary files a/build/screenshots/dark/settings.png and b/build/screenshots/dark/settings.png differ
diff --git a/build/screenshots/dark/transactions.png b/build/screenshots/dark/transactions.png
index 30c89e508d8ac21bb8974c91449444dd83f10a6b..ebc354946c09888e435a4bd043868ad4e4a9e34e 100644
Binary files a/build/screenshots/dark/transactions.png and b/build/screenshots/dark/transactions.png differ
diff --git a/build/screenshots/light/accounts.png b/build/screenshots/light/accounts.png
index 4f09512c697a1e6a07a3ab526e8231cd4b96853b..c18d5e10029325149c7bd7d9e8dbed344aecaf0f 100644
Binary files a/build/screenshots/light/accounts.png and b/build/screenshots/light/accounts.png differ
diff --git a/build/screenshots/light/categories.png b/build/screenshots/light/categories.png
index 7b6ed454bc62ffd8237bad63e45864d44b40d28a..2bcff34f11267ec90dd6328a2747c44c3c989cdf 100644
Binary files a/build/screenshots/light/categories.png and b/build/screenshots/light/categories.png differ
diff --git a/build/screenshots/light/home.pmg.png b/build/screenshots/light/home.pmg.png
deleted file mode 100644
index ae23e5f44cff26f588656020fd3ffc77938e0c07..0000000000000000000000000000000000000000
Binary files a/build/screenshots/light/home.pmg.png and /dev/null differ
diff --git a/build/screenshots/light/home.png b/build/screenshots/light/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..fecf47154ff790322f01591b9e1ed20c948a4a2a
Binary files /dev/null and b/build/screenshots/light/home.png differ
diff --git a/build/screenshots/light/new_category.png b/build/screenshots/light/new_category.png
index f12c5a2131362a67b1a4de82bb13b5b7c8b0afda..9dab382ce1cd05730c9d43f18f9fb6aa8cdc1935 100644
Binary files a/build/screenshots/light/new_category.png and b/build/screenshots/light/new_category.png differ
diff --git a/build/screenshots/light/new_transaction_1.png b/build/screenshots/light/new_transaction_1.png
index e6444920027dc81456e8958493d4c3a492fd0007..7b8c2c545818b7f2328f4ef00e618a981c7c95eb 100644
Binary files a/build/screenshots/light/new_transaction_1.png and b/build/screenshots/light/new_transaction_1.png differ
diff --git a/build/screenshots/light/new_transaction_2.png b/build/screenshots/light/new_transaction_2.png
index 1ac73f81b4d105b705b533de55cc7a804e8276e1..4a856447a686a6060ac7cb631371b3bcc26f3363 100644
Binary files a/build/screenshots/light/new_transaction_2.png and b/build/screenshots/light/new_transaction_2.png differ
diff --git a/build/screenshots/light/settings.png b/build/screenshots/light/settings.png
index 11949e6d037d23c210876da9cbca300da70fe937..38e9560cf70b8c6a964caea252090a28008f626c 100644
Binary files a/build/screenshots/light/settings.png and b/build/screenshots/light/settings.png differ
diff --git a/build/screenshots/light/transactions.png b/build/screenshots/light/transactions.png
index a46d1c1fde3e4b204e40568ea1d2334a50b77d1c..b0201ca9ebe7248ff2fce43a2b5cb4b52a8ef06b 100644
Binary files a/build/screenshots/light/transactions.png and b/build/screenshots/light/transactions.png differ