diff --git a/src/components/modals/Main.jsx b/src/components/modals/Main.jsx
index 7dce7ccb..ec32f441 100644
--- a/src/components/modals/Main.jsx
+++ b/src/components/modals/Main.jsx
@@ -6,26 +6,24 @@ import Marketplace from './tabs/Marketplace';
 
 import Navigation from './tabs/backend/Tabs';
 
-export default class MainModal extends React.PureComponent {
-  render() {
-    return (
-      <div className='modal'>
-        <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
-        <h1>Options</h1>
-        <div>
-          <Navigation navbar={true}>
-            <div label={this.props.language.modals.main.navbar.settings}>
-              <Settings language={this.props.language.modals.main.settings} toastLanguage={this.props.language.toasts} />
-            </div>
-            <div label={this.props.language.modals.main.navbar.addons}>
-              <Addons/>
-            </div>
-            <div label={this.props.language.modals.main.navbar.marketplace}>
-              <Marketplace/>
-            </div>
-          </Navigation>
-        </div>
+export default function MainModal(props) {
+  return (
+    <div className='modal'>
+      <span className='closeModal' onClick={props.modalClose}>&times;</span>
+      <h1>Options</h1>
+      <div>
+        <Navigation navbar={true}>
+          <div label={props.language.modals.main.navbar.settings}>
+            <Settings language={props.language.modals.main.settings} toastLanguage={props.language.toasts} />
+          </div>
+          <div label={props.language.modals.main.navbar.addons}>
+            <Addons/>
+          </div>
+          <div label={props.language.modals.main.navbar.marketplace}>
+            <Marketplace/>
+          </div>
+        </Navigation>
       </div>
-    );
-  }
+    </div>
+  );
 }
\ No newline at end of file
diff --git a/src/components/modals/marketplace/sections/Added.jsx b/src/components/modals/marketplace/sections/Added.jsx
index f127ab3c..d9770728 100644
--- a/src/components/modals/marketplace/sections/Added.jsx
+++ b/src/components/modals/marketplace/sections/Added.jsx
@@ -5,6 +5,8 @@ import Item from '../Item';
 import Items from '../Items';
 import FileUpload from '../../settings/FileUpload';
 
+import MarketplaceFunctions from '../../../../modules/helpers/marketplace';
+
 export default class Added extends React.PureComponent {
   constructor(...args) {
     super(...args);
@@ -61,8 +63,32 @@ export default class Added extends React.PureComponent {
     this.setState({ 
         button: this.buttons.uninstall 
     });
-}
+  }
 
+  manage(type, input) {
+    switch (type) {
+        case 'install': 
+          MarketplaceFunctions.install(input.type, input, true); 
+          break;
+        case 'uninstall': 
+          MarketplaceFunctions.uninstall(this.state.current_data.name, this.state.current_data.content.type); 
+          break;
+        default: 
+          break;
+    }
+
+    toast(this.props.toastLanguage[type + 'ed']);
+
+    let button = '';
+    if (type === 'install') {
+        button = this.buttons.uninstall;
+    }
+
+    this.setState({ 
+        button: button, 
+        installed: JSON.parse(localStorage.getItem('installed')) 
+    });
+  }
 
   render() {
     let content = <Items items={this.state.installed} toggleFunction={(input) => this.toggle('item', 'addon', input)} />;
@@ -74,7 +100,7 @@ export default class Added extends React.PureComponent {
                 <LocalMallIcon/>
                 <h1>Empty</h1>
                 <p className='description'>Nothing here (yet)</p>
-                <button className='goToMarket'>not implemented</button>
+                <button className='goToMarket'>Take me there</button>
            </div>
           </div>
         );
@@ -83,7 +109,7 @@ export default class Added extends React.PureComponent {
     return (
        <React.Fragment>
         <div id='marketplace'>
-          <FileUpload id='file-input' accept='application/json' loadFunction={(e) => this.manage('install', JSON.parse(e.target.result))} />
+          <FileUpload id='file-input' type='settings' accept='application/json' loadFunction={(e) => this.manage('install', JSON.parse(e.target.result))} />
           <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button>
           {content}
         </div>
diff --git a/src/components/modals/tabs/backend/Tab.jsx b/src/components/modals/tabs/backend/Tab.jsx
index 4d098e14..b99fff20 100644
--- a/src/components/modals/tabs/backend/Tab.jsx
+++ b/src/components/modals/tabs/backend/Tab.jsx
@@ -46,6 +46,7 @@ export default class Tab extends React.PureComponent {
           case 'Settings': icon = <Settings/>; break;
           case 'My Add-ons': icon = <Addons/>; break;
           case 'Marketplace': icon = <Marketplace/>; break;
+
           // Settings
           case 'Time': icon = <Time/>; break;
           case 'Greeting': icon = <Greeting/>; break;
@@ -64,6 +65,7 @@ export default class Tab extends React.PureComponent {
             break;
           case 'Change Log': icon = <Changelog/>; break;
           case 'About': icon = <About/>; break; 
+
           // Store
           case 'Themes': icon = <Colors/>; break; 
           case 'Photo Packs': icon = <Background/>; break; 
@@ -73,6 +75,7 @@ export default class Tab extends React.PureComponent {
             divider = <div><hr/></div>;
             break;
           case 'Added': icon = <Added/>; break;
+          
           default: break;
         }
 
diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx
index c3ec0e0e..88b1e4d4 100644
--- a/src/components/widgets/background/Background.jsx
+++ b/src/components/widgets/background/Background.jsx
@@ -161,7 +161,11 @@ export default class Background extends React.PureComponent {
 
   componentDidMount() {
     if (localStorage.getItem('background') === 'false') {
-      return document.querySelector('#credits').style.display = 'none'; // Hide the credit
+      return document.querySelector('.photoInformation').style.display = 'none'; // Hide the credit
+    }
+
+    if (localStorage.getItem('customBackgroundColour') !== 'Disabled') {
+      document.querySelector('.photoInformation').style.display = 'none';
     }
 
     if (localStorage.getItem('animations') === 'true') {