diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index d6101b223..ccc6569f2 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -154,7 +154,14 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } &
   return (
     <>
       <Center>
-        <Image height={120} width={120} fit="contain" src={form.values.icon} alt="Placeholder" withPlaceholder />
+        <Image
+          height={120}
+          width={120}
+          fit="contain"
+          src={form.values.icon}
+          alt="Placeholder"
+          withPlaceholder
+        />
       </Center>
       <form
         onSubmit={form.onSubmit(() => {
diff --git a/src/components/Settings/SettingsMenu.tsx b/src/components/Settings/SettingsMenu.tsx
index cbd30c987..9e9853e3a 100644
--- a/src/components/Settings/SettingsMenu.tsx
+++ b/src/components/Settings/SettingsMenu.tsx
@@ -2,7 +2,6 @@ import {
   ActionIcon,
   Group,
   Modal,
-  Switch,
   Title,
   Text,
   Tooltip,
diff --git a/src/components/layout/Aside.tsx b/src/components/layout/Aside.tsx
index c68c36a78..6cef6eb4e 100644
--- a/src/components/layout/Aside.tsx
+++ b/src/components/layout/Aside.tsx
@@ -1,5 +1,6 @@
 import { Aside as MantineAside, Group } from '@mantine/core';
-import { WeatherModule, DateModule, ModuleWrapper, CalendarModule } from '../modules';
+import { WeatherModule, DateModule, CalendarModule } from '../modules';
+import { ModuleWrapper } from '../modules/moduleWrapper';
 
 export default function Aside(props: any) {
   return (
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index 8b82b4a74..ac2c3c742 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -10,11 +10,7 @@ const useStyles = createStyles((theme) => ({
 export default function Layout({ children, style }: any) {
   const { classes, cx } = useStyles();
   return (
-    <AppShell
-      aside={<Aside />}
-      header={<Header />}
-      footer={<Footer links={[]} />}
-    >
+    <AppShell aside={<Aside />} header={<Header />} footer={<Footer links={[]} />}>
       <main
         className={cx(classes.main)}
         style={{
diff --git a/src/components/layout/Navbar.tsx b/src/components/layout/Navbar.tsx
index f9fe7b28f..cd6e80098 100644
--- a/src/components/layout/Navbar.tsx
+++ b/src/components/layout/Navbar.tsx
@@ -1,5 +1,6 @@
 import { Group, Navbar as MantineNavbar } from '@mantine/core';
-import { WeatherModule, DateModule, ModuleWrapper } from '../modules';
+import { WeatherModule, DateModule } from '../modules';
+import { ModuleWrapper } from '../modules/moduleWrapper';
 
 export default function Navbar() {
   return (
@@ -15,9 +16,9 @@ export default function Navbar() {
     >
       <Group mt="sm" direction="column" align="center">
         <ModuleWrapper module={DateModule} />
+        <ModuleWrapper module={WeatherModule} />
+        <ModuleWrapper module={WeatherModule} />
       </Group>
-      <ModuleWrapper module={WeatherModule} />
-      <ModuleWrapper module={WeatherModule} />
     </MantineNavbar>
   );
 }
diff --git a/src/components/modules/index.ts b/src/components/modules/index.ts
index 65051904a..4b85fa930 100644
--- a/src/components/modules/index.ts
+++ b/src/components/modules/index.ts
@@ -1,4 +1,3 @@
-export * from './moduleWrapper';
 export * from './date';
 export * from './calendar';
 export * from './search';
diff --git a/src/components/modules/weather/WeatherInterface.ts b/src/components/modules/weather/WeatherInterface.ts
index d6b728a75..39fd42135 100644
--- a/src/components/modules/weather/WeatherInterface.ts
+++ b/src/components/modules/weather/WeatherInterface.ts
@@ -39,198 +39,3 @@ export interface DailyUnits {
   time: string;
   weathercode: string;
 }
-
-// Converts JSON strings to/from your types
-// and asserts the results of JSON.parse at runtime
-export class Convert {
-  public static toWeatherResponse(json: string): WeatherResponse {
-    return cast(JSON.parse(json), r('WeatherResponse'));
-  }
-
-  public static weatherResponseToJson(value: WeatherResponse): string {
-    return JSON.stringify(uncast(value, r('WeatherResponse')), null, 2);
-  }
-}
-
-function invalidValue(typ: any, val: any, key: any = ''): never {
-  if (key) {
-    throw Error(
-      `Invalid value for key "${key}". Expected type ${JSON.stringify(
-        typ
-      )} but got ${JSON.stringify(val)}`
-    );
-  }
-  throw Error(`Invalid value ${JSON.stringify(val)} for type ${JSON.stringify(typ)}`);
-}
-
-function jsonToJSProps(typ: any): any {
-  if (typ.jsonToJS === undefined) {
-    const map: any = {};
-    typ.props.forEach((p: any) => (map[p.json] = { key: p.js, typ: p.typ }));
-    typ.jsonToJS = map;
-  }
-  return typ.jsonToJS;
-}
-
-function jsToJSONProps(typ: any): any {
-  if (typ.jsToJSON === undefined) {
-    const map: any = {};
-    typ.props.forEach((p: any) => (map[p.js] = { key: p.json, typ: p.typ }));
-    typ.jsToJSON = map;
-  }
-  return typ.jsToJSON;
-}
-
-function transform(val: any, typ: any, getProps: any, key: any = ''): any {
-  function transformPrimitive(typ: string, val: any): any {
-    if (typeof typ === typeof val) return val;
-    return invalidValue(typ, val, key);
-  }
-
-  function transformUnion(typs: any[], val: any): any {
-    // val must validate against one typ in typs
-    const l = typs.length;
-    for (let i = 0; i < l; i++) {
-      const typ = typs[i];
-      try {
-        return transform(val, typ, getProps);
-      } catch (_) {}
-    }
-    return invalidValue(typs, val);
-  }
-
-  function transformEnum(cases: string[], val: any): any {
-    if (cases.indexOf(val) !== -1) return val;
-    return invalidValue(cases, val);
-  }
-
-  function transformArray(typ: any, val: any): any {
-    // val must be an array with no invalid elements
-    if (!Array.isArray(val)) return invalidValue('array', val);
-    return val.map((el) => transform(el, typ, getProps));
-  }
-
-  function transformDate(val: any): any {
-    if (val === null) {
-      return null;
-    }
-    const d = new Date(val);
-    if (isNaN(d.valueOf())) {
-      return invalidValue('Date', val);
-    }
-    return d;
-  }
-
-  function transformObject(props: { [k: string]: any }, additional: any, val: any): any {
-    if (val === null || typeof val !== 'object' || Array.isArray(val)) {
-      return invalidValue('object', val);
-    }
-    const result: any = {};
-    Object.getOwnPropertyNames(props).forEach((key) => {
-      const prop = props[key];
-      const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
-      result[prop.key] = transform(v, prop.typ, getProps, prop.key);
-    });
-    Object.getOwnPropertyNames(val).forEach((key) => {
-      if (!Object.prototype.hasOwnProperty.call(props, key)) {
-        result[key] = transform(val[key], additional, getProps, key);
-      }
-    });
-    return result;
-  }
-
-  if (typ === 'any') return val;
-  if (typ === null) {
-    if (val === null) return val;
-    return invalidValue(typ, val);
-  }
-  if (typ === false) return invalidValue(typ, val);
-  while (typeof typ === 'object' && typ.ref !== undefined) {
-    typ = typeMap[typ.ref];
-  }
-  if (Array.isArray(typ)) return transformEnum(typ, val);
-  if (typeof typ === 'object') {
-    return typ.hasOwnProperty('unionMembers')
-      ? transformUnion(typ.unionMembers, val)
-      : typ.hasOwnProperty('arrayItems')
-      ? transformArray(typ.arrayItems, val)
-      : typ.hasOwnProperty('props')
-      ? transformObject(getProps(typ), typ.additional, val)
-      : invalidValue(typ, val);
-  }
-  // Numbers can be parsed by Date but shouldn't be.
-  if (typ === Date && typeof val !== 'number') return transformDate(val);
-  return transformPrimitive(typ, val);
-}
-
-function cast<T>(val: any, typ: any): T {
-  return transform(val, typ, jsonToJSProps);
-}
-
-function uncast<T>(val: T, typ: any): any {
-  return transform(val, typ, jsToJSONProps);
-}
-
-function a(typ: any) {
-  return { arrayItems: typ };
-}
-
-function u(...typs: any[]) {
-  return { unionMembers: typs };
-}
-
-function o(props: any[], additional: any) {
-  return { props, additional };
-}
-
-function m(additional: any) {
-  return { props: [], additional };
-}
-
-function r(name: string) {
-  return { ref: name };
-}
-
-const typeMap: any = {
-  WeatherResponse: o(
-    [
-      { json: 'current_weather', js: 'current_weather', typ: r('CurrentWeather') },
-      { json: 'utc_offset_seconds', js: 'utc_offset_seconds', typ: 0 },
-      { json: 'latitude', js: 'latitude', typ: 3.14 },
-      { json: 'elevation', js: 'elevation', typ: 3.14 },
-      { json: 'longitude', js: 'longitude', typ: 3.14 },
-      { json: 'generationtime_ms', js: 'generationtime_ms', typ: 3.14 },
-      { json: 'daily_units', js: 'daily_units', typ: r('DailyUnits') },
-      { json: 'daily', js: 'daily', typ: r('Daily') },
-    ],
-    false
-  ),
-  CurrentWeather: o(
-    [
-      { json: 'winddirection', js: 'winddirection', typ: 0 },
-      { json: 'windspeed', js: 'windspeed', typ: 3.14 },
-      { json: 'time', js: 'time', typ: '' },
-      { json: 'weathercode', js: 'weathercode', typ: 0 },
-      { json: 'temperature', js: 'temperature', typ: 3.14 },
-    ],
-    false
-  ),
-  Daily: o(
-    [
-      { json: 'temperature_2m_max', js: 'temperature_2m_max', typ: a(3.14) },
-      { json: 'time', js: 'time', typ: a(Date) },
-      { json: 'temperature_2m_min', js: 'temperature_2m_min', typ: a(3.14) },
-      { json: 'weathercode', js: 'weathercode', typ: a(0) },
-    ],
-    false
-  ),
-  DailyUnits: o(
-    [
-      { json: 'temperature_2m_max', js: 'temperature_2m_max', typ: '' },
-      { json: 'temperature_2m_min', js: 'temperature_2m_min', typ: '' },
-      { json: 'time', js: 'time', typ: '' },
-      { json: 'weathercode', js: 'weathercode', typ: '' },
-    ],
-    false
-  ),
-};