diff --git a/src/app-theme.scss b/src/app-theme.scss
index 5f5d058a..2a0888f9 100644
--- a/src/app-theme.scss
+++ b/src/app-theme.scss
@@ -39,7 +39,7 @@ $my-dark-theme: mat.define-dark-theme((
 @include mat.all-component-themes($my-theme);
 
 .dark-theme {
-    @include mat.all-component-themes($my-dark-theme);
+    @include mat.all-component-colors($my-dark-theme);
 
     .about-row .item a {
         color: mat-color($my-dark-accent);
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 34310644..4c3a937c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -17,9 +17,7 @@ import {
   GPXImportDialog,
   GPXExportDialog
 } from 'src/app/lib/components/dialogs';
-import {
-  CourseSettingsModal
-} from 'src/app/lib/components';
+import { CourseSettingsModal } from 'src/app/lib/components';
 import {
   SettingsDialog,
   SKStreamFacade,
@@ -859,7 +857,15 @@ export class AppComponent {
         if (!res) {
           return;
         } // cancelled
-        this.skres.createResource(res.path, res.data);
+        try {
+          const d = JSON.parse(res.data);
+          this.skres.createResource(res.path, d);
+        } catch (err) {
+          this.app.showAlert(
+            'Load Resource',
+            'Resources were not loaded!\nInvalid JSON.'
+          );
+        }
         this.focusMap();
       });
   }
diff --git a/src/app/app.info.ts b/src/app/app.info.ts
index 1e0ea7f4..524374f9 100644
--- a/src/app/app.info.ts
+++ b/src/app/app.info.ts
@@ -21,8 +21,7 @@ import {
 
 import { Convert } from './lib/convert';
 import { SignalKClient } from 'signalk-client-angular';
-import { SKVessel, SKChart } from './modules/skresources/resource-classes';
-import { SKStreamProvider } from './modules/skstream/skstream.service';
+import { SKVessel, SKChart, SKStreamProvider } from './modules';
 
 export interface PluginSettings {
   version: string;
diff --git a/src/app/lib/components/dialogs/geojson-dialog.facade.ts b/src/app/lib/components/dialogs/geojson-dialog.facade.ts
index ebafd932..6cc2a519 100644
--- a/src/app/lib/components/dialogs/geojson-dialog.facade.ts
+++ b/src/app/lib/components/dialogs/geojson-dialog.facade.ts
@@ -11,7 +11,7 @@ import {
   SKWaypoint,
   SKRegion,
   SKTrack
-} from 'src/app/modules/skresources/';
+} from 'src/app/modules';
 import {
   LineStringFeature,
   MultiLineStringFeature,
diff --git a/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
index c3684bcb..1c9a2f1b 100644
--- a/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
+++ b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
@@ -5,7 +5,7 @@ import { Subject, Observable } from 'rxjs';
 
 import { AppInfo } from 'src/app/app.info';
 import { SignalKClient } from 'signalk-client-angular';
-import { SKResources } from '../../../../../modules/skresources';
+import { SKResources } from 'src/app/modules';
 import {
   GPX,
   GPXRoute,
diff --git a/src/app/lib/components/dialogs/gpx/gpxsave/gpxsave-dialog.facade.ts b/src/app/lib/components/dialogs/gpx/gpxsave/gpxsave-dialog.facade.ts
index 1ff29d21..b477d502 100644
--- a/src/app/lib/components/dialogs/gpx/gpxsave/gpxsave-dialog.facade.ts
+++ b/src/app/lib/components/dialogs/gpx/gpxsave/gpxsave-dialog.facade.ts
@@ -3,7 +3,7 @@
 import { Injectable } from '@angular/core';
 import { Subject, Observable } from 'rxjs';
 import { SK2GPX } from './sk2gpx';
-import { SKTrack } from 'src/app/modules/skresources/resource-classes';
+import { SKTrack } from 'src/app/modules';
 import { SignalKClient } from 'signalk-client-angular';
 
 @Injectable({ providedIn: 'root' })
diff --git a/src/app/lib/components/dialogs/trail2route-dialog.ts b/src/app/lib/components/dialogs/trail2route-dialog.ts
index ebd984f5..d7e03ad5 100644
--- a/src/app/lib/components/dialogs/trail2route-dialog.ts
+++ b/src/app/lib/components/dialogs/trail2route-dialog.ts
@@ -18,9 +18,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { CommonDialogs } from 'src/app/lib/components/dialogs';
 import { FreeboardOpenlayersModule } from 'src/app/modules/map/ol';
 import { SimplifyAP } from 'simplify-ts';
-import { SKRoute } from 'src/app/modules/skresources/resource-classes';
-import { SKResources } from 'src/app/modules/skresources//resources.service';
-import { SKStreamFacade } from 'src/app/modules/skstream/skstream.facade';
+import { SKRoute, SKResources, SKStreamFacade } from 'src/app/modules';
 import { AppInfo } from 'src/app/app.info';
 
 /********* Trail2RouteDialog **********
diff --git a/src/app/lib/components/file-input.component.ts b/src/app/lib/components/file-input.component.ts
index 8fb6f1fd..9f37b635 100644
--- a/src/app/lib/components/file-input.component.ts
+++ b/src/app/lib/components/file-input.component.ts
@@ -15,7 +15,7 @@ import {
 @Component({
   standalone: true,
   selector: 'ap-file-input',
-  imports: [ CommonModule ],
+  imports: [CommonModule],
   templateUrl: './file-input.component.html',
   styleUrls: ['./file-input.component.css']
 })
diff --git a/src/app/modules/alarms/alarms.facade.ts b/src/app/modules/alarms/alarms.facade.ts
index 23cff033..f54cc7e6 100644
--- a/src/app/modules/alarms/alarms.facade.ts
+++ b/src/app/modules/alarms/alarms.facade.ts
@@ -5,7 +5,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { Subject, forkJoin, Observable } from 'rxjs';
 
 import { AppInfo } from 'src/app/app.info';
-import { SKResources } from '../skresources';
+import { SKResources } from 'src/app/modules';
 import { SignalKClient } from 'signalk-client-angular';
 import { SKStreamProvider } from '../skstream/skstream.service';
 import { NotificationMessage } from 'src/app/types';
diff --git a/src/app/modules/alarms/components/anchor-watch.component.ts b/src/app/modules/alarms/components/anchor-watch.component.ts
index a433b36c..1a13ce16 100644
--- a/src/app/modules/alarms/components/anchor-watch.component.ts
+++ b/src/app/modules/alarms/components/anchor-watch.component.ts
@@ -9,7 +9,7 @@ import {
 
 interface OutputMessage {
   radius: number | null;
-  raised: boolean
+  raised: boolean;
 }
 
 @Component({
diff --git a/src/app/modules/alarms/components/timer-button.component.ts b/src/app/modules/alarms/components/timer-button.component.ts
index 2bf64d0a..26f24aab 100644
--- a/src/app/modules/alarms/components/timer-button.component.ts
+++ b/src/app/modules/alarms/components/timer-button.component.ts
@@ -32,8 +32,9 @@ import { MatIconModule } from '@angular/material/icon';
         {{ label }} {{ timeLeft }} secs
       </button>
       &nbsp;
-      <button *ngSwitchCase="true" 
-        mat-raised-button 
+      <button
+        *ngSwitchCase="true"
+        mat-raised-button
         color="accent"
         (click)="action()"
       >
diff --git a/src/app/modules/experiments/experiments.ts b/src/app/modules/experiments/experiments.component.ts
similarity index 100%
rename from src/app/modules/experiments/experiments.ts
rename to src/app/modules/experiments/experiments.component.ts
diff --git a/src/app/modules/experiments/experiments.module.ts b/src/app/modules/experiments/experiments.module.ts
index 5057953d..5d23ed33 100644
--- a/src/app/modules/experiments/experiments.module.ts
+++ b/src/app/modules/experiments/experiments.module.ts
@@ -11,7 +11,7 @@ import { MatMenuModule } from '@angular/material/menu';
 import { CommonDialogs } from 'src/app/lib/components/dialogs';
 
 // ** components **
-import { ExperimentsComponent } from './experiments';
+import { ExperimentsComponent } from './experiments.component';
 
 @NgModule({
   imports: [
@@ -28,4 +28,5 @@ import { ExperimentsComponent } from './experiments';
 })
 export class ExperimentsModule {}
 
-export * from './experiments';
+export * from './experiments.component';
+export * from './weather/weather.module';
diff --git a/src/app/modules/index.ts b/src/app/modules/index.ts
index ac60c72d..843c62b9 100644
--- a/src/app/modules/index.ts
+++ b/src/app/modules/index.ts
@@ -5,4 +5,3 @@ export * from './map/map.module';
 export * from './skstream/skstream.module';
 
 export * from './experiments/experiments.module';
-export * from './experiments/weather/weather.module';
diff --git a/src/app/modules/map/components/popover/popover.component.ts b/src/app/modules/map/components/popover/popover.component.ts
index 1856e93f..bd70fcb4 100644
--- a/src/app/modules/map/components/popover/popover.component.ts
+++ b/src/app/modules/map/components/popover/popover.component.ts
@@ -9,10 +9,7 @@ import {
   ChangeDetectionStrategy
 } from '@angular/core';
 import { AppInfo } from 'src/app/app.info';
-import {
-  SKAtoN,
-  SKAircraft
-} from 'src/app/modules/skresources/resource-classes';
+import { SKAtoN, SKAircraft } from 'src/app/modules';
 
 /*********** Popover ***************
 title: string -  title text,
diff --git a/src/app/modules/map/components/popover/resource-popover.component.ts b/src/app/modules/map/components/popover/resource-popover.component.ts
index efa85a88..a625ad29 100644
--- a/src/app/modules/map/components/popover/resource-popover.component.ts
+++ b/src/app/modules/map/components/popover/resource-popover.component.ts
@@ -7,12 +7,7 @@ import {
 } from '@angular/core';
 import { AppInfo } from 'src/app/app.info';
 import { Convert } from 'src/app/lib/convert';
-import {
-  SKRoute,
-  SKWaypoint,
-  SKNote,
-  SKRegion
-} from 'src/app/modules/skresources/resource-classes';
+import { SKRoute, SKWaypoint, SKNote, SKRegion } from 'src/app/modules';
 
 /*********** Resource Popover ***************
 title: string -  title text,
diff --git a/src/app/modules/map/components/profiles/default/vessel-popover.component.ts b/src/app/modules/map/components/profiles/default/vessel-popover.component.ts
index 104fa33e..f7d11dac 100644
--- a/src/app/modules/map/components/profiles/default/vessel-popover.component.ts
+++ b/src/app/modules/map/components/profiles/default/vessel-popover.component.ts
@@ -9,7 +9,7 @@ import {
   SimpleChanges
 } from '@angular/core';
 import { AppInfo } from 'src/app/app.info';
-import { SKVessel } from 'src/app/modules/skresources/resource-classes';
+import { SKVessel } from 'src/app/modules';
 import { Convert } from 'src/app/lib/convert';
 import { GeoUtils, Position } from 'src/app/lib/geoutils';
 
diff --git a/src/app/modules/map/fb-map.component.ts b/src/app/modules/map/fb-map.component.ts
index d0ebf390..f1d8739e 100644
--- a/src/app/modules/map/fb-map.component.ts
+++ b/src/app/modules/map/fb-map.component.ts
@@ -19,16 +19,20 @@ import { GeoUtils, Position } from 'src/app/lib/geoutils';
 
 import { AppInfo } from 'src/app/app.info';
 import { SettingsMessage } from 'src/app/lib/services';
-import { SKResources } from '../skresources/resources.service';
-import { SKOtherResources } from '../skresources/sets/resource-sets.service';
 import {
+  SKResources,
+  SKOtherResources,
   SKChart,
+  SKRoute,
+  SKWaypoint,
+  SKNote,
+  SKRegion,
   SKVessel,
   SKAtoN,
   SKAircraft,
-  SKSaR
-} from '../skresources/resource-classes';
-import { SKStreamFacade } from '../skstream/skstream.facade';
+  SKSaR,
+  SKStreamFacade
+} from 'src/app/modules';
 import {
   mapInteractions,
   mapControls,
@@ -46,12 +50,6 @@ import {
 import { ModifyEvent } from 'ol/interaction/Modify';
 import { DrawEvent } from 'ol/interaction/Draw';
 import { Coordinate } from 'ol/coordinate';
-import {
-  SKRoute,
-  SKWaypoint,
-  SKNote,
-  SKRegion
-} from 'src/app/modules/skresources/resource-classes';
 import { ResourceSets } from 'src/app/types';
 
 interface IResource {
diff --git a/src/app/modules/map/ol/lib/resources/layer-resourceset.component.ts b/src/app/modules/map/ol/lib/resources/layer-resourceset.component.ts
index 311a033b..92499323 100644
--- a/src/app/modules/map/ol/lib/resources/layer-resourceset.component.ts
+++ b/src/app/modules/map/ol/lib/resources/layer-resourceset.component.ts
@@ -28,7 +28,7 @@ import { MapComponent } from '../map.component';
 import { Extent } from '../models';
 import { fromLonLatArray } from '../util';
 import { AsyncSubject } from 'rxjs';
-import { SKResourceSet } from 'src/app/modules/skresources/sets/resource-set';
+import { SKResourceSet } from 'src/app/modules';
 
 // ** Signal K resource collection format **
 @Component({
diff --git a/src/app/modules/skresources/index.ts b/src/app/modules/skresources/index.ts
deleted file mode 100644
index da03f01e..00000000
--- a/src/app/modules/skresources/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './resources.module';
diff --git a/src/app/modules/skresources/lists/aislist.ts b/src/app/modules/skresources/lists/aislist.ts
index 00531ff4..3552d9e2 100644
--- a/src/app/modules/skresources/lists/aislist.ts
+++ b/src/app/modules/skresources/lists/aislist.ts
@@ -6,7 +6,7 @@ import {
   ChangeDetectionStrategy
 } from '@angular/core';
 import { AppInfo } from 'src/app/app.info';
-import { SKVessel } from 'src/app/modules/skresources/resource-classes';
+import { SKVessel } from 'src/app/modules';
 import { Position } from 'src/app/lib/geoutils';
 
 //** AIS Dialog **
diff --git a/src/app/modules/skresources/notes/index.ts b/src/app/modules/skresources/notes/index.ts
deleted file mode 100644
index 733dc3be..00000000
--- a/src/app/modules/skresources/notes/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './notes.module';
diff --git a/src/app/modules/skresources/notes/notes.module.ts b/src/app/modules/skresources/notes/notes.module.ts
index 01b30e2b..b4b95a6e 100644
--- a/src/app/modules/skresources/notes/notes.module.ts
+++ b/src/app/modules/skresources/notes/notes.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, Injectable } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { FormsModule } from '@angular/forms';
diff --git a/src/app/modules/skresources/resources.module.ts b/src/app/modules/skresources/resources.module.ts
index 42ecec91..fba7e95a 100644
--- a/src/app/modules/skresources/resources.module.ts
+++ b/src/app/modules/skresources/resources.module.ts
@@ -31,6 +31,8 @@ import {
   SignalKDetailsComponent,
   FileInputComponent
 } from 'src/app/lib/components';
+import { CommonDialogs } from 'src/app/lib/components/dialogs';
+import { PipesModule } from 'src/app/lib/pipes';
 
 import {
   ResourceDialog,
@@ -44,9 +46,7 @@ import {
 } from './resource-dialogs';
 import { ResourceImportDialog } from './sets/resource-upload-dialog';
 
-import { SKNotesModule } from './notes';
-import { CommonDialogs } from 'src/app/lib/components/dialogs';
-import { PipesModule } from 'src/app/lib/pipes';
+import { SKNotesModule } from './notes/notes.module';
 
 @NgModule({
   imports: [
@@ -116,6 +116,7 @@ export class SignalKResourcesModule {}
 export * from './resources.service';
 export * from './resource-dialogs';
 export * from './resource-classes';
-export * from './notes';
+export * from './notes/notes.module';
+export * from './sets/resource-set';
 export * from './sets/resource-sets.service';
 export * from './sets/resource-upload-dialog';
diff --git a/src/app/modules/skresources/resources.service.ts b/src/app/modules/skresources/resources.service.ts
index 3dc0163b..6bd76581 100644
--- a/src/app/modules/skresources/resources.service.ts
+++ b/src/app/modules/skresources/resources.service.ts
@@ -12,7 +12,7 @@ import { GeoUtils, Position } from 'src/app/lib/geoutils';
 import { Convert } from 'src/app/lib/convert';
 
 import { LoginDialog } from 'src/app/lib/components/dialogs';
-import { NoteDialog, RelatedNotesDialog } from './notes';
+import { NoteDialog, RelatedNotesDialog } from './notes/notes.module';
 import { ResourceDialog } from './resource-dialogs';
 import {
   SKChart,
diff --git a/src/app/modules/skstream/skstream.facade.ts b/src/app/modules/skstream/skstream.facade.ts
index 2db0ff69..6db2a84e 100644
--- a/src/app/modules/skstream/skstream.facade.ts
+++ b/src/app/modules/skstream/skstream.facade.ts
@@ -7,10 +7,8 @@ import { AppInfo } from 'src/app/app.info';
 import { SettingsMessage } from 'src/app/lib/services';
 import { SignalKClient } from 'signalk-client-angular';
 import { SKStreamProvider } from './skstream.service';
-import { SKRoute, SKVessel } from '../skresources/resource-classes';
-import { AlarmsFacade } from '../alarms/alarms.facade';
 import { Convert } from 'src/app/lib/convert';
-import { SKResources } from '../skresources';
+import { SKResources, SKRoute, SKVessel, AlarmsFacade } from 'src/app/modules';
 import {
   NotificationMessage,
   UpdateMessage,
diff --git a/src/app/types/resources/freeboard.ts b/src/app/types/resources/freeboard.ts
index 37f45e16..ff68c5c9 100644
--- a/src/app/types/resources/freeboard.ts
+++ b/src/app/types/resources/freeboard.ts
@@ -3,7 +3,7 @@ import {
   SKWaypoint,
   SKNote,
   SKChart
-} from '../../modules/skresources/resource-classes';
+} from 'src/app/modules/skresources/resource-classes';
 
 export type FBRoutes = Array<FBRoute>;
 export type FBRoute = [string, SKRoute, boolean?];