part 2

oops
4.0
2026-06-07 08:25:54 +02:00 · 2020-08-26 14:38:52 +01:00 · 2020-08-26 14:38:34 +01:00 · 2020-08-26 14:32:52 +01:00 · 2020-08-10 19:49:46 +01:00 · 2020-07-22 15:29:02 +02:00
110 changed files with 3610 additions and 579 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,2 @@
+GENERATE_SOURCEMAP=false
+INLINE_RUNTIME_CHUNK=false
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
+github: ohlookitsderpy
 patreon: ohlookitsderpy
 ko_fi: ohlookitsderpy
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report
-about: Report a bug to help improve this project
-title: "[BUG]"
+about: Report a bug to help improve Mue
+title: "[Bug]"
 labels: bug
 assignees: ''

@@ -14,8 +14,7 @@ A clear and concise description of what the bug is.
 Steps to reproduce the behaviour:
 1. Go to '...'
 2. Click on '....'
-3. Scroll down to '....'
-4. See error
+3. See error in console (Ctrl + Shift + I)

 **Expected behaviour**
 A clear and concise description of what you expected to happen.
@@ -24,10 +23,12 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.

 **Desktop (please complete the following information):**
- - OS: [e.g. Windows]
- - Browser [e.g. Chrome, Firefox]
- - Version [e.g. 70]
- - Resolution [e.g 1920x1080]
+ - OS: [e.g. Windows, Ubuntu]
+ - OS Version: [e.g 10, 19.10]
+ - Browser: [e.g. Chrome, Firefox]
+ - Browser Version: [e.g. 70]
+ - Mue Version: [e.g. 0.5]
+ - Resolution: [e.g 1920x1080]

 **Additional context**
 Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: Suggest an idea for this project
+about: Suggest an idea for Mue
 title: "[Feature Request]"
 labels: enhancement
 assignees: ''
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ build/

 # Files
 package-lock.json
-yarn.lock
+yarn-error.log
+yarn.lock
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at github@muetab.xyz. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
--- a/42
+++ b/42
@@ -1,21 +1,29 @@
-MIT License
+BSD 3-Clause License

-Copyright (c) 2018-2019 David Ralph (ohlookitsderpy)
+Copyright (c) 2018-2020 Mue Tab
+All rights reserved.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/README.md
+++ b/README.md
@@ -1,68 +1,88 @@
-<img src='assets/logo/logo_horizontal.png'>
+<img src="https://raw.githubusercontent.com/mue/branding/master/logo/logo_round.png" align="left" width="180px" height="180px"/>
+<img align="left" width="0" height="192px" hspace="10"/>

-# Mue
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fba7ad7fc6e14fe0bc2a8d53dbf0bb41)](https://www.codacy.com/app/ohlookitsderpy/Mue?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ohlookitsderpy/Mue&amp;utm_campaign=Badge_Grade)
-[![Discord Badge](https://discordapp.com/api/guilds/336039472250748928/widget.png)](https://discord.gg/HJmmmTB)
+> <a href="https://muetab.xyz/">Mue</a>

-<a href='https://ko-fi.com/ohlookitsderpy' target='_blank'><img height='36' src='assets/kofi.png' alt='Buy me a coffee at ko-fi.com' /></a>
-<a href='https://patreon.com/ohlookitsderpy' target='_blank'><img height='36' src='assets/patreon.png' alt='Become a patron on patreon.com' /></a>
+[![License](https://img.shields.io/badge/license-BSD%203-blue?style=flat-square)](/LICENSE) [![Discord](https://img.shields.io/discord/659129207208804381?label=discord&color=7289DA&style=flat-square)](https://discord.gg/zv8C9F8) [![Code Size]( https://img.shields.io/github/languages/code-size/mue/mue?color=green&label=size&style=flat-square)]()
+<br>
+[![Microsoft Edge](https://img.shields.io/badge/dynamic/json?style=flat-square&label=microsoft%20edge&query=%24.version&url=https%3A%2F%2Fmicrosoftedge.microsoft.com%2Faddons%2Fgetproductdetailsbycrxid%2Faepnglgjfokepefimhbnibfjekidhmja)](https://microsoftedge.microsoft.com/addons/detail/aepnglgjfokepefimhbnibfjekidhmja) [![Firefox](https://img.shields.io/amo/v/mue?label=firefox&style=flat-square)](https://addons.mozilla.org/firefox/addon/mue) [![Chrome](https://img.shields.io/chrome-web-store/v/bngmbednanpcfochchhgbkookpiaiaid?label=chrome&style=flat-square)](https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid)

-Fast, open and free-to-use new tab page for most modern browsers.
+Mue is a fast, open and free-to-use browser extension that gives a new, fresh and customizable tab page to most modern browsers

-*This is the code for the extension. If you are looking for the website code, please go [here](https://github.com/TurboMarshmello/muetab.xyz).*
+<br>
+
+## Table of contents
+* [Screenshot](#screenshot)
+* [Features](#features)
+* [Planned Features](#planned-features)
+* [Installation](#installation)
+	* [Chrome](#chrome)
+	* [Firefox](#firefox)
+	* [Chromium](#edge-chromium)
+	* [Opera/Other](#operaother)
+* [Contributing](#development)
+	* [Requirements](#requirements)
+	* [Starting](#starting)
+	* [Building](#building)
+* [Credits](#credits)
+	* [Maintainers](#maintainers)
+	* [Contributors](#contributors)
+  * [Translators](#translators)
+	* [Other](#other)
+
+## Screenshot
+*May be updated in the future*
+
+![Screenshot](assets/screenshot.jpg)

 ## Features
 * Fast and free
 * Supports multiple browsers
-* Actively developed and opensource
-* Automatically updating API (with no tracking!) with new photos, quotes and offline mode
-* ~~Multiple language support~~
-* ~~Settings feature - enable/disable features!~~
-* Search bar, ~~update modal, copy button and more!~~
-
-* Mue has been recently rewritten with React and is missing the features that are crossed out *
+* Actively developed and open source
+* Automatically updating API (no tracking) with new photos, quotes and offline mode
+* Search bar
+* Settings - enable/disable various features and customise parts of Mue
+* Update modal, copy button and more!
+* Marketplace - download custom photo packs, quote packs, preset settings and themes made by the community!

 ## Installation
+*A demo of the tab can be found [here](https://demo.muetab.xyz)*
 ### Chrome
-<a href='https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid'><img src='assets/chrome.png' target='_blank'></a> 
+[![Chrome Web Store Logo](assets/chrome.png)](https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid)
+<br>
+[Chrome Web Store](https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid)

-Link: [Chrome Web Store](https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid)
-
-Development: Read the [Development](#development) section.
 ### Firefox
-<a href='https://addons.mozilla.org/firefox/addon/mue'><img src='assets/firefox.png' target='_blank'></a> 
+[![Firefox Add-ons Logo](assets/firefox.png)](https://addons.mozilla.org/firefox/addon/mue)
+<br>
+[Firefox Add-ons](https://addons.mozilla.org/firefox/addon/mue)

-Link: [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/mue)
+### Edge (Chromium)
+[Microsoft Edge Addons](https://microsoftedge.microsoft.com/addons/detail/aepnglgjfokepefimhbnibfjekidhmja)

-Development: Read the [Development](#development) section.
 ### Opera/Other
-Link: [GitHub Releases](https://github.com/ohlookitsderpy/Mue/releases)
+[GitHub Releases](https://github.com/mue/mue/releases)

-Development/Other: Read the [Development](#development) section.
 ### Development
-<h5>Requirements</h5>
+#### Requirements
 <ol>
-  <li><a href='https://git-scm.com'>Git</a> (optional)</li>
-  <li><a href='https://nodejs.org'>Node.js</a></li>
+  <li><a href='https://git-scm.com'>Git</a></li>
+  <li><a href='https://nodejs.org'>Node.JS</a></li>
  <li>A suitable browser</li>
 </ol>
 <h5>Starting</h5>
 <ol>
-  <li> <code>git clone https://github.com/ohlookitsderpy/Mue</code> (If you don't have Git just go to <b>Clone or
-      download</b> and click <b>Download ZIP</b>)
-  <li> Open a terminal and run these commands: (in the Mue directory)
-  <li> <code>yarn</code> (or <code>npm i</code>)
-  <li> <code>yarn run all</code> (or <code>npm run all</code>)
-  <li> Start developing! (See the sections below for how to set up a developer copy of the extension.)
+  <li> Clone the repository using <code>git clone https://github.com/mue/mue.git</code>
+  <li> Run <code>yarn</code> or <code>npm i</code> to install all needed dependencies
+  <li> Run <code>yarn start</code> or <code>npm start</code> to start testing
+  <li> Code your heart out! (See the sections below for how to build the extension)
 </ol>
-<h2>Building</h5>
-<i>This section is a work in progress, and doesn't include the manual edits you are required to do to get it working without errors. 
-Once I find a method to do it automatically, I will update this section accordingly.</li>
+<h2>Building</h2>
 <details>
-  <summary><b>Chrome</b> (Click to expand)</summary>
+  <summary><b>Chrome/Edge (Chromium)</b> (Click to expand)</summary>
  <ol>
-    <li> <code>yarn run build</code> (or <code>npm run build</code>)
-    <li> Rename <code>manifest-chrome.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build" (replace the one created by React)
+    <li> <code>yarn run build</code> or <code>npm run build</code>
+    <li> Rename <code>manifest-chrome.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build"
    <li> Visit <code>chrome://extensions</code> in Chrome
    <li> Click <b>Load unpacked</b> (Make sure <b>Developer Mode</b> is on)
    <li> Go to the directory containing the built copy of Mue and click <b>ok</b>
@@ -71,8 +91,9 @@ Once I find a method to do it automatically, I will update this section accordin
 <details>
  <summary><b>Opera</b> (Click to expand)</summary>
  <ol>
-    <li> <code>yarn run build</code> (or <code>npm run build</code>)
-    <li> Rename <code>manifest-opera.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build" (replace the one created by React)
+    <li> <code>yarn run build</code> or <code>npm run build</code>
+    <li> Rename <code>manifest-opera.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build"
+    <li> Copy <code>background-opera.js</code> in the "manifest" folder to "build"
    <li> Visit <code>about://extensions</code> in Opera
    <li> Click <b>Load unpacked extension...</b> (Make sure <b>Developer Mode</b> is on)
    <li> Go to the directory containing Mue and click <b>ok</b>
@@ -80,11 +101,9 @@ Once I find a method to do it automatically, I will update this section accordin
 </details>
 <details>
  <summary><b>Firefox</b> (Click to expand)</summary>
-  <i>Note: I'm currently trying to find a better method to do this, but this works for now.</i>
  <ol>
-    <li> <code>yarn run build</code> (or <code>npm run build</code>)
-    <li> Rename <code>manifest-firefox.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build" (replace the one created by React) 
-    <li> Move <code>manifest/background-opera.js</code> to <code>build/background-opera.js</code>   
+    <li> <code>yarn run build</code> or <code>npm run build</code>
+    <li> Rename <code>manifest-firefox.json</code> in the "manfiest" folder to <code>manifest.json</code> in "build"
    <li> Visit <code>about:debugging#addons</code> in Firefox
    <li> Click <b>Load Temporary Add-on</b>
    <li> Go to the directory containing Mue and click on the <b>manifest.json</b>
@@ -95,48 +114,30 @@ Once I find a method to do it automatically, I will update this section accordin
  <summary><b>Other</b> (Click to expand)</summary>
  <i>Note: To get the full new tab experience, set your browser to open the <code>index.html</code> on startup and tab open!</i>
    <ol>
+      <li> <code>yarn run build</code> or <code>npm run build</code>
      <li> Open the <code>index.html</code> in your browser
      <li> Enjoy your new tab!
    </ol>
 </details>

-## Screenshot
-*Will be updated if needed*
-
-<img src='assets/screenshot.jpg'>
-
 ## Credits
 ### Maintainers
-[ohlookitsderpy](https://github.com/ohlookitsderpy)
+[David Ralph (ohlookitsderpy)](https://github.com/ohlookitsderpy) - Founder, Lead development, Photographer <br>
+[Alex Sparkes](https://github.com/alexsparkes) - Name, Lead design, Photographer <br>

-[TurboMarshmello](https://github.com/TurboMarshmello)
+### Contributors
+[Wessel Tip](https://github.com/Wessel) - Development <br>
+[Isaac (Eartharoid)](https://github.com/eartharoid) - QA, Development, Photographer <br>
+
+### Translators
+English - [David Ralph (ohlookitsderpy)](https://github.com/ohlookitsderpy) & [Alex Sparkes](https://github.com/alexsparkes)
+Dutch - [Wessel Tip](https://github.com/Wessel)
+French - [Alex Sparkes](https://github.com/alexsparkes)
+Norwegian - [Anders](https://github.com/FuryingFox)

 ### Other
-[TurboMarshmello](https://github.com/TurboMarshmello) - Portions of original code, name idea
-
 [Pexels](https://pexels.com) - Stock photos used for offline mode
-
 [Opera Forum](https://forums.opera.com/topic/25046/how-to-disable-completely-the-speed-dial/14) - Portions of code to add Opera support
+[Google Fonts](https://fonts.google.com/specimen/Lexend+Deca) - Lexend Deca font

-### Translations
-[ohlookitsderpy](https://github.com/ohlookitsderpy) - English (Quotes and Messages)
-
-[Yanderella](https://github.com/tomiedev) - Italian (Quotes and Messages)
-
-Pepehound - Spanish (Quotes and Messages)
-
-Candystick - Portuguese (Some Quotes)
-
-[PassTheWessel](https://github.com/PassTheWessel) - Dutch (Messages)
-
-[Yanderella](https://github.com/tomiedev) and [ohlookitsderpy](https://github.com/ohlookitsderpy) - French (Messages)
-
-[untocodes](https://github.com/untocodes) - Finnish and German (Messages)
-
-[dondish](https://github.com/dondish) - Hebrew and Russian (Messages)
-
-[Roee Lupo (MrSheldon)](https://github.com/MrSheldon) - Arabic and Swedish (Messages)
-
-*Feel free to pull request with other translations!*
-
-and all the contributors <3
+And many thanks to [Highholding](https://discord.bio/p/highholding), [Noa Shapira](#), [Roee Lupo](https://github.com/RoeeLupo), [Jeroen](#), [Glasvegas](https://twitter.com/_glasvegas), [Anders](https://github.com/FuryingFox), [Oded Shapira](https://twitter.com/dondishdev), Jacob Tyrrell and [Nikka Lai](#) for letting us use their wonderful photographs
--- a/assets/kofi.png
+++ b/assets/kofi.png
--- a/assets/logo/icon_round.png
+++ b/assets/logo/icon_round.png
--- a/assets/logo/icon_square.png
+++ b/assets/logo/icon_square.png
--- a/assets/logo/logo_horizontal.png
+++ b/assets/logo/logo_horizontal.png
--- a/assets/logo/logo_only.png
+++ b/assets/logo/logo_only.png
--- a/assets/logo/logo_round.png
+++ b/assets/logo/logo_round.png
--- a/assets/logo/logo_vertical.png
+++ b/assets/logo/logo_vertical.png
--- a/assets/patreon.png
+++ b/assets/patreon.png
--- a/assets/screenshot.jpg
+++ b/assets/screenshot.jpg
--- a/manifest/background-opera.js
+++ b/manifest/background-opera.js
@@ -1,9 +1,14 @@
+/* eslint-disable no-undef */
 // Original code sourced from https://forums.opera.com/topic/25046/how-to-disable-completely-the-speed-dial/14

 chrome.tabs.onCreated.addListener((tab) => {
-    if (tab.status === 'complete' && tab.url === 'chrome://startpage/') chrome.tabs.update(tab.id, { url: chrome.extension.getURL('index.html') });
+    if (tab.status === 'complete' && tab.url === 'chrome://startpage/') chrome.tabs.update(tab.id, {
+        url: chrome.extension.getURL('index.html')
+    });
 });

-chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { 
-    if (changeInfo.status === 'complete' && tab.url === 'chrome://startpage/') chrome.tabs.update(tabId, { url: chrome.extension.getURL('index.html') });
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+    if (changeInfo.status === 'complete' && tab.url === 'chrome://startpage/') chrome.tabs.update(tabId, {
+        url: chrome.extension.getURL('index.html')
+    });
 });
--- a/manifest/chrome.json
+++ b/manifest/chrome.json
@@ -2,11 +2,17 @@
    "manifest_version": 2,
    "offline_enabled": true,
    "name": "Mue",
-    "version": "0.6",
+    "description": "Fast, open and free-to-use new tab page for most modern browsers.",
+    "version": "4.0.0",
    "browser_action": {
-        "default_icon": "./android-chrome-512x512.png"
+        "default_icon": "./icons/extension-icon.png"
    },
    "chrome_url_overrides": {
        "newtab": "index.html"
-    }
+    },
+    "icons": {
+		"16": "./icons/16x16-circle.png",
+		"48": "./icons/48x48-circle.png",
+		"128": "./icons/128x128-circle.png"
+	}
 }
--- a/manifest/firefox.json
+++ b/manifest/firefox.json
@@ -1,9 +1,10 @@
 {
    "manifest_version": 2,
    "name": "Mue",
-    "version": "0.6",
+    "description": "Fast, open and free-to-use new tab page for most modern browsers.",
+    "version": "4.0.0",
    "browser_action": {
-        "default_icon": "./android-chrome-512x512.png"
+        "default_icon": "./icons/extension-icon.png"
    },
    "chrome_url_overrides": {
        "newtab": "index.html"
@@ -11,4 +12,4 @@
    "chrome_settings_overrides": {
        "homepage": "index.html"
    }
-}
+}
--- a/manifest/opera.json
+++ b/manifest/opera.json
@@ -1,12 +1,15 @@
 {
    "manifest_version": 2,
    "name": "Mue",
-    "version": "0.6",
+    "description": "Fast, open and free-to-use new tab page for most modern browsers.",
+    "version": "4.0.0",
    "browser_action": {
-        "default_icon": "./android-chrome-512x512.png"
+        "default_icon": "./icons/extension-icon.png"
    },
    "background": {
-        "scripts": ["./background-opera.js"]
+        "scripts": [
+            "./background-opera.js"
+        ]
    },
    "permissions": [
        "tabs"
--- a/package.json
+++ b/package.json
@@ -1,29 +1,42 @@
 {
  "name": "mue",
-  "author": "ohlookitsderpy",
+  "private": true,
+  "author": "David \"ohlookitsderpy\" Ralph <d.ralph@muetab.xyz> (https://derpyenterprises.org)",
+  "maintainers": [
+    "David \"ohlookitsderpy\" Ralph <d.ralph@muetab.xyz> (https://derpyenterprises.org)",
+    "Alex \"TurboMarshmello\" Sparkes <a.sparkes@muetab.xyz> (https://github.com/alexsparkes)"
+  ],
  "description": "Fast, open and free-to-use new tab page for most modern browsers.",
-  "license": "MIT",
-  "version": "2.0.1",
+  "repository": {
+    "url": "github:mue/mue"
+  },
+  "homepage": "https://muetab.xyz",
+  "bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D",
+  "license": "BSD-3-Clause",
+  "version": "4.0.0",
  "dependencies": {
-    "@material-ui/core": "^4.5.1",
-    "@material-ui/icons": "^4.5.1",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
-    "react-scripts": "3.2.0",
-    "unfetch": "^4.1.0"
+    "@eartharoid/dtf": "^1.0.7",
+    "@material-ui/core": "^4.11.0",
+    "@material-ui/icons": "^4.9.1",
+    "@muetab/quotes": "^1.0.0",
+    "detect-browser-language": "0.0.2",
+    "react": "^16.13.1",
+    "react-clock": "^2.4.0",
+    "react-dom": "^16.13.1",
+    "react-modal": "^3.11.2",
+    "react-toastify": "^6.0.8",
+    "supports-webp": "^2.0.1"
  },
  "devDependencies": {
-    "eslint": "^6.5.0",
-    "npm-run-all": "^4.1.5",
-    "sass": "^1.23.0"
+    "react-scripts": "3.4.1",
+    "node-sass": "^4.14.1"
  },
  "scripts": {
    "start": "react-scripts start",
    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "sass": "sass --watch src/scss:src/css --style compressed",
-    "start-all": "npm-run-all -p start sass"
+    "chrome": "cp manifest/chrome.json build/manifest.json",
+    "firefox": "cp manifest/firefox.json build/manifest.json",
+    "opera": "cp manifest/opera.json build/manifest.json && cp manifest/background-opera.js build/"
  },
  "eslintConfig": {
    "extends": "react-app"
@@ -36,8 +49,7 @@
    ],
    "development": [
      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
+      "last 1 firefox version"
    ]
  }
 }
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/icons/128x128-circle.png
+++ b/public/icons/128x128-circle.png
--- a/public/icons/16x16-circle.png
+++ b/public/icons/16x16-circle.png
--- a/public/icons/48x48-circle.png
+++ b/public/icons/48x48-circle.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/icons/favicon-16x16.png
+++ b/public/icons/favicon-16x16.png
--- a/public/icons/favicon-32x32.png
+++ b/public/icons/favicon-32x32.png
--- a/public/icons/iconmonstr-twitter.svg
+++ b/public/icons/iconmonstr-twitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"/></svg>
--- a/public/icons/mue_verified.svg
+++ b/public/icons/mue_verified.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="200" cy="200" r="200" fill="url(#paint0_linear)"/>
+<path d="M167 265.062L294.125 137.938L311 154.812L167 298.812L100.062 231.875L116.938 215L167 265.062Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear" x1="200" y1="0" x2="200" y2="400" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF5C25"/>
+<stop offset="1" stop-color="#FF456E"/>
+</linearGradient>
+</defs>
+</svg>
--- a/public/icons/undraw_celebration.svg
+++ b/public/icons/undraw_celebration.svg
--- a/public/index.html
+++ b/public/index.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html lang='en'>
+  <head>
+    <meta charset='utf-8' />
+    <meta name='viewport' content='width=device-width, initial-scale=1' />
+    <link rel='icon' type='image/png' sizes='32x32' href='./icons/favicon-32x32.png'>
+    <link rel='icon' type='image/png' sizes='16x16' href='./icons/favicon-16x16.png'>
+    <title>New Tab</title>
+  </head>

-<head>
-  <meta charset='utf-8' />
-  <meta name='viewport' content='width=device-width, initial-scale=1' />
-  <link rel='icon' type='image/png' sizes='32x32' href='favicon-32x32.png'>
-  <link rel='icon' type='image/png' sizes='16x16' href='favicon-16x16.png'>
-  <title>New Tab</title>
-</head>
-
-<body>
-  <noscript>You need to enable JavaScript to use Mue.</noscript>
-  <div id='root'></div>
-</body>
+  <body>
+    <noscript>You need to enable JavaScript to use Mue.</noscript>
+    <div id='root'></div>
+  </body>

 </html>
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,15 +0,0 @@
-{
-  "short_name": "Mue New Tab",
-  "name": "Fast, open and free-to-use new tab page for most modern browsers.",
-  "icons": [
-    {
-      "src": "favicon-32x32.png",
-      "sizes": "96x96 64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
--- a/public/mstile-150x150.png
+++ b/public/mstile-150x150.png
--- a/public/offline-images/10.jpeg
+++ b/public/offline-images/10.jpeg
--- a/public/offline-images/11.jpeg
+++ b/public/offline-images/11.jpeg
--- a/public/offline-images/12.jpeg
+++ b/public/offline-images/12.jpeg
--- a/public/offline-images/13.jpeg
+++ b/public/offline-images/13.jpeg
--- a/public/offline-images/14.jpeg
+++ b/public/offline-images/14.jpeg
--- a/public/offline-images/15.jpeg
+++ b/public/offline-images/15.jpeg
--- a/public/offline-images/16.jpeg
+++ b/public/offline-images/16.jpeg
--- a/public/offline-images/17.jpeg
+++ b/public/offline-images/17.jpeg
--- a/public/offline-images/18.jpeg
+++ b/public/offline-images/18.jpeg
--- a/public/offline-images/19.jpeg
+++ b/public/offline-images/19.jpeg
--- a/public/offline-images/20.jpeg
+++ b/public/offline-images/20.jpeg
--- a/public/offline-images/21.jpeg
+++ b/public/offline-images/21.jpeg
--- a/public/offline-images/22.jpeg
+++ b/public/offline-images/22.jpeg
--- a/public/offline-images/23.jpeg
+++ b/public/offline-images/23.jpeg
--- a/public/offline-images/24.jpeg
+++ b/public/offline-images/24.jpeg
--- a/public/offline-images/25.jpeg
+++ b/public/offline-images/25.jpeg
--- a/public/offline-images/8.jpeg
+++ b/public/offline-images/8.jpeg
--- a/public/offline-images/9.jpeg
+++ b/public/offline-images/9.jpeg
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,27 +1,119 @@
-//* Imports
 import React from 'react';
-import Background from './components/Background';
-import Clock from './components/Clock';
-import Greeting from './components/Greeting';
-import Quote from './components/Quote';
-import Search from './components/Search';
-import Credit from './components/Credit';
-import './css/index.css';
+import Background from './components/widgets/Background';
+import Clock from './components/widgets/Clock';
+import Greeting from './components/widgets/Greeting';
+import Quote from './components/widgets/Quote';
+import Search from './components/widgets/Search';
+import Navbar from './components/Navbar';
+import SettingsFunctions from './modules/settingsFunctions';
+import { ToastContainer } from 'react-toastify';
+import Modal from 'react-modal';
+import RoomIcon from '@material-ui/icons/Room';
+
+// Modals are lazy loaded as a user won't use them every time they open a tab
+const Settings = React.lazy(() => import('./components/modals/Settings'));
+const Update = React.lazy(() => import('./components/modals/Update'));
+const Marketplace = React.lazy(() => import('./components/modals/Marketplace'));
+const Addons = React.lazy(() => import('./components/modals/Addons'));
+const Welcome = React.lazy(() => import('./components/modals/Welcome'));
+const renderLoader = () => <div></div>;
+
+export default class App extends React.PureComponent {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      settingsModal: false,
+      updateModal: false,
+      marketplaceModal: false,
+      addonsModal: false,
+      quickAccessmodal: false,
+      welcomeModal: false
+    };
+  }

-//* App
-export default class App extends React.Component {
  // Render all the components
  render() {
+    if (!localStorage.getItem('firstRun')) SettingsFunctions.setDefaultSettings();
+
+    let modalClassList = 'Modal';
+    if (localStorage.getItem('darkTheme') === 'true') modalClassList = 'Modal dark';
+
+    let overlayClassList = 'Overlay';
+    if (localStorage.getItem('animations') === 'true') overlayClassList = 'Overlay modal-animation';
+
+    let language = require(`./translations/${localStorage.getItem('language')}.json`);
+
+    const theme = localStorage.getItem('theme');
+    if (theme) {
+      let style = document.createElement('link');
+      style.href = theme;
+      style.rel = 'stylesheet';
+      document.head.appendChild(style);
+    }
+
    return (
      <React.Fragment>
        <Background/>
-        <Search/>
-          <div id='center'>
-              <Greeting/>
-              <Clock/> 
-              <Quote/>
-              <Credit/>
+        <ToastContainer className='toast' position='bottom-right' autoClose={2500} hideProgressBar={false} newestOnTop={true} closeOnClick rtl={false} pauseOnFocusLoss />
+        <div id='center'>
+          <Search language={language.search} />
+          <Navbar settingsModalOpen={() => this.setState({ settingsModal: true })} updateModalOpen={() => this.setState({ updateModal: true })} />
+          <Greeting language={language.greeting} />
+          <Clock/>
+          <Quote language={language.toasts}/>
+          <div className='credits'>
+            <h1 id='photographer'>{language.credit}</h1>
+            <div id='backgroundCredits' className='tooltip'>
+              <RoomIcon className='locationicon'/>
+              <span className='tooltiptext' id='location'/>
+            </div>
          </div>
+          <React.Suspense fallback={renderLoader()}>
+            <Modal id={'modal'} onRequestClose={() => this.setState({ settingsModal: false })} isOpen={this.state.settingsModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
+              <Settings
+                language={language.settings}
+                modalLanguage={language.modals}
+                modalClose={() => this.setState({ settingsModal: false })}
+                setDefaultSettings={() => SettingsFunctions.setDefaultSettings()}
+                openMarketplace={() => this.setState({ marketplaceModal: true, settingsModal: false })}
+                openAddons={() => this.setState({ settingsModal: false, addonsModal: true })}
+                toastLanguage={language.toasts}
+              />
+            </Modal>
+            <Modal onRequestClose={() => this.setState({ updateModal: false })} isOpen={this.state.updateModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
+              <Update
+                language={language.update}
+                modalClose={() => this.setState({ updateModal: false })}
+              />
+            </Modal>
+            <Modal onRequestClose={() => this.setState({ marketplaceModal: false })} isOpen={this.state.marketplaceModal} className={modalClassList} overlayClassName='Overlay' ariaHideApp={false}>
+              <Marketplace
+                language={language.marketplace}
+                modalLanguage={language.modals}
+                modalClose={() => this.setState({ marketplaceModal: false })}
+                openSettings={() => this.setState({ marketplaceModal: false, settingsModal: true })}
+                openAddons={() => this.setState({ marketplaceModal: false, addonsModal: true })}
+                toastLanguage={language.toasts}
+              />
+            </Modal>
+            <Modal onRequestClose={() => this.setState({ addonsModal: false })} isOpen={this.state.addonsModal} className={modalClassList} overlayClassName='Overlay' ariaHideApp={false}>
+              <Addons
+                language={language.addons}
+                modalLanguage={language.modals}
+                modalClose={() => this.setState({ addonsModal: false })}
+                openSettings={() => this.setState({ addonsModal: false, settingsModal: true })}
+                openMarketplace={() => this.setState({ addonsModal: false, marketplaceModal: true })}
+                toastLanguage={language.toasts}
+              />
+            </Modal>
+            <Modal onRequestClose={() => this.setState({ welcomeModal: false })} isOpen={this.state.welcomeModal} className={modalClassList} overlayClassName='Overlay' ariaHideApp={false}>
+              <Welcome
+                modalClose={() => this.setState({ welcomeModal: false })}
+              />
+            </Modal>
+          </React.Suspense>
+        </div>
      </React.Fragment>
    );
  }
--- a/src/components/Background.jsx
+++ b/src/components/Background.jsx
@@ -1,46 +0,0 @@
-import React from 'react';
-import Fetch from 'unfetch';
-
-const getCookie = (cookiename) =>  {
-    const cookiestring = RegExp('' + cookiename + '[^;]+').exec(document.cookie);
-    return unescape(!!cookiestring ? cookiestring.toString().replace(/^[^=]+./,'') : '');
-};
-  
-const randomInt = (min, max) => { return Math.floor(Math.random() * (max - min + 1)) + min; };
-  
-export default class Background extends React.Component {
-  // Set background: Attempt to get one from the API first, and if that fails then use the offline ones.
-  async getAndSetBackground() {
-    const root = document.getElementById('root');
-    
-    try {
-      let data = await Fetch('https://api.muetab.xyz/getImage?category=Outdoors');
-      data     = await data.json(); 
-
-      const checkRepeat = getCookie('backgroundimageurl');
-      document.getElementById('photographer').innerText = `Photo by ${data.photographer}`;
-      document.getElementById('location').innerText     = `${data.location}`;
-
-      if (checkRepeat !== root.style.backgroundImage) root.style.backgroundImage = `url(${data.file})`;
-      else {
-        /*let data = await Fetch('https://api.muetab.xyz/getImage?category=Outdoors');
-        data = await data.json();*/ 
-        document.cookie            = 'backgroundimageurl; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
-        root.style.backgroundImage = `url(${data.file})`;
-        document.cookie            = `backgroundimageurl=${data.file}`;
-      }
-    } catch (e) {
-      document.getElementById('backgroundCredits').style.display = 'none';
-      document.getElementById('photographer').innerText          = 'Photo from Pexels';
-      root.style.backgroundImage = `url(../offline-images/${randomInt(1, 25)}.jpeg)`;
-    }
-  }
-
-  componentDidMount() {
-    this.getAndSetBackground();
-  }
-
-  render() {
-    return null;
-  }
-}
--- a/src/components/Clock.jsx
+++ b/src/components/Clock.jsx
@@ -1,42 +0,0 @@
-import React from 'react';
-
-export default class Clock extends React.Component {
-  constructor(...args) {
-    super(...args);
-    this.state = {
-      date: ``,
-      ampm: ``,
-    };
-  }
-
-  startTime() {
-    const today = new Date(); // Get the current date 
-    let h = today.getHours(); // Get hours
-    const ampm = h >= 12 ? 'PM' : 'AM'; // Set AM/PM
-    const m = today.getMinutes(); // Get minutes
-    // const s = today.getSeconds();
-
-    if (h > 12) h = h - 12;
-
-    this.setState({ date: `${('0' + h).slice(-2)}:${('0' + m).slice(-2)}`, ampm: ampm });
-
-    this.timeout = setTimeout(() => this.startTime(), 500);
-  }
-
-  componentDidMount() {
-    this.startTime();
-  }
-
-  componentWillUnmount() {
-    clearTimeout(this.timeout);
-  }
-
-  render() {
-    return <h1 className='App-clock'>
-      {this.state.date}
-      <span className='App-ampm-specifier'>
-        {this.state.ampm}  
-      </span>
-    </h1>;
-  }
-}
--- a/src/components/Credit.jsx
+++ b/src/components/Credit.jsx
@@ -1,17 +0,0 @@
-/* eslint-disable */
-import RoomIcon from '@material-ui/icons/Room';
-import React from 'react';
-
-export default class Search extends React.Component {
-  render() {
-    return (
-      <div className='credits'>
-          {/* <h1 id='location'></h1> */}
-          <h1 id='photographer'></h1>
-          <div id='backgroundCredits' className='tooltip'><RoomIcon className='locationicon'/>
-            <span className='tooltiptext' id='location'></span>
-          </div>
-     </div>
-    );
-  }
-}
--- a/src/components/Greeting.jsx
+++ b/src/components/Greeting.jsx
@@ -1,26 +0,0 @@
-import React from 'react';
-
-export default class Greeting extends React.Component {
-  constructor(...args) {
-    super(...args);
-    this.state = {
-        greeting: ``
-    };
- }
-
-  getGreeting() {
-    const h = new Date().getHours();
-    let t = 'Good evening'; // Set the default time string to "Good evening"	
-    if (h < 12) t = 'Good morning'; // If it's before 12am, set the time string to "Good morning"
-    else if (h < 18) t = 'Good afternoon'; // If it's before 6pm, set the time string to "Good afternoon"
-    this.setState({ greeting: t }); // Set the state to the time string
-  }
-
-  componentDidMount() {
-    this.getGreeting();
-  }
-  
-  render() {
-    return <h1 className='App-greeting'>{this.state.greeting}</h1>;
-  }
-}
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import Gear from '@material-ui/icons/Settings';
+import NewReleases from '@material-ui/icons/NewReleases';
+
+export default class Navbar extends React.PureComponent {
+  render() {
+    let refreshHTML = <div className='navbar2' ><RefreshIcon className='refreshicon' onClick={() => window.location.reload()} /></div>
+    const refresh = localStorage.getItem('refresh');
+    if (refresh === 'false') refreshHTML = '';
+
+    const viewedUpdate = localStorage.getItem('viewedUpdate');
+    let update = <NewReleases className='refreshicon' onClick={this.props.updateModalOpen} />;
+    if (viewedUpdate === 'false') update =  <NewReleases className='refreshicon' onClick={this.props.updateModalOpen} />
+
+    return (
+      <div className='navbar-container'>
+        <div className='navbar1'>
+          <Gear className='settings-icon' onClick={this.props.settingsModalOpen} />
+        </div>
+        {refreshHTML}
+        <div className={refresh === 'false' ? 'navbar2' : 'navbar3'}>
+        {update}
+        </div>
+      </div>
+    );
+  }
+}
--- a/src/components/Quote.jsx
+++ b/src/components/Quote.jsx
@@ -1,37 +0,0 @@
-import React from 'react';
-import Fetch from 'unfetch';
-import quotes from '../quotes.json';
-
-export default class Quote extends React.Component {
-  constructor(...args) {
-    super(...args);
-    this.state = {
-        quote: ``,
-        author: ``
-    };
-  }
-
-  async getQuote() {
-    try {
-      let data = await Fetch('https://api.muetab.xyz/getQuote');
-      data = await data.json();
-      this.setState({ quote: data.quote, author: data.author });
-    } catch (e) {
-      const randomInt = (min, max) => { return Math.floor(Math.random() * (max - min + 1)) + min; };
-      const num = randomInt(1, 20);
-      this.setState({ quote: quotes[num].quote, author: quotes[num].author });
-    }
-  }
-
-  componentDidMount() {
-    this.getQuote();
-  }
-
-  render() {
-    return [
-    <h1 className='App-quote'>{`"${this.state.quote}"`}</h1>,
-    // <i class="material-icons">perm_identity</i>,
-    <h1 className='App-quote-author'>{`${this.state.author}`}</h1>,
-    ];
-  }
-}
--- a/src/components/Search.jsx
+++ b/src/components/Search.jsx
@@ -1,14 +0,0 @@
-import React from 'react';
-
-export default class Search extends React.Component {
-  render() {
-    return (
-    <div id='searchBar' className='search-bar'>
-    <form id='searchBar' className='searchbarform' action='https://duckduckgo.com/' onSubmit={('search();')}>
-        <input type='text' placeholder='Search' name='q' id='searchText' className='searchText' />
-        <div className='blursearcbBG' />
-      </form>
-      </div>
-    );
-  }
-}
--- a/src/components/modals/Addons.jsx
+++ b/src/components/modals/Addons.jsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import LocalMallIcon from '@material-ui/icons/LocalMall';
+import { toast } from 'react-toastify';
+import dtf from '@eartharoid/dtf';
+import Item from './marketplace/Item';
+import MarketplaceFunctions from '../../modules/marketplaceFunctions';
+
+export default class Addons extends React.PureComponent {
+    constructor(...args) {
+        super(...args);
+        this.state = {
+            installed: [],
+            item_data: {
+                name: 'Name',
+                author: 'Author',
+                description: 'Description',
+                updated: '???',
+                version: '1.0.0',
+                icon: ''
+            }
+        }
+    }
+
+    async toggle(type, type2, data) {
+        if (type === 'item') {
+            let installed = JSON.parse(localStorage.getItem('installed'));
+            let info = installed.find(i => i.name === data).content;
+            this.setState({
+                current_data: { type: type2, name: data, content: info },
+                item_data: {
+                    name: info.data.name,
+                    author: info.data.author,
+                    description: MarketplaceFunctions.urlParser(info.data.description.replace(/\n/g, '<br>')),
+                    updated: dtf('n_D MMM YYYY', info.updated, 'en-GB'),
+                    version: info.data.version,
+                    icon: info.data.screenshot_url
+                }
+             });
+            document.getElementById('marketplace').style.display = 'none';
+            document.getElementById('item').style.display = 'block';
+         } else {
+            document.getElementById('marketplace').style.display = 'block';
+            document.getElementById('item').style.display = 'none';
+        }
+    }
+
+    uninstall() {
+        let installed = JSON.parse(localStorage.getItem('installed'));
+
+        const uninstallStuff = () => {
+            for (let i = 0; i < installed.length; i++) {
+                if (installed[i].name === this.state.current_data.name) {
+                    installed.splice(i, 1);
+                    break;
+                }
+            }
+            localStorage.setItem('installed', JSON.stringify(installed));
+            toast(this.props.toastLanguage.removed);
+            this.toggle();
+            this.componentDidMount();
+        }
+
+        switch (this.state.current_data.type) {
+            case 'settings':
+                let oldSettings = JSON.parse(localStorage.getItem('backup_settings'));
+                localStorage.clear();
+                oldSettings.forEach(item => localStorage.setItem(item.name, item.value));
+                uninstallStuff();
+                break;
+            default:
+                try {
+                    localStorage.removeItem(this.state.current_data.type);
+                    uninstallStuff();
+                } catch (e) {
+                    console.log('invalid');
+                }
+        }
+    }
+
+  componentDidMount() {
+    document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+    document.getElementById('center').classList.toggle('backgroundEffects');
+    this.setState({ installed: JSON.parse(localStorage.getItem('installed')) });
+  }
+
+  componentWillUnmount() {
+    document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+    document.getElementById('center').classList.toggle('backgroundEffects');
+  }
+
+  render() {
+     if (this.state.installed.length === 0) {
+         return <div className='content'>
+         <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+         <h1>{this.props.modalLanguage.title}</h1>
+             <div className="tab">
+               <button className="tablinks" onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
+               <button className="tablinks" id="active">{this.props.modalLanguage.addons}</button>
+               <button className="tablinks" onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
+            </div>
+         <div id='marketplace'>
+         { /*<input id='file-input' type='file' name='name' className='hidden' />
+        <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button> */}
+           <h1>{this.props.language.added}</h1>
+           <div className="items">
+               <div className="emptyMessage">
+                    <LocalMallIcon />
+                    <h1>{this.props.language.empty.title}</h1>
+                    <p className="description">{this.props.language.empty.description}</p>
+                    <button className="goToMarket" onClick={this.props.openMarketplace}>{this.props.language.empty.button}</button>
+              </div>
+           </div>
+         </div>
+         </div>
+     }
+
+    return <div className='content'>
+        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+        <h1>{this.props.modalLanguage.title}</h1>
+             <div className="tab">
+               <button className="tablinks" onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
+               <button className="tablinks" id="active">{this.props.modalLanguage.addons}</button>
+               <button className="tablinks" onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
+            </div>
+        <div id='marketplace'>
+       { /*<input id='file-input' type='file' name='name' className='hidden' />
+        <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button> */}
+        <h1>{this.props.language.added}</h1>
+          <div className="items">
+              {this.state.installed.map((item) =>
+                   <div className="item" onClick={()=> this.toggle('item', item.type, item.name)}>
+                   <img alt="icon" src={item.content.data.icon_url} />
+                   <div className="details">
+                       <h4>{item.content.data.name}</h4>
+                       <p>{item.content.data.author}</p>
+                   </div>
+               </div>)}
+          </div>
+        </div>
+        <Item button={<button className="removeFromMue" onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>} data={this.state.item_data} function={()=> this.toggle()} language={this.props.language.product} />
+    </div>;
+    }
+}
--- a/src/components/modals/Marketplace.jsx
+++ b/src/components/modals/Marketplace.jsx
@@ -0,0 +1,265 @@
+import React from 'react';
+import WifiOffIcon from '@material-ui/icons/WifiOff';
+import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+import { toast } from 'react-toastify';
+import dtf from '@eartharoid/dtf';
+import Item from './marketplace/Item';
+import MarketplaceFunctions from '../../modules/marketplaceFunctions';
+import * as Constants from '../../modules/constants';
+import Items from './marketplace/Items';
+
+export default class Marketplace extends React.PureComponent {
+    constructor(...args) {
+        super(...args);
+        this.state = {
+            themes: [],
+            settings: [],
+            photo_packs: [],
+            quote_packs: [],
+            see_more: [],
+            see_more_type: '',
+            current_data: {
+                type: '',
+                name: '',
+                content: {}
+            },
+            button: '',
+            featured: {},
+            done: false,
+            item_data: {
+                name: 'Name',
+                author: 'Author',
+                description: 'Description',
+                updated: '???',
+                version: '1.0.0',
+                icon: ''
+            }
+        }
+
+        this.offlineHTML = <div className='content'>
+        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+        <h1>{this.props.modalLanguage.title}</h1>
+        <div className="tab">
+            <button className="tablinks" id="active">{this.props.modalLanguage.marketplace}</button>
+            <button className="tablinks" onClick={this.props.openAddons}>{this.props.modalLanguage.addons}</button>
+            <button className="tablinks"
+                onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
+        </div>
+        <div id='marketplace'>
+            <div className="emptyMessage" style={{"marginTop": "20px", "transform": "translateY(80%)"}}>
+                <WifiOffIcon />
+                <h1>{this.props.language.offline.title}</h1>
+                <p className="description">{this.props.language.offline.description}</p>
+            </div>
+        </div>
+        </div>;
+    }
+
+    async toggle(type, type2, data) {
+        if (type === 'seemore') {
+            document.getElementById('marketplace').style.display = 'none';
+            document.getElementById('seemore').style.display = 'block';
+            return this.setState({
+                see_more: this.state[type2],
+                see_more_type: type2
+            });
+        }
+
+        if (type === 'item') {
+            let info;
+            try {
+                info = await fetch(`${Constants.MARKETPLACE_URL}/item/${type2}/${data}`);
+                info = await info.json();
+            } catch (e) {
+                return toast(this.props.toastLanguage.error);
+            }
+
+            this.setState({
+                current_data: { type: type2, name: data, content: info },
+                item_data: {
+                    name: info.data.name,
+                    author: info.data.author,
+                    description: MarketplaceFunctions.urlParser(info.data.description.replace(/\n/g, '<br>')),
+                    updated: dtf('n_D MMM YYYY', info.updated, 'en-GB'),
+                    version: info.data.version,
+                    icon: info.data.screenshot_url
+                }
+            });
+            document.getElementById('marketplace').style.display = 'none';
+            document.getElementById('seemore').style.display = 'none';
+            document.getElementById('item').style.display = 'block';
+
+            let button = <button className="addToMue" onClick={() => this.install()}>{this.props.language.product.buttons.addtomue}</button>;
+            let installed = JSON.parse(localStorage.getItem('installed'));
+            if (installed.some(item => item.name === data)) button = <button className="removeFromMue" onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>;
+            this.setState({ button: button });
+        } else {
+            document.getElementById('marketplace').style.display = 'block';
+            document.getElementById('item').style.display = 'none';
+            document.getElementById('seemore').style.display = 'none';
+        }
+   }
+
+    async getItems() {
+        let data = await fetch(Constants.MARKETPLACE_URL + '/all');
+        data = await data.json();
+        let data2 = await fetch(Constants.MARKETPLACE_URL + '/featured');
+        data2 = await data2.json();
+        this.setState({
+            themes: data.data.themes,
+            settings: data.data.settings,
+            photo_packs: data.data.photo_packs,
+            quote_packs: data.data.quote_packs,
+            see_more: data.data.photo_packs,
+            featured: data2.data,
+            done: true
+        });
+    }
+
+    async install() {
+        let installed = JSON.parse(localStorage.getItem('installed'));
+        let button;
+
+        const installStuff = () => {
+           installed.push(this.state.current_data);
+           localStorage.setItem('installed', JSON.stringify(installed));
+           toast(this.props.toastLanguage.installed);
+           button = <button className="removeFromMue" onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>;
+           this.setState({ button: button });
+        }
+
+        switch (this.state.current_data.type) {
+            case 'settings':
+                localStorage.removeItem('backup_settings');
+                let oldSettings = [];
+                for (const key of Object.keys(localStorage)) oldSettings.push({name: key, value: localStorage.getItem(key)});
+                localStorage.setItem('backup_settings', JSON.stringify(oldSettings));
+                this.state.current_data.content.data.settings.forEach(element => localStorage.setItem(element.name, element.value));
+                installStuff();
+                break;
+            case 'photo_packs':
+                localStorage.setItem('photo_packs', JSON.stringify(this.state.current_data.content.data.photos));
+                installStuff();
+                break;
+            case 'theme':
+                localStorage.setItem('theme', this.state.current_data.content.data.theme);
+                installStuff();
+                break;
+            case 'quote_packs':
+                localStorage.setItem('quote_packs', JSON.stringify(this.state.current_data.content.data.quotes));
+                installStuff();
+                break;
+            default:
+               console.log('invalid');
+        }
+    }
+
+    uninstall() {
+      let installed = JSON.parse(localStorage.getItem('installed'));
+      let button;
+
+      const uninstallStuff = () => {
+        for (let i = 0; i < installed.length; i++) {
+            if (installed[i].name === this.state.current_data.name) {
+                installed.splice(i, 1);
+                break;
+            }
+        }
+        localStorage.setItem('installed', JSON.stringify(installed));
+        toast(this.props.toastLanguage.removed);
+        button = <button className="addToMue" onClick={() => this.install()}>{this.props.language.product.buttons.addtomue}</button>;
+        this.setState({ button: button });
+      }
+
+      switch (this.state.current_data.type) {
+          case 'settings':
+            let oldSettings = JSON.parse(localStorage.getItem('backup_settings'));
+            localStorage.clear();
+            oldSettings.forEach(item => localStorage.setItem(item.name, item.value));
+            uninstallStuff();
+            break;
+          default:
+            try {
+                localStorage.removeItem(this.state.current_data.type);
+                uninstallStuff();
+            } catch (e) {
+                console.log('invalid');
+            }
+        }
+    }
+
+    componentDidMount() {
+      document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+      document.getElementById('center').classList.toggle('backgroundEffects');
+      if (navigator.onLine === false) return;
+      this.getItems();
+    }
+
+   componentWillUnmount() {
+      document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+      document.getElementById('center').classList.toggle('backgroundEffects');
+   }
+
+  render() {
+    if (navigator.onLine === false || this.state.done === false) {
+        return this.offlineHTML;
+    }
+
+    return <div className='content'>
+             <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+             <h1>{this.props.modalLanguage.title}</h1>
+             <div className="tab">
+                 <button className="tablinks" id="active">{this.props.modalLanguage.marketplace}</button>
+                 <button className="tablinks" onClick={this.props.openAddons}>{this.props.modalLanguage.addons}</button>
+                 <button className="tablinks"
+                     onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
+             </div>
+             <div id='marketplace'>
+                 <div className="featured" style={{backgroundColor: this.state.featured.colour}}>
+                     <p>{this.state.featured.title}</p>
+                     <h1>{this.state.featured.name}</h1>
+                     <button className="addToMue" onClick={() => window.location.href =
+                         this.state.featured.buttonLink}>{this.state.featured.buttonText}</button>
+                 </div>
+                 <Items
+                   title={this.props.language.photo_packs}
+                   seeMoreTitle={this.props.language.see_more}
+                   items={this.state.photo_packs.slice(0, 3)}
+                   toggleFunction={(input) => this.toggle('item', 'photo_packs', input)}
+                   seeMore={true}
+                   seeMoreFunction={() => this.toggle('seemore', 'photo_packs')} />
+                 <Items
+                   title={this.props.language.preset_settings}
+                   seeMoreTitle={this.props.language.see_more}
+                   items={this.state.settings.slice(0, 3)}
+                   toggleFunction={(input) => this.toggle('item', 'settings', input)}
+                   seeMore={true}
+                   seeMoreFunction={() => this.toggle('seemore', 'settings')} />
+                 <Items
+                   title={this.props.language.quote_packs}
+                   seeMoreTitle={this.props.language.see_more}
+                   items={this.state.quote_packs.slice(0, 3)}
+                   toggleFunction={(input) => this.toggle('item', 'quote_packs', input)}
+                   seeMore={true}
+                   seeMoreFunction={() => this.toggle('seemore', 'quote_packs')} />
+                 <Items
+                   title={this.props.language.themes}
+                   seeMoreTitle={this.props.language.see_more}
+                   items={this.state.themes.slice(0, 3)}
+                   toggleFunction={(input) => this.toggle('item', 'theme', input)}
+                   seeMore={true}
+                   seeMoreFunction={() => this.toggle('seemore', 'themes')} />
+             </div>
+             <Item button={this.state.button} data={this.state.item_data} function={()=> this.toggle()} language={this.props.language.product} />
+             <div id='seemore'>
+                <ArrowBackIcon className='backArrow' onClick={() => this.toggle()} />
+                <Items
+                  title={this.props.language.see_more}
+                  seeMoreTitle={this.props.language.see_more}
+                  toggleFunction={(input) => this.toggle('item', this.state.see_more_type, input)}
+                  items={this.state.see_more}
+                />
+             </div>
+            </div>;
+    }
+}
--- a/src/components/modals/Settings.jsx
+++ b/src/components/modals/Settings.jsx
@@ -0,0 +1,264 @@
+import React from 'react';
+import ExpandMore from '@material-ui/icons/ExpandMore';
+import SettingsFunctions from '../../modules/settingsFunctions';
+import Checkbox from './settings/Checkbox';
+import Slider from './settings/Slider';
+import { toast } from 'react-toastify';
+
+export default class Settings extends React.PureComponent {
+  resetItem(key) {
+    switch (key) {
+      case 'greetingName': document.getElementById('greetingName').value = ''; break;
+      case 'customBackgroundColour':
+        localStorage.setItem('customBackgroundColour', '');
+        document.getElementById('customBackgroundColour').enabled = 'false';
+        break;
+      case 'customBackground': document.getElementById('customBackground').value = ''; break;
+      case 'blur':
+        localStorage.setItem('blur', 0);
+        document.getElementById('blurRange').value = 0;
+        document.getElementById('blurAmount').innerText = '0';
+        break;
+      case 'customSearchEngine': document.getElementById('searchEngine').value = 'DuckDuckGo'; break;
+      default: console.log('[ERROR] resetItem requires a key!');
+    }
+    toast(this.props.toastLanguage.reset);
+  }
+
+  updateCurrent() {
+    document.getElementById('greetingName').value = localStorage.getItem('greetingName');
+    document.getElementById('customBackground').value = localStorage.getItem('customBackground');
+    document.getElementById('backgroundAPI').value = localStorage.getItem('backgroundAPI');
+    document.getElementById('language').value = localStorage.getItem('language');
+    document.getElementById('searchEngine').value = localStorage.getItem('searchEngine');
+    // document.getElementById('backgroundImage').style.backgroundUrl = localStorage.getItem('customBackground');
+
+    for (const key of Object.keys(localStorage)) {
+      let value = localStorage.getItem(key);
+
+      if (key === 'blur') {
+        document.getElementById('blurAmount').innerText = value;
+        document.getElementById('blurRange').value = value;
+      }
+
+      const tag = document.getElementById(`${key}Status`);
+
+      if (tag) {
+        switch (value) {
+          case 'true': value = true; break;
+          case 'false': value = false; break;
+          default: value = true;
+        }
+        tag.checked = value;
+      }
+    }
+
+    if (localStorage.getItem('darkTheme') === 'true') {
+      document.getElementById('blurRange').style.background = '#535c68';
+      document.getElementById('customBackground').style.color = 'white';
+      document.getElementById('backgroundAPI').style.color = 'white';
+      document.getElementById('searchEngine').style.color = 'white';
+      document.getElementById('language').style.color = 'white';
+      /*[1, 2, 3, 4, 5].forEach((index) => {
+        console.log(index)
+        document.getElementsByClassName('choices')[index].style.background = 'black';
+      })*/
+      document.getElementById('greetingName').style.color = 'white';
+    }
+  }
+
+  componentDidMount() {
+    this.updateCurrent();
+
+    document.getElementById('file-input').onchange = (e) => {
+      const file = e.target.files[0];
+      if (file.type !== 'application/json') return console.error(`expected json, got ${file.type}`);
+
+      const reader = new FileReader();
+      reader.readAsText(file, 'UTF-8');
+
+      reader.onload = (readerEvent) => {
+        const content = JSON.parse(readerEvent.target.result);
+        for (const key of Object.keys(content)) localStorage.setItem(key, content[key]);
+        toast('Imported settings!');
+      }
+    }
+
+    document.getElementById('bg-input').onchange = (e) => {
+      const allowed = [ 'image/svg+xml', 'image/jpeg', 'image/png', 'image/webp', 'image/webm', 'image/gif' ];
+      const reader = new FileReader();
+      const file = e.target.files[0];
+
+      if (file.size > 2000000) return toast('File is over 2MB', '#ff0000', '#ffffff');
+      if (!allowed.includes(file.type)) return console.error(`expected xml, svg, png or jpeg, got ${file.type}`);
+
+      reader.addEventListener('load', (e) => {
+        localStorage.setItem('customBackground', e.target.result);
+        document.getElementById('customBackground').src = e.target.result;
+        document.getElementById('customBackground').value = e.target.result;
+        document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${localStorage.getItem('customBackground')}`);
+        document.getElementById('backgroundImage').style.backgroundImage = `url(${localStorage.getItem('customBackground')})`
+      });
+
+      reader.readAsDataURL(file);
+    };
+    /*const hex = localStorage.getItem('customBackgroundColour');
+    if (!hex === '') {
+      document.getElementById('customBackgroundColour').value = hex;
+      document.getElementById('customBackgroundHex').innerText = hex;
+    }*/
+
+
+    document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+    document.getElementById('center').classList.toggle('backgroundEffects');
+  }
+
+  componentWillUnmount() {
+    document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
+    document.getElementById('center').classList.toggle('backgroundEffects');
+  }
+
+  render() {
+   // let expandClassList = '';
+    //if (localStorage.getItem('animations') === 'true') expandClassList = 'all 0.5 ease 0s';
+
+    return <div className='content'>
+        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+        <h1>{this.props.modalLanguage.title}</h1>
+        <div className="tab">
+          <button className="tablinks" onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
+          <button className="tablinks" onClick={this.props.openAddons}>{this.props.modalLanguage.addons}</button>
+          <button className="tablinks" id="active">{this.props.modalLanguage.settings}</button>
+        </div>
+        <br />
+      <div className='columns'>
+          <div className='section'>
+            <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[0], document.getElementsByClassName('expandIcons')[0])}>{this.props.language.time.title}</h4>
+            <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[0], document.getElementsByClassName('expandIcons')[0])} />
+            <Slider name='time' />
+          <li className='extraSettings'>
+            <Checkbox name='seconds' text={this.props.language.time.seconds} />
+            <Checkbox name='24hour' text={this.props.language.time.twentyfourhour} />
+            <Checkbox name='ampm' text={this.props.language.time.ampm} />
+            <Checkbox name='zero' text={this.props.language.time.zero} />
+            <Checkbox name='analog' text={this.props.language.time.analog} />
+          </li>
+        </div>
+        <div className='section'>
+          <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[1], document.getElementsByClassName('expandIcons')[1])}>{this.props.language.greeting.title}</h4>
+          <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[1], document.getElementsByClassName('expandIcons')[1])} />
+          <Slider name='greeting' />
+          <li className='extraSettings'>
+          <Checkbox name='events' text={this.props.language.greeting.events} />
+          <Checkbox name='defaultGreetingMessage' text={this.props.language.greeting.default} />
+            <ul>
+              <p>{this.props.language.greeting.name} <span className='modalLink' onClick={() => this.resetItem('greetingName')}>Reset</span></p>
+              <input type='text' id='greetingName'></input>
+            </ul>
+          </li>
+        </div>
+        <div className='section'>
+          <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[2], document.getElementsByClassName('expandIcons')[2])}>{this.props.language.quote.title}</h4>
+          <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[2], document.getElementsByClassName('expandIcons')[2])} />
+          <Slider name='quote' />
+          <li className='extraSettings'>
+            <Checkbox name='copyButton' text={this.props.language.quote.copy} />
+          </li>
+        </div>
+        <div className='section'>
+          <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[3], document.getElementsByClassName('expandIcons')[3])}>{this.props.language.background.title}</h4>
+          <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[3], document.getElementsByClassName('expandIcons')[3])} />
+          <Slider name='background' override='customBackground' />
+          <li className='extraSettings'>
+          <ul>
+            <label htmlFor='8'>{this.props.language.background.API} </label>
+            <label className='dropdown'>
+              <select className='select-css' name='8' id='backgroundAPI' onChange={() => localStorage.setItem('backgroundAPI', document.getElementById('backgroundAPI').value)}>
+                <option value='mue'>Mue</option>
+                <option value='unsplash'>Unsplash</option>
+                { /* <option value='custom'>Custom</option> */ }
+              </select>
+            </label>
+            </ul>
+            <ul>
+              <p>{this.props.language.background.blur} (<span id='blurAmount'></span>%) <span className='modalLink' onClick={() => this.resetItem('blur')}>Reset</span></p>
+              <input className='range' type='range' min='0' max='100' id='blurRange' onInput={() => document.getElementById('blurAmount').innerText = document.getElementById('blurRange').value} />
+            </ul>
+            <ul>
+              <p>{this.props.language.background.customURL} <span className='modalLink' onClick={() => this.resetItem('customBackground')}>Reset</span></p>
+              <input type='text' id='customBackground'></input>
+            </ul>
+            <ul>
+              <p>{this.props.language.background.custombackground} <span className='modalLink' onClick={() => this.resetItem('customBackground')}>Reset</span></p>
+              <button className='uploadbg' onClick={() => document.getElementById('bg-input').click()}>Upload</button>
+              <input id='bg-input' type='file' name='name' className='hidden' />
+            </ul>
+           { /* <ul>
+              <p>{this.props.language.background.customcolour} <span className='modalLink' onClick={() => this.resetItem('customBackgroundColour')}>Reset</span></p>
+              <input name='colour' type='color' id='customBackgroundColour' onChange={() => document.getElementById('customBackgroundHex').innerText = document.getElementById('customBackgroundColour').value}></input>
+              <label htmlFor='colour' id='customBackgroundHex'>#00000</label>
+           </ul> */ }
+          </li>
+        </div>
+        <div className='section'>
+          <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[4], document.getElementsByClassName('expandIcons')[4])}>{this.props.language.searchbar.title}</h4>
+          <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[4], document.getElementsByClassName('expandIcons')[4])} />
+          <Slider name='searchBar' />
+          <li className='extraSettings'>
+            <ul>
+            <label htmlFor='4'>{this.props.language.searchbar.searchengine} </label>
+              <select className='select-css' name='4' id='searchEngine' onChange={() => SettingsFunctions.setSearchEngine(document.getElementById('searchEngine').value)}>
+                <option value='duckduckgo'>DuckDuckGo</option>
+                <option value='google'>Google</option>
+                <option value='bing'>Bing</option>
+                <option value='yahoo'>Yahoo</option>
+                <option value='ecosia'>Ecosia</option>
+                <option value='yandex'>Yandex</option>
+                <option value='qwant'>Qwant</option>
+                <option value='ask'>Ask</option>
+                <option value='startpage'>Startpage</option>
+               {/* <option value='custom'>Custom</option> */}
+              </select>
+            </ul>
+            <ul id='searchEngineInput' style={{ display: 'none' }}>
+              <p style={{"marginTop": "0px"}}>Custom Search URL <span className='modalLink' onClick={() => this.resetItem('customSearchEngine')}>Reset</span></p>
+              <input type='text' id='customSearchEngine'></input>
+            </ul>
+          </li>
+        </div>
+        <div className='section'>
+          <h4>{this.props.language.offline}</h4>
+          <Slider name='offlineMode' />
+        </div>
+        <h3>{this.props.language.experimental.title}</h3>
+        <div className='section'>
+          <h4>{this.props.language.experimental.webp}</h4>
+          <Slider name='webp' />
+        </div>
+        <div className='section'>
+          <h4>{this.props.language.experimental.dark}</h4>
+          <Slider name='darkTheme' />
+        </div>
+        <div className='section'>
+          <h4>{this.props.language.experimental.animations}</h4>
+          <Slider name='animations' />
+        </div>
+        <div className='section'>
+        <h4 htmlFor='9'>{this.props.language.language} </h4>
+          <select className='select-css' name='9' id='language' onChange={() => localStorage.setItem('language', document.getElementById('language').value)}>
+            <option className='choices' value='en'>English</option>
+            <option className='choices' value='nl'>Nederlands</option>
+            <option className='choices' value='fr'>Français</option>
+            <option className='choices' value='no'>Norsk</option>
+            <option className='choices' value='ru'>Russian</option>
+          </select>
+        </div>
+        <button className='apply' onClick={() => SettingsFunctions.saveStuff()}>{this.props.language.apply}</button>
+        <button className='reset' onClick={() => this.props.setDefaultSettings()}>{this.props.language.reset}</button>
+        <button className='export' onClick={() => SettingsFunctions.exportSettings()}>{this.props.language.export}</button>
+        <button className='import' onClick={() => document.getElementById('file-input').click()}>{this.props.language.import}</button>
+        <input id='file-input' type='file' name='name' className='hidden' />
+      </div>
+    </div>;
+  }
+}
--- a/src/components/modals/Update.jsx
+++ b/src/components/modals/Update.jsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import * as Constants from '../../modules/constants';
+
+export default class Update extends React.PureComponent {
+  constructor(...args) {
+    super(...args);
+    this.state = {
+      title: this.props.language.title,
+      date: '26/08/2020',
+      content: this.props.language.title
+    };
+ }
+
+ async getUpdate() {
+  if (localStorage.getItem('offlineMode') === 'true') return this.setState({
+    title: this.props.language.offline.title,
+    content: this.props.language.offline.description
+  });
+
+  try { // Get update log from the API
+    let data = await fetch(Constants.API_URL + '/getUpdate');
+    data = await data.json();
+    this.setState({
+      title: data.title,
+      content: data.content
+    });
+  } catch (e) { // If it fails, we send an error
+    this.setState({
+      title: this.props.language.error.title,
+      content: this.props.language.error.description
+    });
+  }
+ }
+
+ componentDidMount() {
+   localStorage.setItem('viewedUpdate', true);
+   this.getUpdate();
+ }
+
+  render() {
+    return <div className='updateContent'>
+        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+        <h1 style={{ 'marginBottom':'-10px' }} dangerouslySetInnerHTML={{__html: this.state.title}}></h1>
+        <h5 style={{ 'lineHeight':'0px' }}> By Mue • <span dangerouslySetInnerHTML={{__html: this.state.date}}></span></h5>
+        <p dangerouslySetInnerHTML={{__html: this.state.content}}></p>
+      </div>;
+    }
+}
--- a/src/components/modals/Welcome.jsx
+++ b/src/components/modals/Welcome.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import EmailIcon from '@material-ui/icons/Email';
+
+export default class Welcome extends React.PureComponent {
+  render() {
+    return <div className='welcomeContent'>
+        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
+        <div className="welcomeModalText">
+          <h2 className="subtitle">Welcome to</h2>
+          <h1 className="welcometitle">Mue Tab</h1>
+          <img alt="celebration" style={{"height": "200px", "width": "auto"}} src="./././icons/undraw_celebration.svg" />
+          <h2 className="subtitle">Information</h2>
+          <p>Thank you for downloading Mue Tab,<br/> we hope you enjoy your time with our extension.</p>
+          <h2 className="subtitle">Tutorials</h2>
+          <a href=''>General Start</a>
+          <br/>
+          <a href='https://blog.muetab.xyz/welcome-to-marketplace/'>Marketplace</a>
+          <br/>
+          <a href=''>Submitting Photos</a>
+          <br/>
+          <a href=''>Settings</a>
+          <h2 className="subtitle">Support</h2>
+          <img alt="twitter" href="https://twitter.com/getmue" className="icon" src="./././icons/iconmonstr-twitter.svg"/>
+          <img alt="discord" href="https://discord.gg/kJsufA9" className="icon" src="https://cdn.discordapp.com/attachments/252071498397777921/747860127171739758/Discord-Logo-Black.svg"/>
+          <EmailIcon />
+          <br/>
+          <button className="close" onClick={this.props.modalClose}>Close</button>
+        </div>
+      </div>;
+    }
+}
--- a/src/components/modals/marketplace/Item.jsx
+++ b/src/components/modals/marketplace/Item.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+
+export default class Item extends React.PureComponent {
+  render() {
+    return (
+      <div id='item'>
+      <br/>
+      <ArrowBackIcon className='backArrow' onClick={this.props.function} />
+      <br/>
+      <h1>{this.props.data.name}</h1>
+      {this.props.button}
+      <br/><br/>
+      <img alt="product" src={'https://external-content.duckduckgo.com/iu/?u=' + this.props.data.icon} />
+      <div className="informationContainer">
+      <div className="productInformation">
+          <h4>{this.props.language.information}</h4>
+          <ul>
+              <br/>
+              <li className="header">{this.props.language.last_updated}</li>
+              <li>{this.props.data.updated}</li>
+              <br/>
+              <li className="header">{this.props.language.version}</li>
+              <li>{this.props.data.version}</li>
+              <br/>
+              <li className="header">{this.props.language.author}</li>
+              <li>{this.props.data.author}</li>
+          </ul>
+      </div>
+      <div className="productInformation">
+          <ul>
+              <li className="header">{this.props.language.notice.title}</li>
+              <li id='updated'>{this.props.language.notice.description}</li>
+          </ul>
+      </div>
+      </div>
+      <br/>
+      <h1>{this.props.language.overview}</h1>
+      <p className="description" dangerouslySetInnerHTML={{__html: this.props.data.description}}></p>
+    </div>
+    );
+  }
+}
--- a/src/components/modals/marketplace/Items.jsx
+++ b/src/components/modals/marketplace/Items.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+export default class Items extends React.PureComponent {
+  render() {
+    let seeMoreHTML;
+    if (this.props.seeMore === true) seeMoreHTML = <button className='addToMue seemore' onClick={this.props.seeMoreFunction}>{this.props.seeMoreTitle}</button>;
+
+    return (
+        <div>
+            {seeMoreHTML}
+            <h1>{this.props.title}</h1>
+            <div className="items">
+                {this.props.items.map((item) =>
+                    <div className="item" onClick={() => this.props.toggleFunction(item.name)}>
+                        <img alt="icon" src={'https://external-content.duckduckgo.com/iu/?u=' + item.icon_url} />
+                        <div className="details">
+                            <h4>{item.display_name}</h4>
+                            <p>{item.author}</p>
+                        </div>
+                    </div>)}
+                </div>
+          </div>
+    );
+  }
+}
--- a/src/components/modals/settings/Checkbox.jsx
+++ b/src/components/modals/settings/Checkbox.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import SettingsFunctions from '../../../modules/settingsFunctions';
+import CheckboxUI from '@material-ui/core/Checkbox';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+
+export default class Checkbox extends React.PureComponent {
+  constructor(...args) {
+    super(...args);
+    this.state = {
+        checked: true
+    }
+  }
+
+  render() {
+    const handleChange = () => {
+      SettingsFunctions.setItem(this.props.name);
+      let checked;
+      if (this.state.checked === true) checked = false;
+      else checked = true;
+      this.setState({ checked: checked });
+    }
+
+    let value = localStorage.getItem(this.props.name);
+
+    switch (value) {
+      case 'true': value = true; break;
+      case 'false': value = false; break;
+      default: value = false;
+    }
+
+    this.setState({ checked: value });
+
+    return (
+      <React.Fragment>
+        <FormControlLabel
+          control={<CheckboxUI name="checkedB" color="primary" checked={this.state.checked} onChange={handleChange} />}
+          label={this.props.text}
+        />
+        <br/>
+      </React.Fragment>
+    );
+  }
+}
--- a/src/components/modals/settings/Slider.jsx
+++ b/src/components/modals/settings/Slider.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import SettingsFunctions from '../../../modules/settingsFunctions';
+
+export default class Slider extends React.PureComponent {
+  render() {
+    let setText = this.props.name;
+    if (this.props.override) setText = this.props.override;
+    return (
+        <label className="switch">
+          <input type="checkbox" onClick={() => SettingsFunctions.setItem(setText)} id={this.props.name + 'Status'}  />
+          <span className="slider"></span>
+        </label>
+    );
+  }
+}
--- a/src/components/widgets/Background.jsx
+++ b/src/components/widgets/Background.jsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import supportsWebP from 'supports-webp';
+import * as Constants from '../../modules/constants';
+
+export default class Background extends React.PureComponent {
+  doOffline() {
+    const photo = Math.floor(Math.random() * (Constants.OFFLINE_IMAGES - 1 + 1)) + 1; // There are 20 images in the offline-images folder
+    document.getElementById('backgroundCredits').style.display = 'none'; // Hide the location icon
+
+    let photographer; // Photographer credit
+    if ([2, 3, 9, 11, 13, 14, 15].includes(photo)) photographer = 'Pixabay';  // As there are a lot of Pixabay photos, we shorten the code a bit here
+    else switch (photo) {
+      case 1: photographer = 'Tirachard Kumtanom'; break;
+      case 4: photographer = 'Sohail Na'; break;
+      case 7: photographer = 'Miriam Espacio'; break;
+      case 10: photographer = 'NO NAME'; break;
+      case 20: photographer = 'Fabian Wiktor'; break;
+      default: photographer = 'Unknown'; break;
+    }
+
+    document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(../offline-images/${photo}.jpeg)`); // Set background and blur etc
+    let credit = document.getElementById('photographer');
+    credit.innerText = `${credit.innerText} ${photographer} (Pexels)`; // Set the credit
+  }
+
+  async setBackground() {
+    if (localStorage.getItem('offlineMode') === 'true') return this.doOffline();
+
+    const photoPack = JSON.parse(localStorage.getItem('photo_packs'));
+    if (photoPack) {
+      let background = photoPack[Math.floor(Math.random() * photoPack.length)];
+      document.getElementById('backgroundCredits').style.display = 'none'; // Hide the location icon
+      document.getElementById('photographer').style.display = 'none';
+      return document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${background.url.default})`); // Set background and blur etc
+    }
+
+    const colour = localStorage.getItem('customBackgroundColour');
+    if (colour) {
+      document.getElementById('backgroundCredits').style.display = 'none'; // Hide the location icon
+      document.getElementById('photographer').style.display = 'none';
+      return document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-color: ${colour}`); // Set background and blur etc
+    }
+
+    const custom = localStorage.getItem('customBackground');
+    if (custom !== '') {
+      document.getElementById('backgroundCredits').style.display = 'none'; // Hide the location icon
+      document.getElementById('photographer').style.display = 'none';
+      return document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${custom})`); // Set background and blur etc
+    } else {
+      try { // First we try and get an image from the API...
+        let requestURL;
+        const enabled = localStorage.getItem('webp');
+        const backgroundAPI = localStorage.getItem('backgroundAPI');
+        let data;
+
+        switch (backgroundAPI) {
+          case 'mue':
+            if (await supportsWebP && enabled === 'true') requestURL = Constants.API_URL + '/getImage?webp=true';
+            else requestURL = Constants.API_URL + '/getImage?category=Outdoors';
+            break;
+          case 'unsplash':
+            requestURL = 'https://unsplash.muetab.xyz/getImage';
+            break;
+          default:
+            if (await supportsWebP && enabled === 'true') requestURL = Constants.API_URL +'/getImage?webp=true';
+            else requestURL = Constants.API_URL + '/getImage?category=Outdoors';
+            break;
+        }
+
+        data = await fetch(requestURL);
+        data = await data.json();
+
+        document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${data.file})`); // Set background and blur etc
+        let credit = document.getElementById('photographer');
+        credit.innerText = `${credit.innerText} ${data.photographer}`; // Set the credit
+        document.getElementById('location').innerText = `${data.location}`; // Set the location tooltip
+      } catch (e) { // ..and if that fails we load one locally
+        this.doOffline();
+      }
+    }
+  }
+
+  componentDidMount() {
+    if (localStorage.getItem('background') === 'false') return document.getElementById('backgroundCredits').style.display = 'none';
+    if (localStorage.getItem('animations') === 'true') document.getElementById('backgroundImage').classList.add('fade-in');
+    this.setBackground();
+  }
+
+  render() {
+    return <div id='backgroundImage'></div>;
+  }
+}
--- a/src/components/widgets/Clock.jsx
+++ b/src/components/widgets/Clock.jsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import Analog from 'react-clock';
+
+export default class Clock extends React.PureComponent {
+  constructor(...args) {
+    super(...args);
+
+    this.timer = undefined;
+    this.state = {
+      time: '',
+      ampm: ''
+    };
+  }
+
+  startTime(time = localStorage.getItem('seconds') === 'true' || localStorage.getItem('analog') === 'true' ? (1000 - Date.now() % 1000) : (60000 - Date.now() % 60000)) {
+    this.timer = setTimeout(() => {
+      const now = new Date();
+
+      // Analog clock
+      if (localStorage.getItem('analog') === 'true') {
+        this.setState({
+          time: now
+        });
+      } else {
+        let sec = '';
+
+        // Extra 0
+        const zero = localStorage.getItem('zero');
+
+        if (localStorage.getItem('seconds') === 'true') {
+          if (zero === 'false') sec = `:${now.getSeconds()}`;
+          else sec = `:${('00' + now.getSeconds()).slice(-2)}`;
+        }
+
+        if (localStorage.getItem('24hour') === 'true') {
+          let time = '';
+          if (zero === 'false') time = `${now.getHours()}:${now.getMinutes()}${sec}`;
+          else time = `${('00' + now.getHours()).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
+          this.setState({
+            time: time
+          });
+        } else {
+          // 12 hour support
+          let hours = now.getHours();
+          if (hours > 12) hours -= 12;
+
+          // Toggle AM/PM
+          let ampm = now.getHours() > 11 ? 'PM' : 'AM';
+          if (localStorage.getItem('ampm') === 'false') ampm = '';
+
+          let time = '';
+          if (zero === 'false') time = `${hours}:${now.getMinutes()}${sec}`;
+          else time = `${('00' + hours).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
+          this.setState({
+            time: time,
+            ampm: ampm
+          });
+        }
+      }
+
+      this.startTime();
+    }, time);
+  }
+
+  componentDidMount() {
+    if (localStorage.getItem('time') === 'false') return;
+    this.startTime(0);
+  }
+
+  render() {
+    let clockHTML = <h1 className='clock'>{this.state.time}<span className='ampm'>{this.state.ampm}</span> </h1>;
+    if (localStorage.getItem('analog') === 'true') clockHTML = <Analog className='analogclock' value={this.state.time} renderHourMarks={false} renderMinuteMarks={false} />;
+    return clockHTML;
+  }
+}
--- a/src/components/widgets/Greeting.jsx
+++ b/src/components/widgets/Greeting.jsx
@@ -0,0 +1,64 @@
+import React from 'react';
+
+export default class Greeting extends React.PureComponent {
+  constructor(...args) {
+    super(...args);
+    this.state = {
+      greeting: ''
+    };
+ }
+
+  doEvents(time, message) {
+    if (localStorage.getItem('events') === 'false') return message;
+
+    // Get current month & day
+    const m = time.getMonth();
+    const d = time.getDate();
+
+    if (m === 11 && d === 25) message = 'Merry Christmas'; // If it's December 25th, set the greeting string to "Merry Christmas"
+    else if (m === 0 && d === 1) message = 'Happy new year'; // If the date is January 1st, set the greeting string to "Happy new year"
+    else if (m === 9 && d === 31) message = 'Happy Halloween'; // If it's October 31st, set the greeting string to "Happy Halloween"
+
+    return message;
+  }
+
+  getGreeting() {
+    const now = new Date();
+    const hour = now.getHours();
+
+    let message = this.props.language.evening; // Set the default greeting string to "Good evening"
+    if (hour < 12) message = this.props.language.morning; // If it's before 12am, set the greeting string to "Good morning"
+    else if (hour < 18) message = this.props.language.afternoon; // If it's before 6pm, set the greeting string to "Good afternoon"
+
+    // Events
+    message = this.doEvents(now, message);
+    let custom = localStorage.getItem('defaultGreetingMessage');
+    if (custom === 'false') message = '';
+
+    // Name
+    let name = '';
+    const data = localStorage.getItem('greetingName');
+
+    if (typeof data === 'string') {
+      if (data.replace(/\s/g, '').length > 0) name = `, ${data.trim()}`;
+    }
+
+    if (custom === 'false') name = name.replace(',', '');
+
+    // Set the state to the greeting string
+    this.setState({
+      greeting: `${message}${name}`
+    });
+  }
+
+  componentDidMount() {
+    if (localStorage.getItem('greeting') === 'false') return;
+    this.getGreeting();
+  }
+
+  render() {
+    return <h1 className='greeting'>
+      {this.state.greeting}
+    </h1>;
+  }
+}
--- a/src/components/widgets/Quote.jsx
+++ b/src/components/widgets/Quote.jsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import Quotes from '@muetab/quotes';
+import FileCopy from '@material-ui/icons/FilterNone';
+import { toast } from 'react-toastify';
+import * as Constants from '../../modules/constants';
+
+export default class Quote extends React.PureComponent {
+  constructor(...args) {
+    super(...args);
+    this.state = {
+        quote: '',
+        author: ''
+    };
+  }
+
+  doOffline() {
+    const quote = Quotes.random(); // Get a random quote from our local package
+    this.setState({
+      quote: '"' + quote.quote + '"',
+      author: quote.author
+    }); // Set the quote
+  }
+
+  async getQuote() {
+    const quotePack = JSON.parse(localStorage.getItem('quote_packs'));
+    if (quotePack) {
+      const data = quotePack[Math.floor(Math.random() * quotePack.length)]
+      return this.setState({
+        quote: '"' + data.quote + '"',
+        author: data.author
+      });
+    }
+
+    if (localStorage.getItem('offlineMode') === 'true') return this.doOffline();
+
+    try { // First we try and get a quote from the API...
+      let data = await fetch(Constants.API_URL + '/getQuote');
+      data = await data.json();
+      if (data.statusCode === 429) this.doOffline(); // If we hit the ratelimit, we fallback to local quotes
+      this.setState({
+        quote: '"' + data.quote + '"',
+        author: data.author
+      });
+    } catch (e) { // ..and if that fails we load one locally
+      this.doOffline();
+    }
+  }
+
+  copyQuote() {
+    navigator.clipboard.writeText(`${this.state.quote} - ${this.state.author}`);
+    toast(this.props.language.quote);
+  }
+
+  componentDidMount() {
+    if (localStorage.getItem('quote') === 'false') return;
+    this.getQuote();
+  }
+
+  render() {
+    let copy = <FileCopy className='copyButton' onClick={() => this.copyQuote() }></FileCopy>;
+    if (localStorage.getItem('copyButton') === 'false') copy = '';
+
+    return (
+        <div>
+          <h1 className='quote'>{`${this.state.quote}`}</h1>
+          <h1 className='quoteauthor'>{this.state.author} {copy}</h1>
+        </div>
+    )
+  }
+}
--- a/src/components/widgets/Search.jsx
+++ b/src/components/widgets/Search.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import SearchIcon from '@material-ui/icons/Search';
+
+export default class Search extends React.PureComponent {
+  render() {
+    if (localStorage.getItem('searchBar') === 'false') return <div></div>;
+
+    let url;
+    let query = 'q';
+
+    switch (localStorage.getItem('searchEngine')) {
+      case 'duckduckgo': url = 'https://duckduckgo.com'; break;
+      case 'google': url = 'https://google.com/search'; break;
+      case 'bing': url = 'https://bing.com/search'; break;
+      case 'yahoo': url ='https://search.yahoo.com/search'; break;
+      case 'ecosia': url = 'https://ecosia.org/search'; break;
+      case 'yandex': url = 'https://yandex.ru/search'; query = 'text'; break;
+      case 'qwant': url = 'https://www.qwant.com/'; break;
+      case 'ask': url = 'https://ask.com/web'; break;
+      case 'startpage': url = 'https://www.startpage.com/sp/search'; break;
+      default: url = 'https://duckduckgo.com'; break;
+    }
+
+    const searchButton = () => {
+      let value = document.getElementById('searchtext').value;
+      if (!value) value = 'mue fast';
+      window.location.href = url + '?q=' + value;
+    }
+
+    return <div id='searchBar' className='searchbar'>
+        <form id='searchBar' className='searchbarform' action={url}>
+            <SearchIcon onClick={() => searchButton()} />
+            <input type='text' placeholder={this.props.language} name={query} id='searchtext' className='searchtext'/>
+            <div className='blursearcbBG'/>
+          </form>
+      </div>
+  }
+}
--- a/src/css/index.css
+++ b/src/css/index.css
@@ -1 +0,0 @@
-.App-clock{font-size:4em;margin:0;text-shadow:0 0 25px rgba(0,0,0,.3)}.App-ampm-specifier{font-size:.5em}.App-greeting{margin:0;font-size:1.6em;text-shadow:0 0 25px rgba(0,0,0,.3)}.App-quote{font-size:.8em;text-shadow:0 0 25px rgba(0,0,0,.3)}@media screen and (min-width: 600px){.App-quote{margin-left:30%;margin-right:30%}}.App-quote-author{font-size:.9em;letter-spacing:.5px;margin:0;text-shadow:0 0 25px rgba(0,0,0,.3)}i.material-icons,h1.App-quote-author{display:inline}.search-bar{position:absolute;left:20px;top:20px;display:flex;flex-direction:row;display:block;color:#fff;font-family:"Lexend Deca"}.search-bar button{cursor:pointer;outline:none;display:inline}.search-bar button i.material-icons{text-shadow:0 0 25px rgba(0,0,0,.3)}.search-bar input[type=text]{font-size:calc(5px + 1.2vmin);background:none;border:2px solid #fff;padding:10px;color:#fff;position:absolute;box-shadow:0 0 25px rgba(0,0,0,.3);z-index:1}.input.searchText{border:none}.searchbarform{display:flex;flex-direction:row;box-shadow:0 25px 50px -12px rgba(0,0,0,.25)}#location{margin-bottom:-10px}#location,#photographer{font-size:calc(10px + 1.2vmin);text-shadow:0 0 25px rgba(0,0,0,.3);text-overflow:ellipsis}#photographer{position:absolute;bottom:10px;left:50px;width:1000px}.tooltip{position:absolute;bottom:15px;left:10px}.personicon,.locationicon{font-size:calc(10px + 1.2vmin)}.MuiSvgIcon-root{position:absolute;bottom:2px;left:2px;width:100em;height:100em;font-size:2rem;text-shadow:0 2px 25px rgba(0,0,0,.3)}.credits{bottom:2px;left:0px;position:absolute;text-align:left;min-width:50px}.tooltip{position:relative;display:inline-block;border-bottom:1px dotted #000}.tooltip .tooltiptext{visibility:hidden;background-color:#000;color:#fff;text-align:center;border-radius:6px;padding:20px;position:absolute;z-index:1;position:absolute;bottom:40px;left:60px;margin-left:-60px;opacity:0;transition:opacity 1s}.tooltip:hover .tooltiptext{visibility:visible;opacity:1}#center{margin-left:2vw;margin-right:2vw;display:flex;flex-direction:column;justify-content:center;font-size:calc(10px + 2vmin);text-align:center}::placeholder{color:#fff;opacity:1}:-ms-input-placeholder{color:#fff}#root{background-size:cover;background-repeat:no-repeat;background-position:center center;background-attachment:fixed;min-height:100vh;display:grid;color:#fff}.App-link{color:#61dafb}body{background:#2f3640;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:"Lexend Deca";overflow:hidden}@font-face{font-family:"Lexend Deca";src:url("/./fonts/LexendDeca-Regular.woff2") format("woff2")}/*# sourceMappingURL=index.css.map */
--- a/src/css/index.css.map
+++ b/src/css/index.css.map
@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["../scss/modules/_clock.scss","../scss/modules/_greeting.scss","../scss/modules/_quote.scss","../scss/modules/_search.scss","../scss/modules/_credit.scss","../scss/modules/_miscellaneous.scss","../scss/index.scss"],"names":[],"mappings":"AAAA,WACE,cACA,SACA,oCAGF,oBACE,eCPF,cACI,SACA,gBACA,oCCHJ,WACE,eACA,oCAGF,qCACE,WACE,gBACA,kBAIJ,kBACE,eACA,oBACA,SACA,oCAGF,qCAEE,eCrBF,YACI,kBACA,UACA,SACA,aACA,mBACA,cACA,WACA,0BAEA,mBACI,eACA,aAMA,eAJA,oCACI,oCAMR,6BACI,8BACA,gBACA,sBACA,aACA,WACA,kBACA,mCACA,UAIR,kBACI,YAGJ,eACI,aACA,mBACA,6CCxCJ,UACE,oBAGF,wBAEE,+BACA,oCACA,uBAGF,cACE,kBACA,YACA,UACA,aAGF,SACE,kBACA,YACA,UAGF,0BAEE,+BAGF,iBACE,kBACA,WACA,SACA,YACA,aACA,eACA,sCAGF,SACE,WACA,SACA,kBACA,gBACA,eAGF,SACE,kBACA,qBACA,8BAEA,sBACE,kBACA,sBACA,WACA,kBACA,kBACA,aACA,kBACA,UACA,kBACA,YACA,UACA,kBAEA,UACA,sBAIJ,4BACE,mBACA,UCzEF,QACE,gBACA,iBACA,aACA,sBACA,uBACA,6BACA,kBAGF,cACE,WACA,UAIF,uBAEE,WCXF,MACI,sBACA,4BACA,kCACA,4BACA,iBACA,aACA,WAGJ,UACI,cAGJ,KACI,mBACA,SACA,mCACA,kCACA,0BACA,gBAGJ,WACI,0BACA","file":"index.css"}
--- a/src/fonts/LexendDeca-Regular.woff
+++ b/src/fonts/LexendDeca-Regular.woff
--- a/src/fonts/LexendDeca-Regular.woff2
+++ b/src/fonts/LexendDeca-Regular.woff2
--- a/src/fonts/LexendDeca.ttf
+++ b/src/fonts/LexendDeca.ttf
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,9 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './App.jsx';
+import App from './App';
+
+import './scss/index.scss';
+import 'react-toastify/dist/ReactToastify.css';

 ReactDOM.render(
    <App/>,
--- a/src/modules/constants.js
+++ b/src/modules/constants.js
@@ -0,0 +1,4 @@
+export const API_URL = 'https://api.muetab.xyz';
+export const UNSPLASH_URL = 'https://unsplash.muetab.xyz';
+export const MARKETPLACE_URL = 'https://marketplace.muetab.xyz';
+export const OFFLINE_IMAGES = 20;
--- a/src/modules/defaultSettings.json
+++ b/src/modules/defaultSettings.json
@@ -0,0 +1,66 @@
+[
+    {
+        "name": "time",
+        "value": true
+    },
+    {
+        "name": "greeting",
+        "value": true
+    },
+    {
+        "name": "background",
+        "value": true
+    },
+    {
+        "name": "quote",
+        "value": true
+    },
+    {
+        "name": "searchBar",
+        "value": true
+    },
+    {
+        "name": "blur",
+        "value": 0
+    },
+    {
+        "name": "events",
+        "value": true
+    },
+    {
+        "name": "customBackgroundColour",
+        "value": ""
+    },
+    {
+        "name": "customBackground",
+        "value": ""
+    },
+    {
+        "name": "greetingName",
+        "value": ""
+    },
+    {
+        "name": "defaultGreetingMessage",
+        "value": true
+    },
+    {
+        "name": "backgroundAPI",
+        "value": "mue"
+    },
+    {
+        "name": "ampm",
+        "value": true
+    },
+    {
+        "name": "copyButton",
+        "value": false
+    },
+    {
+        "name": "installed",
+        "value": "[]"
+    },
+    {
+        "name": "searchEngine",
+        "value": "duckduckgo"
+    }
+]
--- a/src/modules/marketplaceFunctions.js
+++ b/src/modules/marketplaceFunctions.js
@@ -0,0 +1,6 @@
+export default class MarketplaceFunctions {
+    static urlParser (input) { // based on https://stackoverflow.com/questions/37684/how-to-replace-plain-urls-with-links
+        let urlPattern = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_+.~#?&//=]*)/;
+        return input.replace(urlPattern, '<a href="$&" target="_blank">$&</a>');
+    }
+}
--- a/src/modules/settingsFunctions.js
+++ b/src/modules/settingsFunctions.js
@@ -0,0 +1,93 @@
+import detectBrowserLanguage from 'detect-browser-language';
+
+const saveFile = (data, filename = 'file') => {
+    if (!data) return console.error('No data');
+    if (typeof data === 'object') data = JSON.stringify(data, undefined, 4);
+
+    const blob = new Blob([data], { type: 'text/json' });
+    let e = document.createEvent('MouseEvents');
+    let a = document.createElement('a');
+
+    a.href = window.URL.createObjectURL(blob);
+    a.download = filename;
+    a.dataset.downloadurl = ['text/json', a.download, a.href].join(':');
+
+    e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+    a.dispatchEvent(e);
+}
+
+const defaultSettings = require('./defaultSettings.json');
+
+export default class SettingsFunctions {
+    static exportSettings() {
+        let settings = {};
+        for (const key of Object.keys(localStorage)) settings[key] = localStorage.getItem(key);
+        saveFile(settings, 'mue-settings.json');
+    }
+
+    static setItem(key, value) {
+        let old = localStorage.getItem(key);
+        let val = true;
+
+        if (old !== null && !value) {
+            if (old === 'true') val = false;
+            if (old === 'false') val = true;
+        }
+
+        localStorage.setItem(key, val);
+    }
+
+    static toggleExtra(element, element2) {
+        (element.style.display === 'none' || !element.style.display) ? element.style.display = 'block' : element.style.display = 'none';
+        (element2.style.transform === 'rotate(-180deg)') ? element2.style.transform = 'rotate(0)' : element2.style.transform = 'rotate(-180deg)';
+    }
+
+    static setSearchEngine(input) {
+        const searchEngineInput = document.getElementById('searchEngineInput');
+        if (input === 'custom') {
+          searchEngineInput.enabled = 'false';
+          searchEngineInput.style.display = 'block';
+        } else {
+          searchEngineInput.style.display = 'none';
+          searchEngineInput.enabled = 'true';
+          localStorage.setItem('searchEngine', input);
+        }
+    }
+
+    static saveStuff() {
+        localStorage.setItem('blur', document.getElementById('blurRange').value); // this is better than inline onChange for performance
+        localStorage.setItem('greetingName', document.getElementById('greetingName').value);
+        localStorage.setItem('customBackground', document.getElementById('customBackground').value);
+        if (!document.getElementById('searchEngineInput').enabled === 'false') {
+          localStorage.setItem('customSearchEngine', document.getElementById('searchEngineInput').value);
+        }
+        window.location.reload();
+    }
+
+    static setDefaultSettings() {
+        localStorage.clear();
+        defaultSettings.forEach(element => localStorage.setItem(element.name, element.value));
+
+        // Set theme depending on user preferred
+        // if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) localStorage.setItem('darkTheme', true);
+        //else localStorage.setItem('darkTheme', false);
+
+        switch(detectBrowserLanguage()) {
+            case 'nl':
+                localStorage.setItem('language', 'nl');
+                break;
+            case 'no':
+                localStorage.setItem('language', 'no');
+                break;
+            case 'fr':
+                localStorage.setItem('language', 'fr');
+                break;
+            default:
+                localStorage.setItem('language', 'en');
+        }
+
+        // Finally we set this to true so it doesn't run the function on every load
+        localStorage.setItem('firstRun', true);
+        window.location.reload();
+    }
+}
--- a/src/quotes.json
+++ b/src/quotes.json
@@ -1,102 +0,0 @@
-{
-    "1": {
-        "author": "Robert De Niro",
-        "quote": "Time goes on. So whatever you’re going to do, do it. Do it now. Don’t wait."
-    },
-    "2": {
-        "author": "Walt Disney",
-        "quote": "All our dreams can come true, if we have the courage to pursue them."
-    },
-    "3": {
-        "author": "Confucius",
-        "quote": "It does not matter how slowly you go as long as you do not stop."
-    },
-    "4": {
-        "author": "Roy T. Bennett",
-        "quote": "Believe in yourself. You are braver than you think, more talented than you know, and capable of more than you imagine."
-    },
-    "5": {
-        "author": "Wayne Dyer",
-        "quote": "If you believe it will work out, you’ll see opportunities. If you believe it won’t, you will see obstacles."
-    },
-    "6": {
-        "author": "George Addair",
-        "quote": "Everything you’ve ever wanted is on the other side of fear."
-    },
-    "7": {
-        "author": "Winston Churchill",
-        "quote": "Success is not final, failure is not fatal: it is the courage to continue that counts."
-    },
-    "8": {
-        "author": "Paulo Coelho",
-        "quote": "There is only one thing that makes a dream impossible to achieve: the fear of failure"
-    },
-    "9": {
-        "author": "Brian Tracy",
-        "quote": "Your true success in life begins only when you make the commitment to become excellent at what you do."
-    },
-    "10": {
-        "author": "Chantal Sutherland",
-        "quote": "Believe in yourself, take on your challenges, dig deep within yourself to conquer fears. Never let anyone bring you down. You got to keep going."
-    },
-    "11": {
-        "author": "Les Brown",
-        "quote": "Too many of us are not living our dreams because we are living our fears."
-    },
-    "12": {
-        "author": "Bob Riley",
-        "quote": "Hard times don’t create heroes. It is during the hard times when the ‘hero’ within us is revealed."
-    },
-    "13": {
-        "author": "Jack Canfield",
-        "quote": "If you can tune into your purpose and really align with it, setting goals so that your vision is an expression of that purpose, then life flows much more easily."
-    },
-    "14": {
-        "author": "Napolean Hill",
-        "quote": "Whatever the mind can conceive and believe, it can achieve."
-    },
-    "15": {
-        "author": "Jim Rohn",
-        "quote": "Don’t wish it were easier. Wish you were better."
-    },
-    "16": {
-        "author": "Serena Williams",
-        "quote": "A champion is defined not by their wins but by how they can recover when they fall."
-    },
-    "17": {
-        "author": "Sheryl Sandberg",
-        "quote": "Motivation comes from working on things we care about."
-    },
-    "18": {
-        "author": "Reese Witherspoon",
-        "quote": "With the right kind of coaching and determination you can accomplish anything."
-    },
-    "19": {
-        "author": "Hazrat Inayat Khan",
-        "quote": "Some people look for a beautiful place. Others make a place beautiful."
-    },
-    "20": {
-        "author": "Albert Einstein",
-        "quote": "Life is like riding a bicycle. To keep your balance, you must keep moving."
-    },
-    "21": {
-        "author": "Walt Disney",
-        "quote": "The way to get started is to quit talking and begin doing."
-    },
-    "22": {
-        "author": "Winston Churchill",
-        "quote": "A pessimist sees the difficulty in every opportunity; an optimist sees the opportunity in every difficulty."
-    },
-    "23": {
-        "author": "Will Rogers",
-        "quote": "Don't let yesterday take up too much of today."
-    },
-    "24": {
-        "author": "Vince Lombardi",
-        "quote": "It's not whether you get knocked down, it's whether you get up."
-    },
-    "25": {
-        "author": "Steve Jobs",
-        "quote": "If you are working on something that you really care about, you don’t have to be pushed. The vision pulls you."
-    }
-}
--- a/src/scss/_mixins.scss
+++ b/src/scss/_mixins.scss
@@ -0,0 +1,28 @@
+// credit: https://joshbroton.com/quick-fix-sass-mixins-for-css-keyframe-animations/
+@mixin animation($animate...) {
+    $max: length($animate);
+    $animations: '';
+
+    @for $i from 1 through $max {
+        $animations: #{$animations + nth($animate, $i)};
+
+        @if $i < $max {
+            $animations: #{$animations + ', '};
+        }
+    }
+    -webkit-animation: $animations;
+    -moz-animation: $animations;
+    animation: $animations;
+}
+
+@mixin keyframes($animationName) {
+    @-webkit-keyframes #{$animationName} {
+        @content;
+    }
+    @-moz-keyframes #{$animationName} {
+        @content;
+    }
+    @keyframes #{$animationName} {
+        @content;
+    }
+}
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -0,0 +1,31 @@
+@use 'sass:map';
+
+$theme-colours: (
+  'gradient': linear-gradient(90deg, #ffb032 0%, #dd3b67 100%),
+  'main': rgba(242, 243, 244, 1),
+  'secondary': rgba(0, 0, 0, 1),
+  'main-text-color': rgba(242, 243, 244, 1),
+);
+
+$modal: (
+  'background': #fff,
+  'text': rgba(0, 0, 0, 1),
+  'tab-underline': rgba(204, 204, 204, 1),
+  'tab-underline-active': rgba(0, 0, 0, 1),
+  'border-radius': 12px,
+);
+
+$marketplace: (
+    'item-background': rgba(242, 243, 244, 1),
+    'product-information-backgroud': rgba(242, 243, 244, 1),
+);
+
+$button-colours: (
+  'confirm': rgba(46, 213, 115, 1),
+  'reset': rgba(255, 71, 87, 1),
+  'other': rgba(83, 82, 237, 1),
+);
+
+$main-parts: (
+    'shadow':  0 0 1rem 0 rgba(0, 0, 0, .2),
+);
--- a/src/scss/index.scss
+++ b/src/scss/index.scss
@@ -1,34 +1,89 @@
+@import 'variables';
+@import 'mixins';
+
@import 'modules/clock';
@import 'modules/greeting';
@import 'modules/quote';
@import 'modules/search';
@import 'modules/credit';
-@import 'modules/miscellaneous';
-
-#root {
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-attachment: fixed;
-    min-height: 100vh;
-    display: grid;
-    color: white;
-}
-
-.App-link {
-    color: #61dafb;
-}
+@import 'modules/navbar';
+@import 'modules/modal';
+@import 'modules/settings';
+@import 'modules/toast';
+@import 'modules/marketplace';
+@import 'modules/checkbox';
+@import 'modules/buttons';
+@import 'modules/welcome';

 body {
    background: #2f3640;
    margin: 0;
    -webkit-font-smoothing: antialiased;
    -moz-osx-font-smoothing: grayscale;
-    font-family: 'Lexend Deca';
+    font-family: 'Lexend Deca', sans-serif;
    overflow: hidden;
 }

+* {
+    font-family: 'Lexend Deca' !important;
+    outline: none;
+}
+
@font-face {
    font-family: 'Lexend Deca';
    src: url('/./fonts/LexendDeca-Regular.woff2') format('woff2');
+}
+
+#center {
+    margin-left: 2vw;
+    margin-right: 2vw;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    font-size: calc(10px + 2vmin);
+    text-align: center;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    text-shadow: 0 0 25px rgba(0, 0, 0, 0.3);
+}
+
+::placeholder {
+    color: map-get($theme-colours, 'main');
+    opacity: 1;
+}
+
+#root {
+    min-height: 100vh;
+    display: grid;
+    color: map-get($theme-colours, 'main-text-color');
+}
+
+#backgroundImage {
+    height: 100vh;
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-attachment: fixed;
+}
+
+.fade-in {
+    @include animation('fadein 2s');
+}
+
+@include keyframes(fadein) {
+    from { opacity: 0; }
+    to   { opacity: 1; }
+}
+
+.backgroundEffects {
+    opacity: .7;
+    transition: ease 0.6s;
+}
+
+#searchEngine {
+    width: 130px;
 }
--- a/src/scss/modules/_buttons.scss
+++ b/src/scss/modules/_buttons.scss
@@ -0,0 +1,160 @@
+%settingsButton {
+  text-align: center;
+  border: none;
+  transition: ease 0.33s;
+  color: map-get($theme-colours, "main");
+  cursor: pointer;
+  display: inline-block;
+  position: relative;
+  padding: 10px 30px;
+  font-size: 20px;
+  border-radius: 24px;
+  background: none;
+  &:hover {
+    outline: none;
+  }
+
+  &:active {
+    outline: none;
+  }
+}
+
+.apply {
+  @extend %settingsButton;
+  margin-right: 20px;
+  background-color: map-get($button-colours, "confirm");
+  border: 2px solid map-get($button-colours, "confirm");
+
+  &:hover {
+    border: 2px solid map-get($button-colours, "confirm");
+    color: map-get($button-colours, "confirm");
+    background: none;
+  }
+}
+
+
+.reset {
+  @extend %settingsButton;
+  background-color: map-get($button-colours, "reset");
+  border: 2px solid map-get($button-colours, "reset");
+  margin-left: 5px;
+
+  &:hover {
+    border: 2px solid map-get($button-colours, "reset");
+    color: map-get($button-colours, "reset");
+    background: none;
+  }
+}
+
+.close {
+  @extend %settingsButton;
+  padding: 10px 50px 10px 50px;
+  background-color: map-get($button-colours, "other");
+  border: 2px solid map-get($button-colours, "other");
+
+  &:hover {
+    color: map-get($button-colours, "other");
+    border: 2px solid map-get($button-colours, "other");
+    background: none;
+  }
+}
+
+.export,
+.uploadbg,
+.import {
+  @extend %settingsButton;
+  background-color: map-get($button-colours, "other");
+  border: 2px solid map-get($button-colours, "other");
+  color: map-get($theme-colours, "main");
+
+  &:hover {
+    color: map-get($button-colours, "other");
+    border: 2px solid map-get($button-colours, "other");
+    background: none;
+  }
+}
+
+.export,
+.import {
+  float: right;
+  margin-left: 20px;
+}
+
+.storebutton {
+  cursor: pointer;
+  font-size: 18px;
+  float: right;
+  vertical-align: middle;
+  padding: 5px 30px;
+  background: none;
+  outline: none;
+  border: none;
+  border: 2px solid #2d3436;
+  border-radius: 24px;
+  font-family: 'Lexend Deca', sans-serif;
+  transition: ease 0.33s;
+
+  &:hover {
+    background: #2d3436;
+    color: map-get($theme-colours, "main");;
+    border: 2px solid #2d3436;
+  }
+}
+
+.dark .storebutton {
+  border: 2px solid map-get($theme-colours, "main");
+  color: map-get($theme-colours, "main");
+
+  &:hover {
+    background: map-get($theme-colours, "main");
+    color: #2d3436;
+    border: 2px solid map-get($theme-colours, "main");
+  }
+}
+
+#item >.removeFromMue {
+  border: 2px solid #ff4757;
+  color: #ff4757;
+
+  &:hover {
+    background: #ff4757;
+    color: map-get($theme-colours, "main");;
+    border: 2px solid #ff4757;
+  }
+
+  @extend .storebutton;
+}
+
+#item .addToMue,
+#item .removeFromMue {
+  margin-top: 5px;
+}
+
+.addToMue {
+  @extend .storebutton;
+}
+
+.goToMarket {
+  float: none;
+  @extend .storebutton;
+}
+
+.sideload {
+  margin-top: 12px;
+}
+
+.seemore {
+  margin-top: 12px;
+}
+
+.seemore {
+  @extend %settingsButton;
+  background-color: #2d3436;
+  border: 2px solid #2d3436;
+
+  &:hover {
+    color: #2d3436;
+    border: 2px solid #2d3436;
+    background: none;
+  }
+}
--- a/src/scss/modules/_checkbox.scss
+++ b/src/scss/modules/_checkbox.scss
@@ -0,0 +1,3 @@
+.MuiCheckbox-colorPrimary.Mui-checked {
+    color: map-get($button-colours, "reset") !important;
+}
--- a/src/scss/modules/_clock.scss
+++ b/src/scss/modules/_clock.scss
@@ -1,9 +1,20 @@
-.App-clock {
+.clock {
  font-size: 4em;
  margin: 0;
-  text-shadow: 0 0 25px rgba(0, 0, 0, 0.3);
 }

-.App-ampm-specifier {
+.ampm {
  font-size: 0.5em;
+}
+
+.analogclock, .react-clock__face {
+  margin: 0 auto;
+  border-radius: 100%;
+  box-shadow: inset 0 0 100px rgba(0, 0, 0, 0.3);
+  border: 1px solid map-get($theme-colours, "main");
+}
+
+.react-clock__hand__body {
+  background: map-get($theme-colours, "main");;
+  box-shadow: 0 0 25px rgba(0, 0, 0, 0.3);
 }
--- a/src/scss/modules/_credit.scss
+++ b/src/scss/modules/_credit.scss
@@ -1,7 +1,3 @@
-#location {
-  margin-bottom: -10px;
-}
-
 #location,
 #photographer {
  font-size: calc(10px + 1.2vmin);
@@ -9,6 +5,10 @@
  text-overflow: ellipsis;
 }

+#location {
+  margin-bottom: -10px;
+}
+
 #photographer {
  position: absolute;
  bottom: 10px;
@@ -16,25 +16,17 @@
  width: 1000px;
 }

-.tooltip {
-  position: absolute;
-  bottom: 15px;
-  left: 10px;
-}
-
-.personicon,
 .locationicon {
-  font-size: calc(10px + 1.2vmin);
+  width: auto;
+  cursor: pointer;
 }

-.MuiSvgIcon-root {
+.navbar-container > svg, #backgroundCredits > svg  {
+  font-size: calc(10px + 1.5vmin) !important;
  position: absolute;
  bottom: 2px;
  left: 2px;
-  width: 100em;
-  height: 100em;
-  font-size: 2rem;
-  text-shadow: 0 2px 25px rgba(0, 0, 0, 0.3);
+  transition: all 0.5s ease 0s;
 }

 .credits {
@@ -42,34 +34,44 @@
  left: 0px;
  position: absolute;
  text-align: left;
-  min-width: 50px;
+  width: auto;
+  height: auto;
 }

 .tooltip {
  position: relative;
  display: inline-block;
-  border-bottom: 1px dotted black;
+  bottom: 15px;
+  left: 10px;
+  -webkit-filter: drop-shadow(0px 3px 3px rgba(0, 0, 0, 0.4));
+  filter: drop-shadow(0px 3px 3px rgba(0, 0, 0, 0.4));

  .tooltiptext {
+    width: 200px;
+    display: inline-block;
    visibility: hidden;
-    background-color: black;
-    color: #fff;
-    text-align: center;
-    border-radius: 6px;
-    padding: 20px;
+    border-radius: 12px;
+    background-color: map-get($theme-colours, "main");;
+    color: #000;
+    font-size: calc(10px + 1.2vmin);
    position: absolute;
    z-index: 1;
-    position: absolute;
+    padding: 15px 32px;
    bottom: 40px;
    left: 60px;
    margin-left: -60px;
-    /* Fade in tooltip - takes 1 second to go from 0% to 100% opac: */
    opacity: 0;
    transition: opacity 1s;
+    box-sizing: border-box;
+  }
+
+  &:hover .tooltiptext {
+    visibility: visible;
+    opacity: 1;
  }
 }

-.tooltip:hover .tooltiptext {
-  visibility: visible;
-  opacity: 1;
+#photographer, .locationicon {
+  display: inline;
+  vertical-align: midddle;
 }
--- a/src/scss/modules/_greeting.scss
+++ b/src/scss/modules/_greeting.scss
@@ -1,5 +1,4 @@
-.App-greeting {
+.greeting {
    margin: 0;
    font-size: 1.6em;
-    text-shadow: 0 0 25px rgba(0,0,0,0.3);
 }
--- a/src/scss/modules/_marketplace.scss
+++ b/src/scss/modules/_marketplace.scss
@@ -0,0 +1,287 @@
+.tab,
+button.tablinks {
+  margin-top: -10px;
+  font-size: 24px;
+  background: none;
+  border: none;
+  outline: none;
+  color: map-get($modal, "text");
+}
+
+button.tablinks {
+  cursor: pointer;
+  padding: 6px;
+  border-radius: 12px;
+  padding: 10px 30px 10px 30px;
+
+  &:hover {
+    background: rgba(189, 195, 199, .075);
+  }
+
+  &:after {
+    content: "";
+    display: block;
+    margin: 0 auto;
+    width: 50%;
+    padding-top: 10px;
+    border-bottom: 3px solid map-get($modal, "tab-underline");
+  }
+}
+
+#item a {
+  color: map-get($button-colours, "other");
+  cursor: pointer;
+
+  &:hover {
+    opacity: 0.8;
+  }
+}
+
+
+#active:after {
+  content: "";
+  display: block;
+  margin: 0 auto;
+  width: 50%;
+  padding-top: 10px;
+  border-bottom: 3px solid map-get($modal, "tab-underline-active");
+}
+
+.dark {
+
+  .tab,
+  button.tablinks {
+    color: white;
+  }
+
+  #active:after {
+    border-image-slice: 1;
+    border-image-source: map-get($theme-colours, "gradient");
+    border-bottom: 3px solid;
+  }
+}
+
+.tab {
+  margin-left: -3px;
+}
+
+.items {
+  display: flex;
+  flex-flow: wrap;
+  align-items: left;
+  justify-content: left;
+  margin-top: -10px;
+
+  .item {
+    position: relative;
+    border-radius: 12px;
+    height: 80px;
+    width: 270px;
+    background: map-get($marketplace, "item-background");
+    transition: 0.5s;
+    cursor: pointer;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    overflow: none;
+
+    img {
+      height: 100%;
+      width: auto;
+      border-radius: 12px 0 0 12px;
+      background: white;
+    }
+
+    h4 {
+      font-size: 20px;
+      line-height: 20px;
+      font-weight: 600;
+    }
+
+    img,
+    .details {
+      display: inline;
+    }
+
+    .details {
+      position: absolute;
+      left: 90px;
+      top: 15px;
+
+      img {
+        margin-left: 10px;
+        height: 15px;
+      }
+    }
+
+    p {
+      margin-top: 5px;
+    }
+
+    p.desc {
+      margin-top: -14px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    &:hover {
+      transform: scale(1.1);
+    }
+  }
+}
+
+.dark .items .item {
+  background: #2d3436;
+}
+
+p.author {
+  margin-top: -5px;
+}
+
+#item {
+  display: none;
+
+  h1 {
+    font-size: 40px;
+  }
+}
+
+#item>h1,
+#item>.MuiSvgIcon-root {
+  display: inline;
+  font-size: 35px !important;
+}
+
+
+p.description {
+  margin-top: 0px;
+}
+
+.emptyMessage {
+  margin: 0 auto;
+  text-align: center;
+  transform: translateY(30%);
+
+  svg {
+    font-size: 50px;
+    line-height: 0px;
+    margin: 0;
+    margin-bottom: -20px;
+  }
+}
+
+.backArrow {
+  position: relative;
+  cursor: pointer;
+
+  &:hover {
+    color: grey;
+  }
+}
+
+.informationContainer {
+  float: right;
+}
+
+.productInformation {
+  margin-bottom: 20px;
+  padding: 20px;
+  background: map-get($marketplace, "product-information-backgroud");
+  width: 200px;
+  border-radius: 12px;
+
+  li {
+    margin-left: -4px;
+    list-style: none;
+  }
+
+  li.header {
+    text-transform: uppercase;
+    color: #787878;
+    list-style: none;
+    margin-left: -5px;
+  }
+}
+
+.dark .productInformation {
+  background: #2d3436;
+}
+
+#item>img {
+  border-radius: 24px;
+  height: 200px;
+  width: auto;
+}
+
+#marketplace {
+  -webkit-animation: content 0.5s;
+  -moz-animation: content 0.5s;
+  -ms-animation: content 0.5s;
+  -o-animation: content 0.5s;
+  animation: content 0.5s;
+}
+
+@keyframes content {
+  from {
+    opacity: 0;
+    transform: translateY(5%);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0%);
+  }
+}
+
+.banner {
+  text-align: center;
+  background: #54a0ff;
+  border-radius: 24px;
+  padding: 10px;
+  margin: 0;
+  color: map-get($theme-colours, "main");
+  display: none !important;
+}
+
+.featured {
+  background: #2d3436;
+  margin-top: 20px;
+  border-radius: 24px;
+  padding: 50px;
+  color: map-get($theme-colours, "main");
+
+  button {
+    float: left;
+    margin-top: -20px;
+    border: 2px solid map-get($theme-colours, "main");
+    color: map-get($theme-colours, "main");
+
+    &:hover {
+      border: 2px solid map-get($theme-colours, "main");
+      background: map-get($theme-colours, "main");
+      color: #2d3436;
+    }
+  }
+
+  h1 {
+    margin-top: -20px;
+  }
+}
+
+.dark .featured {
+  background: black;
+  color: white;
+}
+
+.requires {
+  float: right;
+}
+
+#seemore {
+  display: none;
+}
+
+#seemore svg {
+  font-size: 35px !important;
+  margin-bottom: -30px;
+}
--- a/src/scss/modules/_miscellaneous.scss
+++ b/src/scss/modules/_miscellaneous.scss
@@ -1,20 +0,0 @@
-#center {
-  margin-left: 2vw;
-  margin-right: 2vw;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  text-align: center;
-}
-
-::placeholder {
-  color: #ffffff;
-  opacity: 1;
-  /* Firefox */
-}
-
-:-ms-input-placeholder {
-  /* Internet Explorer 10-11 */
-  color: #ffffff;
-}
--- a/src/scss/modules/_modal.scss
+++ b/src/scss/modules/_modal.scss
@@ -0,0 +1,186 @@
+.Modal {
+  color: map-get($modal, "text");
+  background-color: map-get($modal, "background");
+  box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
+  border: none;
+  opacity: 1;
+  z-index: -2;
+  padding: 25px;
+  cursor: hand;
+  transition: 0.6s;
+  transition-timing-function: ease-in;
+  border-radius: map-get($modal, "border-radius");
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+
+  &:focus {
+    outline: 0;
+  }
+}
+
+
+.modalLink {
+  color: #5352ed;
+  cursor: pointer;
+
+  &:hover {
+    opacity: 0.8;
+  }
+}
+
+.closeModal {
+  float: right;
+  font-size: 2em;
+  cursor: pointer;
+
+  &:hover {
+    color: grey;
+  }
+}
+
+.dark {
+  background-color: #2f3542 !important;
+  color: white !important;
+}
+
+.ReactModal__Html--open,
+.ReactModal__Body--open {
+  overflow: hidden;
+}
+
+@-webkit-keyframes zoom-in {
+  0% {
+    transform: scale(0);
+  }
+
+  50% {
+    transform: scale(1.05, 1.05);
+  }
+
+  100% {
+    transform: scale(1, 1);
+  }
+}
+
+@keyframes zoom-in {
+  0% {
+    -webkit-transform: scale(0);
+  }
+
+  50% {
+    -webkit-transform: scale(1.05, 1.05);
+  }
+
+  100% {
+    -webkit-transform: scale(1, 1);
+  }
+}
+
+.Overlay {
+  position: fixed;
+  z-index: 100;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100vw;
+  height: 90vh;
+  display: flex;
+  align-items: baseline;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+.modal-animation {
+  -webkit-animation: zoom-in 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+  animation: zoom-in 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+.ReactModal__Content {
+  min-height: calc(100vh - 30vh);
+  max-height: calc(100vh - 10vh);
+  box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.25);
+  overflow-y: auto;
+  position: relative;
+}
+
+@media only screen and (max-height: 700px) {
+  .ReactModal__Content {
+    min-height: 500px;
+    max-height: calc(100vh - 30vh);
+  }
+}
+
+@media only screen and (min-height: 700px){
+  .ReactModal__Content {
+    min-height: 600px;
+  }
+}
+
+.content {
+  margin-top: -20px;
+  width: 900px;
+
+  h1 {
+    font-size: 35px;
+  }
+
+  p {
+    font-size: 16px;
+  }
+
+  .columns {
+    font-size: 15px;
+
+    li {
+      padding-left: 10px;
+    }
+  }
+}
+
+.zoom-out {
+  -webkit-animation: zoom-out 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+  animation: zoom-out 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+@-webkit-keyframes zoom-out {
+  0% {
+    transform: scale(1, 1);
+  }
+
+  50% {
+    transform: scale(1.05, 1.05);
+  }
+
+  100% {
+    transform: scale(0);
+  }
+}
+
+@keyframes zoom-out {
+  0% {
+    -webkit-transform: scale(1, 1);
+  }
+
+  50% {
+    -webkit-transform: scale(1.05, 1.05);
+  }
+
+  100% {
+    -webkit-transform: scale(0);
+  }
+}
+
+.updateContent {
+  width: 400px;
+  padding: 5px;
+  .closeModal {
+    margin-top: 10px;
+    font-size: 45px;
+  }
+  img {
+    width: 100%;
+    height: auto;
+  }
+}
--- a/src/scss/modules/_navbar.scss
+++ b/src/scss/modules/_navbar.scss
@@ -0,0 +1,42 @@
+%navbar {
+    position: absolute;
+    text-align: right;
+    min-width: 50px;
+    cursor: pointer;
+    -webkit-filter: drop-shadow(0 0 6px rgba(0,0,0,.3));
+    filter: drop-shadow(0 0 6px rgba(0,0,0,.3));
+    top: 20px;
+
+    svg {
+        transition: ease 0.2s;
+        font-size: calc(10px + 1.5vmin) !important;
+    }
+
+    &:hover {
+        svg {
+            transform: scale(1.1);
+            color: map-get($theme-colours, "main");;
+        }
+    }
+}
+
+.navbar1 {
+    @extend %navbar;
+    right: 20px;
+    svg {
+        -webkit-backface-visibility: hidden;
+        -webkit-transform: translateZ(0) scale(1.0, 1.0);
+        backface-visibility: hidden;
+        transform: translateZ(0) scale(1.0, 1.0);
+    }
+}
+
+.navbar2 {
+    @extend %navbar;
+    right: 60px;
+}
+
+.navbar3 {
+    @extend %navbar;
+    right: 100px;
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"/></svg>
				`@@ -1 +0,0 @@`
				.App-clock{font-size:4em;margin:0;text-shadow:0 0 25px rgba(0,0,0,.3)}.App-ampm-specifier{font-size:.5em}.App-greeting{margin:0;font-size:1.6em;text-shadow:0 0 25px rgba(0,0,0,.3)}.App-quote{font-size:.8em;text-shadow:0 0 25px rgba(0,0,0,.3)}@media screen and (min-width: 600px){.App-quote{margin-left:30%;margin-right:30%}}.App-quote-author{font-size:.9em;letter-spacing:.5px;margin:0;text-shadow:0 0 25px rgba(0,0,0,.3)}i.material-icons,h1.App-quote-author{display:inline}.search-bar{position:absolute;left:20px;top:20px;display:flex;flex-direction:row;display:block;color:#fff;font-family:"Lexend Deca"}.search-bar button{cursor:pointer;outline:none;display:inline}.search-bar button i.material-icons{text-shadow:0 0 25px rgba(0,0,0,.3)}.search-bar input[type=text]{font-size:calc(5px + 1.2vmin);background:none;border:2px solid #fff;padding:10px;color:#fff;position:absolute;box-shadow:0 0 25px rgba(0,0,0,.3);z-index:1}.input.searchText{border:none}.searchbarform{display:flex;flex-direction:row;box-shadow:0 25px 50px -12px rgba(0,0,0,.25)}#location{margin-bottom:-10px}#location,#photographer{font-size:calc(10px + 1.2vmin);text-shadow:0 0 25px rgba(0,0,0,.3);text-overflow:ellipsis}#photographer{position:absolute;bottom:10px;left:50px;width:1000px}.tooltip{position:absolute;bottom:15px;left:10px}.personicon,.locationicon{font-size:calc(10px + 1.2vmin)}.MuiSvgIcon-root{position:absolute;bottom:2px;left:2px;width:100em;height:100em;font-size:2rem;text-shadow:0 2px 25px rgba(0,0,0,.3)}.credits{bottom:2px;left:0px;position:absolute;text-align:left;min-width:50px}.tooltip{position:relative;display:inline-block;border-bottom:1px dotted #000}.tooltip .tooltiptext{visibility:hidden;background-color:#000;color:#fff;text-align:center;border-radius:6px;padding:20px;position:absolute;z-index:1;position:absolute;bottom:40px;left:60px;margin-left:-60px;opacity:0;transition:opacity 1s}.tooltip:hover .tooltiptext{visibility:visible;opacity:1}#center{margin-left:2vw;margin-right:2vw;display:flex;flex-direction:column;justify-content:center;font-size:calc(10px + 2vmin);text-align:center}::placeholder{color:#fff;opacity:1}:-ms-input-placeholder{color:#fff}#root{background-size:cover;background-repeat:no-repeat;background-position:center center;background-attachment:fixed;min-height:100vh;display:grid;color:#fff}.App-link{color:#61dafb}body{background:#2f3640;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:"Lexend Deca";overflow:hidden}@font-face{font-family:"Lexend Deca";src:url("/./fonts/LexendDeca-Regular.woff2") format("woff2")}/# sourceMappingURL=index.css.map /
				`@@ -1 +0,0 @@`
				{"version":3,"sourceRoot":"","sources":["../scss/modules/_clock.scss","../scss/modules/_greeting.scss","../scss/modules/_quote.scss","../scss/modules/_search.scss","../scss/modules/_credit.scss","../scss/modules/_miscellaneous.scss","../scss/index.scss"],"names":[],"mappings":"AAAA,WACE,cACA,SACA,oCAGF,oBACE,eCPF,cACI,SACA,gBACA,oCCHJ,WACE,eACA,oCAGF,qCACE,WACE,gBACA,kBAIJ,kBACE,eACA,oBACA,SACA,oCAGF,qCAEE,eCrBF,YACI,kBACA,UACA,SACA,aACA,mBACA,cACA,WACA,0BAEA,mBACI,eACA,aAMA,eAJA,oCACI,oCAMR,6BACI,8BACA,gBACA,sBACA,aACA,WACA,kBACA,mCACA,UAIR,kBACI,YAGJ,eACI,aACA,mBACA,6CCxCJ,UACE,oBAGF,wBAEE,+BACA,oCACA,uBAGF,cACE,kBACA,YACA,UACA,aAGF,SACE,kBACA,YACA,UAGF,0BAEE,+BAGF,iBACE,kBACA,WACA,SACA,YACA,aACA,eACA,sCAGF,SACE,WACA,SACA,kBACA,gBACA,eAGF,SACE,kBACA,qBACA,8BAEA,sBACE,kBACA,sBACA,WACA,kBACA,kBACA,aACA,kBACA,UACA,kBACA,YACA,UACA,kBAEA,UACA,sBAIJ,4BACE,mBACA,UCzEF,QACE,gBACA,iBACA,aACA,sBACA,uBACA,6BACA,kBAGF,cACE,WACA,UAIF,uBAEE,WCXF,MACI,sBACA,4BACA,kCACA,4BACA,iBACA,aACA,WAGJ,UACI,cAGJ,KACI,mBACA,SACA,mCACA,kCACA,0BACA,gBAGJ,WACI,0BACA","file":"index.css"}