diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index e3eccca..ab3e3d4 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,3 +1,57 @@
 # Developer notes
 **Programming language:** TypeScript
-**Framework:** Electron (latest)
\ No newline at end of file
+
+**Framework:** Electron (latest)
+
+## Encryption
+OffPass uses PGP in the background with symmetric encrpytion.
+
+### Passphrase
+The passphrase is the actual key which is used for encrpytion. But we don't use your entered master password directly. We hash it with `Argon2i` about 25 times. This gives use an output like this: `29dbf5392f13f36d7e9509b1a5c9add0d6a8e2625b5e84ab4d1df8da6063625d`.
+
+This value will be used as passphrase, not your plain password. The creation of this hash takes about **more then one second**. 
+
+Attackers are using password dictionaries with more then one million passwords. Creating such a hash for each password in there would take **millions of years**.
+
+## QR-Code schema
+An OffPass QR-Code must follow this data schema or else OffPass wouldn't be able to read it. **The following examples are data after decryption.**
+```
+name|password|email|website_url|(custom1)data1|(custom2)data2
+```
+Als Beispiel:
+```
+Main Steam Account|super_secret_example123|info@example.de|https://store.steampowered.com/login/|(2fa_backup)R1337
+
+ProtonMail|mail_pw123|klier.nicolas@protonmail.com||
+```
+These characters are reserved and cannot be used for any fields: `|%§`
+
+### Compression
+It is possible to compress QR-Codes. Instead of writing all data to the QR-Code you can write random strings (key) to it. OffPass itself holds a database of those random string and the corresponding encrypted value.
+
+The program generates a `session key` (length of 10 characters) which is unique for each QR-Code. This session key is stored on the QR-Code and is used to encrypt the raw values in database. So not even If someone stells your database he wouldn't be able to read your compressed strings.
+
+The compression key is stored like that: `§key`, the decryption key is stored like that: `%decryption_key%` always at the beginning.
+
+For example:
+```
+%session_key%§xa|passwords_not2134|email_too@example.com|§q|(§a)§gh|(uncompressed)value
+
+-> Google|passwords_not2134|email_either@example.com|https://accounts.google.com|(2fa_backup)245131,...|(uncompressed)value
+```
+
+This can has two advantages:
+* An attacker can't read compressed values (he would need the database)
+* You can get more data on one QR-Code
+
+But one disadvantage: 
+* **If you lose access to the compression database, you also lose access to those compressed values. But not to your password.**
+
+### Type mark
+OffPass will first look if the scanned QR-Code is actually an OffPass QR-Code. This is done by checking the first three charcters:
+
+```
+op:jA0ECQMC+t514sews8e70jsBw4SWsYYgPGzi5Ps0OGr8/tVGngopmHDQpSpMkNtkWZU573zNsFyk VVN3elnAY0D+EIIzTpKxq0F3fQ==
+```
+
+This `op:` tells the program that this is actully a OffPass QR-Code. If this is not present, OffPass will abort further steps and notify the user that this is not an OffPass QR-Code.
\ No newline at end of file
diff --git a/package.json b/package.json
index caa1d1b..759b0ea 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "tsc && electron dist/main.js"
+    "start": "tsc && electron src/main.js",
+    "clean": "del /S src\\js\\*.js && del src\\*.js"
   },
   "repository": {
     "type": "git",
diff --git a/src/assets/icon.png b/src/assets/icon.png
new file mode 100644
index 0000000..90a2734
Binary files /dev/null and b/src/assets/icon.png differ
diff --git a/src/global.css b/src/css/global.css
similarity index 86%
rename from src/global.css
rename to src/css/global.css
index b2bb56a..1f2be90 100644
--- a/src/global.css
+++ b/src/css/global.css
@@ -19,6 +19,13 @@ p, span {
     color: #fff;
 }
 
+a {
+    color: white;
+    text-decoration: none;
+    font-weight: bold;
+    font-family: 'Source Sans Pro', sans-serif;
+}
+
 #taskbar {
     display: flex;
     position: absolute;
@@ -40,7 +47,6 @@ p, span {
     height: 100%;
     vertical-align: middle;
     text-align: cover;
-    object-fit: fill;
 }
 #content div {
     position: absolute;
diff --git a/src/scanner.css b/src/css/scanner.css
similarity index 89%
rename from src/scanner.css
rename to src/css/scanner.css
index 5450058..936d230 100644
--- a/src/scanner.css
+++ b/src/css/scanner.css
@@ -29,7 +29,8 @@
     opacity: 0;
     padding-left: 20px;
     backdrop-filter: blur(20px);
-    background-color: rgba(0, 0, 0, .3);
+    background: linear-gradient(0deg, rgba(0,0,0,.75) 80%, rgba(94,94,94,.75) 100%);
+    box-shadow: 0px -10px 34px -10px rgba(0,0,0,0.75);
 }
 
 #password {
diff --git a/src/start.css b/src/css/start.css
similarity index 89%
rename from src/start.css
rename to src/css/start.css
index bee069c..091f5ba 100644
--- a/src/start.css
+++ b/src/css/start.css
@@ -4,7 +4,6 @@
     padding-top: calc(10% + 50px);
     width: 100%;
     height: 100%;
-    pointer-events: none;
 }
 #master_prompt input {
     margin-top: 50px;
@@ -22,4 +21,8 @@
     border-bottom-width: 3px;
     border-bottom-left-radius: 2px;
     border-bottom-right-radius: 2px;
+}
+#master_prompt a {
+    line-height: 5;
+    font-size: 13pt;
 }
\ No newline at end of file
diff --git a/src/html/create.html b/src/html/create.html
new file mode 100644
index 0000000..ff3f00a
--- /dev/null
+++ b/src/html/create.html
@@ -0,0 +1,3 @@
+<div id="create_setup">
+    <h1>New QR-Code</h1>
+</div>
\ No newline at end of file
diff --git a/src/index.html b/src/html/index.html
similarity index 81%
rename from src/index.html
rename to src/html/index.html
index c139869..bb6418b 100644
--- a/src/index.html
+++ b/src/html/index.html
@@ -2,17 +2,17 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <title>Hello World!</title>
+        <title>OffPass</title>
 
-        <script type="text/javascript" src="assets/instascan.min.js"></script>
+        <script type="text/javascript" src="../assets/instascan.min.js"></script>
 
         <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap" rel="stylesheet">
         <link href="https://fonts.googleapis.com/css?family=Oxygen:700&display=swap" rel="stylesheet">
-        <link href="assets/fontawesome-5.11.2/css/all.css" rel="stylesheet">
-        <link href="assets/animate.css" rel="stylesheet">
-        <link href="global.css" rel="stylesheet">
-        <link href="start.css" rel="stylesheet">
-        <link href="scanner.css" rel="stylesheet">
+        <link href="../assets/fontawesome-5.11.2/css/all.css" rel="stylesheet">
+        <link href="../assets/animate.css" rel="stylesheet">
+        <link href="../css/global.css" rel="stylesheet">
+        <link href="../css/start.css" rel="stylesheet">
+        <link href="../css/scanner.css" rel="stylesheet">
     </head>
     <body>
         <div id="taskbar">
@@ -24,7 +24,9 @@
             <div id="master_prompt">
                 <h1>Welcome to OffPass</h1>
                 <p>Please enter your master password for decryption</p>
-                <input id="master" placeholder="Master password..." type="password" autofocus>        
+                <input id="master" placeholder="Master password..." type="password" autofocus><br>
+                
+                <a href="#">Or create a new QR-Code</a>
             </div>
             <div id="wait">
                 <h1>Wait for camera...</h1>
@@ -39,7 +41,7 @@
         </div>
 
         <script>
-            window.$ = window.jQuery = require('../src/assets/jquery-3.4.1.min.js');
+            window.$ = window.jQuery = require('../assets/jquery-3.4.1.min.js');
 
             const { remote } = require('electron');
             const pgp = require('openpgp');
@@ -64,6 +66,15 @@
                 }
             });
 
+            $('#master_prompt a').click((e) => {
+                $('#master_prompt').animate({
+                    left: '-150%'
+                });
+                $('#create_setup').animate({
+                    left: '0'
+                });
+            });
+
             function showError(message) {
                 const error = $('#error');
                 error.css('bottom', '50px');
@@ -112,12 +123,12 @@
                         content = "-----BEGIN PGP MESSAGE-----\n\n" + content + "\n-----END PGP MESSAGE-----";
                         console.log(content)
                         pgp.decrypt({
-                        message: await pgp.message.readArmored(content),
-                        passwords: [ master_password ],
-                        format: 'string'
+                            message: await pgp.message.readArmored(content),
+                            passwords: [ master_password ],
+                            format: 'string'
                         }).then((plaintext) => {
                             const scanned = $('#scanned');
-                            scanned.css('top', '80%');
+                            scanned.css('top', '85%');
                             scanned.css('z-index', '2');
                             scanned.addClass("fadeInUp");
                             $('#password').text(plaintext.data)
diff --git a/src/js/loader.js b/src/js/loader.js
new file mode 100644
index 0000000..9cdda0b
--- /dev/null
+++ b/src/js/loader.js
@@ -0,0 +1,10 @@
+/**
+ * This script loads or unloads different modules present in src/js
+ */
+class Loader {
+    index = null;
+
+    constructor(index) {
+
+    }
+}
\ No newline at end of file
diff --git a/dist/main.js b/src/main.js
similarity index 73%
rename from dist/main.js
rename to src/main.js
index 9327dc2..c26d6c2 100644
--- a/dist/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
 "use strict";
 exports.__esModule = true;
 var electron_1 = require("electron");
+var path_1 = require("path");
 var win = null;
 electron_1.app.on('ready', function () {
     win = new electron_1.BrowserWindow({
@@ -12,11 +13,11 @@ electron_1.app.on('ready', function () {
         webPreferences: {
             nodeIntegration: true,
             enableRemoteModule: true
-        }
+        },
+        backgroundColor: '#1c1c1c',
+        icon: path_1.join(__dirname, '../src/assets/icon.png')
     });
-    //win.loadURL("https://google.de")
-    win.loadFile('../src/index.html');
-    win.setTitle("OffPass");
+    win.loadFile('html/index.html');
 });
 electron_1.app.on('window-all-closed', function () {
     process.exit(0);
diff --git a/src/main.ts b/src/main.ts
index 4d7f98d..8bec9cf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,5 @@
 import { app, BrowserWindow } from 'electron';
+import { join } from 'path';
 let win: BrowserWindow = null;
 
 app.on('ready', () => {
@@ -11,11 +12,11 @@ app.on('ready', () => {
         webPreferences: {
             nodeIntegration: true,
             enableRemoteModule: true
-        }
+        },
+        backgroundColor: '#1c1c1c',
+        icon: join(__dirname, '../src/assets/icon.png')
     });
-    //win.loadURL("https://google.de")
-    win.loadFile('../src/index.html');
-    win.setTitle("OffPass")
+    win.loadFile('html/index.html');
 });
 
 app.on('window-all-closed', () => {
diff --git a/tsconfig.json b/tsconfig.json
index 6f78b76..7a73a41 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,2 @@
 {
-    "compilerOptions": {
-        "outDir": "dist/"
-    }
 }
\ No newline at end of file