diff --git a/web/projects/install-wizard/src/app/app.module.ts b/web/projects/install-wizard/src/app/app.module.ts
index 3164d5d99..242742fda 100644
--- a/web/projects/install-wizard/src/app/app.module.ts
+++ b/web/projects/install-wizard/src/app/app.module.ts
@@ -5,7 +5,6 @@ import {
   DriveComponent,
   LoadingModule,
   RELATIVE_URL,
-  UnitConversionPipesModule,
   WorkspaceConfig,
 } from '@start9labs/shared'
 import { TuiDialogModule, TuiRootModule } from '@taiga-ui/core'
@@ -42,7 +41,6 @@ const {
     TuiIconModule,
     TuiSurfaceModule,
     TuiTitleModule,
-    UnitConversionPipesModule,
   ],
   providers: [
     {
diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.component.html b/web/projects/marketplace/src/pages/release-notes/release-notes.component.html
index 635dacd0b..be9537114 100644
--- a/web/projects/marketplace/src/pages/release-notes/release-notes.component.html
+++ b/web/projects/marketplace/src/pages/release-notes/release-notes.component.html
@@ -2,7 +2,7 @@
   <div class="box-container">
     <div class="box-container-title">
       <h3 class="small-caps">What's new</h3>
-      <p *ngIf="pkg['published-at'] as published">
+      <p *ngIf="pkg.publishedAt as published">
         <span class="small-caps">Latest Release</span>
         &nbsp;-&nbsp;
         <span class="box-container-title-date">
@@ -16,7 +16,7 @@
         <p
           safeLinks
           class="box-container-details-notes"
-          [innerHTML]="pkg.manifest['release-notes'] | markdown | dompurify"
+          [innerHTML]="pkg.manifest.releaseNotes | markdown | dompurify"
         ></p>
       </div>
       <button
diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.ts b/web/projects/marketplace/src/pages/show/additional/additional.component.ts
index 3a152b8ce..e1876bb81 100644
--- a/web/projects/marketplace/src/pages/show/additional/additional.component.ts
+++ b/web/projects/marketplace/src/pages/show/additional/additional.component.ts
@@ -16,7 +16,6 @@ import {
 import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
 import {
   CopyService,
-  copyToClipboard,
   displayEmver,
   Emver,
   MarkdownComponent,
diff --git a/web/projects/marketplace/src/pages/show/hero/hero.component.ts b/web/projects/marketplace/src/pages/show/hero/hero.component.ts
index f8a82d7cc..22e0ea965 100644
--- a/web/projects/marketplace/src/pages/show/hero/hero.component.ts
+++ b/web/projects/marketplace/src/pages/show/hero/hero.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { SharedPipesModule } from '@start9labs/shared'
 import { MarketplacePkg } from '../../../types'
-import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
 
 @Component({
   selector: 'marketplace-package-hero',
@@ -11,14 +10,14 @@ import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
       <div class="inner-container box-shadow-lg">
         <!-- icon -->
         <img
-          [src]="pkg | mimeType | trustUrl"
+          [src]="pkg.icon | trustUrl"
           class="box-shadow-lg"
           alt="{{ pkg.manifest.title }} Icon"
         />
         <!-- color background -->
         <div class="color-background">
           <img
-            [src]="pkg | mimeType | trustUrl"
+            [src]="pkg.icon | trustUrl"
             alt="{{ pkg.manifest.title }} background image"
           />
         </div>
@@ -144,7 +143,7 @@ import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, SharedPipesModule, MimeTypePipeModule],
+  imports: [CommonModule, SharedPipesModule],
 })
 export class MarketplacePackageHeroComponent {
   @Input({ required: true })
diff --git a/web/projects/setup-wizard/src/app/components/cifs.component.ts b/web/projects/setup-wizard/src/app/components/cifs.component.ts
index 00fa27a5b..5cef71283 100644
--- a/web/projects/setup-wizard/src/app/components/cifs.component.ts
+++ b/web/projects/setup-wizard/src/app/components/cifs.component.ts
@@ -164,7 +164,7 @@ export class CifsComponent {
     const target: CifsBackupTarget = {
       ...this.form.getRawValue(),
       mountable: true,
-      'embassy-os': diskInfo,
+      startOs: diskInfo,
     }
 
     this.dialogs
diff --git a/web/projects/setup-wizard/src/app/components/password.component.ts b/web/projects/setup-wizard/src/app/components/password.component.ts
index 2b41a4c0f..ccce6c3ce 100644
--- a/web/projects/setup-wizard/src/app/components/password.component.ts
+++ b/web/projects/setup-wizard/src/app/components/password.component.ts
@@ -111,7 +111,7 @@ export class PasswordComponent {
     }
 
     try {
-      const passwordHash = this.target!['embassy-os']?.['password-hash'] || ''
+      const passwordHash = this.target!.startOs?.passwordHash || ''
 
       argon2.verify(passwordHash, this.password.value)
       this.context.completeWith(this.password.value)
diff --git a/web/projects/setup-wizard/src/app/components/recover.component.ts b/web/projects/setup-wizard/src/app/components/recover.component.ts
index 4303d709d..765034ab7 100644
--- a/web/projects/setup-wizard/src/app/components/recover.component.ts
+++ b/web/projects/setup-wizard/src/app/components/recover.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core'
-import { RouterLink } from '@angular/router'
+import { RouterModule } from '@angular/router'
 import {
   TuiCellModule,
   TuiIconModule,
@@ -37,7 +37,7 @@ import {
       </span>
     </a>
   `,
-  imports: [RouterLink, TuiIconModule, TuiCellModule, TuiTitleModule],
+  imports: [RouterModule, TuiIconModule, TuiCellModule, TuiTitleModule],
 })
 export class RecoverComponent {
   @Input() disabled = false
diff --git a/web/projects/setup-wizard/src/app/pages/home.page.ts b/web/projects/setup-wizard/src/app/pages/home.page.ts
index 1480543c7..e7927b151 100644
--- a/web/projects/setup-wizard/src/app/pages/home.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/home.page.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { Component, inject, OnInit } from '@angular/core'
-import { RouterLink } from '@angular/router'
+import { RouterModule } from '@angular/router'
 import { ErrorService } from '@start9labs/shared'
 import {
   TuiButtonModule,
@@ -110,7 +110,7 @@ import { StateService } from 'src/app/services/state.service'
   `,
   imports: [
     CommonModule,
-    RouterLink,
+    RouterModule,
     TuiCardModule,
     TuiButtonModule,
     TuiIconsModule,
diff --git a/web/projects/setup-wizard/src/app/pages/recover.page.ts b/web/projects/setup-wizard/src/app/pages/recover.page.ts
index a7c10e708..8792ee7c2 100644
--- a/web/projects/setup-wizard/src/app/pages/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover.page.ts
@@ -98,7 +98,7 @@ export default class RecoverPage {
   }
 
   empty(drive: DiskBackupTarget) {
-    return !drive['embassy-os']?.full
+    return !drive.startOs?.full
   }
 
   async getDrives() {
diff --git a/web/projects/setup-wizard/src/app/pages/success.page.ts b/web/projects/setup-wizard/src/app/pages/success.page.ts
index fab7825df..867118142 100644
--- a/web/projects/setup-wizard/src/app/pages/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success.page.ts
@@ -162,9 +162,9 @@ export default class SuccessPage implements AfterViewInit {
     try {
       const ret = await this.api.complete()
       if (!this.isKiosk) {
-        this.torAddress = ret['tor-address'].replace(/^https:/, 'http:')
-        this.lanAddress = ret['lan-address'].replace(/^https:/, 'http:')
-        this.cert = ret['root-ca']
+        this.torAddress = ret.torAddress.replace(/^https:/, 'http:')
+        this.lanAddress = ret.lanAddress.replace(/^https:/, 'http:')
+        this.cert = ret.rootCa
 
         await this.api.exit()
       }
diff --git a/web/projects/setup-wizard/src/app/services/mock-api.service.ts b/web/projects/setup-wizard/src/app/services/mock-api.service.ts
index a7260825b..f18c39846 100644
--- a/web/projects/setup-wizard/src/app/services/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/mock-api.service.ts
@@ -139,7 +139,7 @@ export class MockApiService extends ApiService {
   async followServerLogs(params: FollowLogsReq): Promise<FollowLogsRes> {
     await pauseFor(1000)
     return {
-      'start-cursor': 'fakestartcursor',
+      startCursor: 'fakestartcursor',
       guid: 'fake-guid',
     }
   }
diff --git a/web/projects/shared/src/directives/drag-scroller.directive.ts b/web/projects/shared/src/directives/drag-scroller.directive.ts
index c70c41d75..4bcaa2fc6 100644
--- a/web/projects/shared/src/directives/drag-scroller.directive.ts
+++ b/web/projects/shared/src/directives/drag-scroller.directive.ts
@@ -5,7 +5,6 @@ import {
   inject,
   NgZone,
 } from '@angular/core'
-import { DOCUMENT } from '@angular/common'
 import { ANIMATION_FRAME } from '@ng-web-apis/common'
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
 import { tuiZonefree } from '@taiga-ui/cdk'
diff --git a/web/projects/shared/src/mocks/get-setup-status.ts b/web/projects/shared/src/mocks/get-setup-status.ts
index 205ebd3ee..0abf1360f 100644
--- a/web/projects/shared/src/mocks/get-setup-status.ts
+++ b/web/projects/shared/src/mocks/get-setup-status.ts
@@ -18,8 +18,8 @@ export async function getSetupStatusMock(): Promise<SetupStatus | null> {
   const progress = tries - 1
 
   return {
-    'bytes-transferred': restoreOrMigrate ? progress : 0,
-    'total-bytes': restoreOrMigrate ? total : null,
+    bytesTransferred: restoreOrMigrate ? progress : 0,
+    totalBytes: restoreOrMigrate ? total : null,
     complete: progress === total,
   }
 }
diff --git a/web/projects/shared/src/services/setup.service.ts b/web/projects/shared/src/services/setup.service.ts
index 118cf35fe..645a0fb12 100644
--- a/web/projects/shared/src/services/setup.service.ts
+++ b/web/projects/shared/src/services/setup.service.ts
@@ -43,8 +43,8 @@ export class SetupService extends Observable<number> {
         return 1
       }
 
-      return progress['total-bytes']
-        ? progress['bytes-transferred'] / progress['total-bytes']
+      return progress.totalBytes
+        ? progress.bytesTransferred / progress.totalBytes
         : 0
     }),
     takeWhile(value => value !== 1, true),
diff --git a/web/projects/ui/src/app/apps/diagnostic/logs/logs.page.ts b/web/projects/ui/src/app/apps/diagnostic/logs/logs.page.ts
index a8304b168..75902f5fd 100644
--- a/web/projects/ui/src/app/apps/diagnostic/logs/logs.page.ts
+++ b/web/projects/ui/src/app/apps/diagnostic/logs/logs.page.ts
@@ -67,7 +67,7 @@ export class LogsPage implements OnInit {
 
       if (!response.entries.length) return
 
-      this.startCursor = response['start-cursor']
+      this.startCursor = response.startCursor
       this.logs = [convertAnsi(response.entries), ...this.logs]
       this.scrollTop = this.scrollbar?.nativeElement.scrollTop || 0
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/apps/portal/components/card.component.ts b/web/projects/ui/src/app/apps/portal/components/card.component.ts
index 2ff8cc275..69ba87b1f 100644
--- a/web/projects/ui/src/app/apps/portal/components/card.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/card.component.ts
@@ -1,145 +1,145 @@
-import { CommonModule } from '@angular/common'
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostListener,
-  Input,
-} from '@angular/core'
-import {
-  TuiBadgedContentModule,
-  TuiBadgeNotificationModule,
-  TuiButtonModule,
-  TuiIconModule,
-} from '@taiga-ui/experimental'
-import { RouterLink } from '@angular/router'
-import { TickerModule } from '@start9labs/shared'
-import { TuiDataListModule, TuiHostedDropdownModule } from '@taiga-ui/core'
-import { Action, ActionsComponent } from './actions.component'
+// import { CommonModule } from '@angular/common'
+// import {
+//   ChangeDetectionStrategy,
+//   Component,
+//   HostListener,
+//   Input,
+// } from '@angular/core'
+// import {
+//   TuiBadgedContentModule,
+//   TuiBadgeNotificationModule,
+//   TuiButtonModule,
+//   TuiIconModule,
+// } from '@taiga-ui/experimental'
+// import { RouterLink } from '@angular/router'
+// import { TickerModule } from '@start9labs/shared'
+// import { TuiDataListModule, TuiHostedDropdownModule } from '@taiga-ui/core'
+// import { Action, ActionsComponent } from './actions.component'
 
-@Component({
-  selector: '[appCard]',
-  template: `
-    <span class="link">
-      <tui-badged-content [style.--tui-radius.rem]="1.5">
-        @if (badge) {
-          <tui-badge-notification size="m" tuiSlot="top">
-            {{ badge }}
-          </tui-badge-notification>
-        }
-        @if (icon?.startsWith('tuiIcon')) {
-          <tui-icon class="icon" [icon]="icon" />
-        } @else {
-          <img alt="" class="icon" [src]="icon" />
-        }
-      </tui-badged-content>
-      <label ticker class="title">{{ title }}</label>
-    </span>
-    @if (isService) {
-      <span class="side">
-        <tui-hosted-dropdown
-          [content]="content"
-          (click.stop.prevent)="(0)"
-          (pointerdown.stop)="(0)"
-        >
-          <button
-            tuiIconButton
-            appearance="outline"
-            size="xs"
-            iconLeft="tuiIconMoreHorizontal"
-            [style.border-radius.%]="100"
-          >
-            Actions
-          </button>
-          <ng-template #content let-close="close">
-            <app-actions [actions]="actions" (click)="close()">
-              {{ title }}
-            </app-actions>
-          </ng-template>
-        </tui-hosted-dropdown>
-      </span>
-    }
-  `,
-  styles: [
-    `
-      :host {
-        display: flex;
-        height: 5.5rem;
-        width: 12.5rem;
-        border-radius: var(--tui-radius-l);
-        overflow: hidden;
-        box-shadow: 0 0.25rem 0.25rem rgb(0 0 0 / 25%);
-        // TODO: Theme
-        background: rgb(111 109 109);
-      }
+// @Component({
+//   selector: '[appCard]',
+//   template: `
+//     <span class="link">
+//       <tui-badged-content [style.--tui-radius.rem]="1.5">
+//         @if (badge) {
+//           <tui-badge-notification size="m" tuiSlot="top">
+//             {{ badge }}
+//           </tui-badge-notification>
+//         }
+//         @if (icon?.startsWith('tuiIcon')) {
+//           <tui-icon class="icon" [icon]="icon" />
+//         } @else {
+//           <img alt="" class="icon" [src]="icon" />
+//         }
+//       </tui-badged-content>
+//       <label ticker class="title">{{ title }}</label>
+//     </span>
+//     @if (isService) {
+//       <span class="side">
+//         <tui-hosted-dropdown
+//           [content]="content"
+//           (click.stop.prevent)="(0)"
+//           (pointerdown.stop)="(0)"
+//         >
+//           <button
+//             tuiIconButton
+//             appearance="outline"
+//             size="xs"
+//             iconLeft="tuiIconMoreHorizontal"
+//             [style.border-radius.%]="100"
+//           >
+//             Actions
+//           </button>
+//           <ng-template #content let-close="close">
+//             <app-actions [actions]="actions" (click)="close()">
+//               {{ title }}
+//             </app-actions>
+//           </ng-template>
+//         </tui-hosted-dropdown>
+//       </span>
+//     }
+//   `,
+//   styles: [
+//     `
+//       :host {
+//         display: flex;
+//         height: 5.5rem;
+//         width: 12.5rem;
+//         border-radius: var(--tui-radius-l);
+//         overflow: hidden;
+//         box-shadow: 0 0.25rem 0.25rem rgb(0 0 0 / 25%);
+//         // TODO: Theme
+//         background: rgb(111 109 109);
+//       }
 
-      .link {
-        display: flex;
-        flex: 1;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        color: white;
-        gap: 0.25rem;
-        padding: 0 0.5rem;
-        font: var(--tui-font-text-m);
-        white-space: nowrap;
-        overflow: hidden;
-      }
+//       .link {
+//         display: flex;
+//         flex: 1;
+//         flex-direction: column;
+//         align-items: center;
+//         justify-content: center;
+//         color: white;
+//         gap: 0.25rem;
+//         padding: 0 0.5rem;
+//         font: var(--tui-font-text-m);
+//         white-space: nowrap;
+//         overflow: hidden;
+//       }
 
-      .icon {
-        width: 2.5rem;
-        height: 2.5rem;
-        border-radius: 100%;
-        color: var(--tui-text-01-night);
-      }
+//       .icon {
+//         width: 2.5rem;
+//         height: 2.5rem;
+//         border-radius: 100%;
+//         color: var(--tui-text-01-night);
+//       }
 
-      .side {
-        width: 3rem;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0 0.25rem 0.25rem rgb(0 0 0 / 25%);
-        // TODO: Theme
-        background: #4b4a4a;
-      }
-    `,
-  ],
-  standalone: true,
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [
-    CommonModule,
-    RouterLink,
-    TuiButtonModule,
-    TuiHostedDropdownModule,
-    TuiDataListModule,
-    TuiIconModule,
-    TickerModule,
-    TuiBadgedContentModule,
-    TuiBadgeNotificationModule,
-    ActionsComponent,
-  ],
-})
-export class CardComponent {
-  @Input({ required: true })
-  id!: string
+//       .side {
+//         width: 3rem;
+//         display: flex;
+//         align-items: center;
+//         justify-content: center;
+//         box-shadow: 0 0.25rem 0.25rem rgb(0 0 0 / 25%);
+//         // TODO: Theme
+//         background: #4b4a4a;
+//       }
+//     `,
+//   ],
+//   standalone: true,
+//   changeDetection: ChangeDetectionStrategy.OnPush,
+//   imports: [
+//     CommonModule,
+//     RouterLink,
+//     TuiButtonModule,
+//     TuiHostedDropdownModule,
+//     TuiDataListModule,
+//     TuiIconModule,
+//     TickerModule,
+//     TuiBadgedContentModule,
+//     TuiBadgeNotificationModule,
+//     ActionsComponent,
+//   ],
+// })
+// export class CardComponent {
+//   @Input({ required: true })
+//   id!: string
 
-  @Input({ required: true })
-  icon!: string
+//   @Input({ required: true })
+//   icon!: string
 
-  @Input({ required: true })
-  title!: string
+//   @Input({ required: true })
+//   title!: string
 
-  @Input()
-  actions: Record<string, readonly Action[]> = {}
+//   @Input()
+//   actions: Record<string, readonly Action[]> = {}
 
-  @Input()
-  badge: number | null = null
+//   @Input()
+//   badge: number | null = null
 
-  get isService(): boolean {
-    return !this.id.includes('/')
-  }
+//   get isService(): boolean {
+//     return !this.id.includes('/')
+//   }
 
-  // Prevents Firefox from starting a native drag
-  @HostListener('pointerdown.prevent')
-  onDown() {}
-}
+//   // Prevents Firefox from starting a native drag
+//   @HostListener('pointerdown.prevent')
+//   onDown() {}
+// }
diff --git a/web/projects/ui/src/app/apps/portal/components/form.component.ts b/web/projects/ui/src/app/apps/portal/components/form.component.ts
index 9c7295520..d77a493a3 100644
--- a/web/projects/ui/src/app/apps/portal/components/form.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/form.component.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/core'
 import { FormGroup, ReactiveFormsModule } from '@angular/forms'
 import { RouterModule } from '@angular/router'
-import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import {
   tuiMarkControlAsTouchedAndValidate,
   TuiValueChangesModule,
diff --git a/web/projects/ui/src/app/apps/portal/components/header/about.component.ts b/web/projects/ui/src/app/apps/portal/components/header/about.component.ts
index 7d5aa2369..17f108198 100644
--- a/web/projects/ui/src/app/apps/portal/components/header/about.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/header/about.component.ts
@@ -37,13 +37,13 @@ import { ConfigService } from 'src/app/services/config.service'
       <div tuiCell>
         <div tuiTitle>
           <strong>CA fingerprint</strong>
-          <div tuiSubtitle>{{ server['ca-fingerprint'] }}</div>
+          <div tuiSubtitle>{{ server.caFingerprint }}</div>
         </div>
         <button
           tuiIconButton
           appearance="icon"
           iconLeft="tuiIconCopy"
-          (click)="copyService.copy(server['ca-fingerprint'])"
+          (click)="copyService.copy(server.caFingerprint)"
         >
           Copy
         </button>
@@ -62,7 +62,7 @@ import { ConfigService } from 'src/app/services/config.service'
   ],
 })
 export class AboutComponent {
-  readonly server$ = inject(PatchDB<DataModel>).watch$('server-info')
+  readonly server$ = inject(PatchDB<DataModel>).watch$('serverInfo')
   readonly copyService = inject(CopyService)
   readonly gitHash = inject(ConfigService).gitHash
 }
diff --git a/web/projects/ui/src/app/apps/portal/components/header/connection.component.ts b/web/projects/ui/src/app/apps/portal/components/header/connection.component.ts
index 3bf249263..c49d48420 100644
--- a/web/projects/ui/src/app/apps/portal/components/header/connection.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/header/connection.component.ts
@@ -50,8 +50,8 @@ export class HeaderConnectionComponent {
     inject(ConnectionService).networkConnected$,
     inject(ConnectionService).websocketConnected$.pipe(startWith(false)),
     inject(PatchDB<DataModel>)
-      .watch$('server-info', 'status-info')
-      .pipe(startWith({ restarting: false, 'shutting-down': false })),
+      .watch$('serverInfo', 'statusInfo')
+      .pipe(startWith({ restarting: false, shuttingDown: false })),
   ]).pipe(
     map(([network, websocket, status]) => {
       if (!network)
@@ -68,7 +68,7 @@ export class HeaderConnectionComponent {
           icon: 'tuiIconCloudOff',
           status: 'warning',
         }
-      if (status['shutting-down'])
+      if (status.shuttingDown)
         return {
           message: 'Shutting Down',
           color: 'var(--tui-neutral-fill)',
diff --git a/web/projects/ui/src/app/apps/portal/components/header/header.component.ts b/web/projects/ui/src/app/apps/portal/components/header/header.component.ts
index b12380702..4e8a9cbf9 100644
--- a/web/projects/ui/src/app/apps/portal/components/header/header.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/header/header.component.ts
@@ -169,7 +169,7 @@ export class HeaderComponent {
     'ui',
     'gaming',
     'snake',
-    'high-score',
+    'highScore',
   )
 }
 
diff --git a/web/projects/ui/src/app/apps/portal/components/header/notifications.component.ts b/web/projects/ui/src/app/apps/portal/components/header/notifications.component.ts
index e0e219738..91c8c3da7 100644
--- a/web/projects/ui/src/app/apps/portal/components/header/notifications.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/header/notifications.component.ts
@@ -46,7 +46,7 @@ import { NotificationService } from '../../services/notification.service'
           tuiCell
           [notification]="not"
         >
-          <ng-container *ngIf="not['package-id'] as pkgId">
+          <ng-container *ngIf="not.packageId as pkgId">
             {{ $any(packageData[pkgId])?.manifest.title || pkgId }}
           </ng-container>
           <button
@@ -57,11 +57,11 @@ import { NotificationService } from '../../services/notification.service'
             (click)="markSeen(notifications, not)"
           ></button>
           <a
-            *ngIf="not['package-id'] && packageData[not['package-id']]"
+            *ngIf="not.packageId && packageData[not.packageId]"
             tuiButton
             size="xs"
             appearance="secondary"
-            [routerLink]="getLink(not['package-id'] || '')"
+            [routerLink]="getLink(not.packageId || '')"
           >
             View Service
           </a>
@@ -104,7 +104,7 @@ export class HeaderNotificationsComponent {
   private readonly patch = inject(PatchDB<DataModel>)
   private readonly service = inject(NotificationService)
 
-  readonly packageData$ = this.patch.watch$('package-data').pipe(first())
+  readonly packageData$ = this.patch.watch$('packageData').pipe(first())
 
   readonly notifications$ = new Subject<ServerNotifications>()
 
@@ -112,7 +112,7 @@ export class HeaderNotificationsComponent {
 
   ngAfterViewInit() {
     this.patch
-      .watch$('server-info', 'unreadNotifications', 'recent')
+      .watch$('serverInfo', 'unreadNotifications', 'recent')
       .pipe(
         tap(recent => this.notifications$.next(recent)),
         first(),
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-addresses.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-addresses.component.ts
new file mode 100644
index 000000000..c0d603068
--- /dev/null
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-addresses.component.ts
@@ -0,0 +1,87 @@
+import { NgIf } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  Input,
+} from '@angular/core'
+import { WINDOW } from '@ng-web-apis/common'
+import { CopyService } from '@start9labs/shared'
+import { TuiDialogService } from '@taiga-ui/core'
+import {
+  TuiButtonModule,
+  TuiCellModule,
+  TuiTitleModule,
+} from '@taiga-ui/experimental'
+import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
+import { QRComponent } from 'src/app/common/qr.component'
+import { mask } from 'src/app/util/mask'
+
+@Component({
+  standalone: true,
+  selector: 'app-interface-address',
+  template: `
+    <div tuiCell>
+      <h3 tuiTitle>
+        <span tuiSubtitle>{{ isMasked ? mask : address }}</span>
+      </h3>
+      <tui-badge appearance="success">
+        {{ label }}
+      </tui-badge>
+      <button
+        *ngIf="isUi"
+        tuiIconButton
+        iconLeft="tuiIconExternalLink"
+        appearance="icon"
+        (click)="launch(address)"
+      >
+        Launch
+      </button>
+      <button
+        tuiIconButton
+        iconLeft="tuiIconGrid"
+        appearance="icon"
+        (click)="showQR(address)"
+      >
+        Show QR code
+      </button>
+      <button
+        tuiIconButton
+        iconLeft="tuiIconCopy"
+        appearance="icon"
+        (click)="copyService.copy(address)"
+      >
+        Copy QR code
+      </button>
+    </div>
+  `,
+  imports: [NgIf, TuiCellModule, TuiTitleModule, TuiButtonModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class InterfaceAddressComponent {
+  private readonly window = inject(WINDOW)
+  private readonly dialogs = inject(TuiDialogService)
+  readonly copyService = inject(CopyService)
+
+  @Input() label?: string
+  @Input({ required: true }) address!: string
+  @Input({ required: true }) isMasked!: boolean
+  @Input({ required: true }) isUi!: boolean
+
+  get mask(): string {
+    return mask(this.address, 64)
+  }
+
+  launch(url: string): void {
+    this.window.open(url, '_blank', 'noreferrer')
+  }
+
+  showQR(data: string) {
+    this.dialogs
+      .open(new PolymorpheusComponent(QRComponent), {
+        size: 'auto',
+        data,
+      })
+      .subscribe()
+  }
+}
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-clearnet.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-clearnet.component.ts
index 551713d2d..8b30037e1 100644
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-clearnet.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-clearnet.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common'
+import { NgForOf, NgIf } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
@@ -20,10 +20,9 @@ import {
 } from 'src/app/apps/portal/components/interfaces/interface.utils'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
-import { DomainInfo, NetworkInfo } from 'src/app/services/patch-db/data-model'
-import { getClearnetAddress } from 'src/app/util/clearnetAddress'
+import { NetworkInfo } from 'src/app/services/patch-db/data-model'
+import { InterfaceAddressComponent } from './interface-addresses.component'
 import { InterfaceComponent } from './interface.component'
-import { InterfacesComponent } from './interfaces.component'
 
 type ClearnetForm = {
   domain: string
@@ -45,32 +44,36 @@ type ClearnetForm = {
       </a>
     </em>
     <ng-container
-      *ngIf="interfaces.addressInfo.domainInfo as domainInfo; else noClearnet"
+      *ngIf="
+        interface.serviceInterface.addresses.clearnet as addresses;
+        else empty
+      "
     >
-      <app-interface
-        label="Clearnet"
-        [hostname]="getClearnet(domainInfo)"
-        [isUi]="interfaces.isUi"
+      <app-interface-address
+        *ngFor="let address of addresses"
+        [label]="address.label"
+        [address]="address.url"
+        [isMasked]="interface.serviceInterface.masked"
+        [isUi]="interface.serviceInterface.type === 'ui'"
       />
       <div [style.display]="'flex'" [style.gap.rem]="1">
-        <button tuiButton size="s" (click)="add()">Update</button>
         <button tuiButton size="s" appearance="danger-solid" (click)="remove()">
           Remove
         </button>
       </div>
     </ng-container>
-    <ng-template #noClearnet>
+    <ng-template #empty>
       <button
         tuiButton
         iconLeft="tuiIconPlus"
         [style.align-self]="'flex-start'"
         (click)="add()"
       >
-        Add Clearnet
+        Add Address
       </button>
     </ng-template>
   `,
-  imports: [InterfaceComponent, NgIf, TuiButtonModule],
+  imports: [NgForOf, InterfaceAddressComponent, NgIf, TuiButtonModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class InterfaceClearnetComponent {
@@ -79,21 +82,14 @@ export class InterfaceClearnetComponent {
   private readonly errorService = inject(ErrorService)
   private readonly api = inject(ApiService)
   private readonly dialogs = inject(TuiDialogService)
-  readonly interfaces = inject(InterfacesComponent)
+  readonly interface = inject(InterfaceComponent)
 
   @Input({ required: true }) network!: NetworkInfo
 
-  getClearnet(clearnet: DomainInfo): string {
-    return getClearnetAddress('https', clearnet)
-  }
-
   async add() {
-    const { domainInfo } = this.interfaces.addressInfo
-    const { domain = '', subdomain = '' } = domainInfo || {}
     const options: Partial<TuiDialogOptions<FormContext<ClearnetForm>>> = {
       label: 'Select Domain/Subdomain',
       data: {
-        value: { domain, subdomain },
         spec: await getClearnetSpec(this.network),
         buttons: [
           {
@@ -118,9 +114,9 @@ export class InterfaceClearnetComponent {
         const loader = this.loader.open('Removing...').subscribe()
 
         try {
-          if (this.interfaces.packageContext) {
+          if (this.interface.packageContext) {
             await this.api.setInterfaceClearnetAddress({
-              ...this.interfaces.packageContext,
+              ...this.interface.packageContext,
               domainInfo: null,
             })
           } else {
@@ -138,9 +134,9 @@ export class InterfaceClearnetComponent {
     const loader = this.loader.open('Saving...').subscribe()
 
     try {
-      if (this.interfaces.packageContext) {
+      if (this.interface.packageContext) {
         await this.api.setInterfaceClearnetAddress({
-          ...this.interfaces.packageContext,
+          ...this.interface.packageContext,
           domainInfo,
         })
       } else {
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-local.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-local.component.ts
index 73a21a1d5..4b2ad8d11 100644
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-local.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-local.component.ts
@@ -1,8 +1,8 @@
-import { CommonModule } from '@angular/common'
+import { NgForOf, NgIf } from '@angular/common'
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { TuiButtonModule } from '@taiga-ui/experimental'
-import { InterfacesComponent } from './interfaces.component'
 import { InterfaceComponent } from './interface.component'
+import { InterfaceAddressComponent } from './interface-addresses.component'
 
 @Component({
   standalone: true,
@@ -19,41 +19,44 @@ import { InterfaceComponent } from './interface.component'
         <strong>View instructions</strong>
       </a>
     </em>
-    <a
-      *ngIf="!interfaces.packageContext"
-      tuiButton
-      iconLeft="tuiIconDownload"
-      href="/public/eos/local.crt"
-      [download]="interfaces.addressInfo.lanHostname + '.crt'"
-      [style.align-self]="'flex-start'"
-    >
-      Download Root CA
-    </a>
-    <app-interface
-      label="Local"
-      [hostname]="interfaces.addressInfo.lanHostname"
-      [isUi]="interfaces.isUi"
-    ></app-interface>
+
     <ng-container
-      *ngFor="let iface of interfaces.addressInfo.ipInfo | keyvalue"
+      *ngIf="
+        interface.serviceInterface.addresses.local as addresses;
+        else empty
+      "
     >
-      <app-interface
-        *ngIf="iface.value.ipv4 as ipv4"
-        [label]="iface.key + ' (IPv4)'"
-        [hostname]="ipv4"
-        [isUi]="interfaces.isUi"
-      ></app-interface>
-      <app-interface
-        *ngIf="iface.value.ipv6 as ipv6"
-        [label]="iface.key + ' (IPv6)'"
-        [hostname]="ipv6"
-        [isUi]="interfaces.isUi"
-      ></app-interface>
+      <app-interface-address
+        *ngFor="let address of addresses"
+        [label]="address.label"
+        [address]="address.url"
+        [isMasked]="interface.serviceInterface.masked"
+        [isUi]="interface.serviceInterface.type === 'ui'"
+      />
+      <div [style.display]="'flex'" [style.gap.rem]="1">
+        <button tuiButton size="s" appearance="danger-solid" (click)="remove()">
+          Remove
+        </button>
+      </div>
     </ng-container>
+    <ng-template #empty>
+      <button
+        tuiButton
+        iconLeft="tuiIconPlus"
+        [style.align-self]="'flex-start'"
+        (click)="add()"
+      >
+        Add Address
+      </button>
+    </ng-template>
   `,
-  imports: [InterfaceComponent, CommonModule, TuiButtonModule],
+  imports: [NgForOf, NgIf, InterfaceAddressComponent, TuiButtonModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class InterfaceLocalComponent {
-  readonly interfaces = inject(InterfacesComponent)
+  readonly interface = inject(InterfaceComponent)
+
+  async add() {}
+
+  async remove() {}
 }
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-tor.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-tor.component.ts
index a15f93e2a..6614687d2 100644
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interface-tor.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface-tor.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import { InterfaceAddressComponent } from './interface-addresses.component'
 import { InterfaceComponent } from './interface.component'
-import { InterfacesComponent } from './interfaces.component'
+import { NgForOf, NgIf } from '@angular/common'
 
 @Component({
   standalone: true,
@@ -17,15 +18,49 @@ import { InterfacesComponent } from './interfaces.component'
         <strong>View instructions</strong>
       </a>
     </em>
-    <app-interface
-      label="Tor"
-      [hostname]="interfaces.addressInfo.torHostname"
-      [isUi]="interfaces.isUi"
-    ></app-interface>
+
+    <ng-container
+      *ngIf="interface.serviceInterface.addresses.tor as addresses; else empty"
+    >
+      <app-interface-address
+        *ngFor="let address of addresses"
+        [label]="address.label"
+        [address]="address.url"
+        [isMasked]="interface.serviceInterface.masked"
+        [isUi]="interface.serviceInterface.type === 'ui'"
+      />
+      <div [style.display]="'flex'" [style.gap.rem]="1">
+        <button tuiButton size="s" appearance="danger-solid" (click)="remove()">
+          Remove
+        </button>
+      </div>
+    </ng-container>
+    <ng-template #empty>
+      <button
+        tuiButton
+        iconLeft="tuiIconPlus"
+        [style.align-self]="'flex-start'"
+        (click)="add()"
+      >
+        Add Address
+      </button>
+    </ng-template>
+
+    <app-interface-address
+      *ngFor="let address of interface.serviceInterface.addresses.tor"
+      [label]="address.label"
+      [address]="address.url"
+      [isMasked]="interface.serviceInterface.masked"
+      [isUi]="interface.serviceInterface.type === 'ui'"
+    />
   `,
-  imports: [InterfaceComponent],
+  imports: [NgForOf, NgIf, InterfaceAddressComponent],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class InterfaceTorComponent {
-  readonly interfaces = inject(InterfacesComponent)
+  readonly interface = inject(InterfaceComponent)
+
+  async add() {}
+
+  async remove() {}
 }
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface.component.ts
index 2f0f362b5..f76828afb 100644
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interface.component.ts
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface.component.ts
@@ -1,79 +1,61 @@
-import { NgIf } from '@angular/common'
+import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
   inject,
   Input,
 } from '@angular/core'
-import { WINDOW } from '@ng-web-apis/common'
-import { CopyService } from '@start9labs/shared'
-import { TuiDialogService } from '@taiga-ui/core'
-import {
-  TuiButtonModule,
-  TuiCellModule,
-  TuiTitleModule,
-} from '@taiga-ui/experimental'
-import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
-import { QRComponent } from 'src/app/common/qr.component'
+import { T } from '@start9labs/start-sdk'
+import { TuiCardModule, TuiSurfaceModule } from '@taiga-ui/experimental'
+import { PatchDB } from 'patch-db-client'
+import { InterfaceClearnetComponent } from 'src/app/apps/portal/components/interfaces/interface-clearnet.component'
+import { InterfaceLocalComponent } from 'src/app/apps/portal/components/interfaces/interface-local.component'
+import { InterfaceTorComponent } from 'src/app/apps/portal/components/interfaces/interface-tor.component'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+import { AddressDetails } from './interface.utils'
 
 @Component({
   standalone: true,
   selector: 'app-interface',
   template: `
-    <div tuiCell>
-      <h3 tuiTitle>
-        {{ label }}
-        <span tuiSubtitle>{{ hostname }}</span>
-      </h3>
-      <button
-        *ngIf="isUi"
-        tuiIconButton
-        iconLeft="tuiIconExternalLink"
-        appearance="icon"
-        (click)="launch(hostname)"
-      >
-        Launch
-      </button>
-      <button
-        tuiIconButton
-        iconLeft="tuiIconGrid"
-        appearance="icon"
-        (click)="showQR(hostname)"
-      >
-        Show QR code
-      </button>
-      <button
-        tuiIconButton
-        iconLeft="tuiIconCopy"
-        appearance="icon"
-        (click)="copyService.copy(hostname)"
-      >
-        Copy QR code
-      </button>
-    </div>
+    <h3 class="g-title">Clearnet</h3>
+    <app-interface-clearnet
+      *ngIf="network$ | async as network"
+      tuiCardLarge="compact"
+      tuiSurface="elevated"
+      [network]="network"
+    />
+
+    <h3 class="g-title">Tor</h3>
+    <app-interface-tor tuiCardLarge="compact" tuiSurface="elevated" />
+
+    <h3 class="g-title">Local</h3>
+    <app-interface-local tuiCardLarge="compact" tuiSurface="elevated" />
   `,
-  imports: [NgIf, TuiCellModule, TuiTitleModule, TuiButtonModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    InterfaceTorComponent,
+    InterfaceLocalComponent,
+    InterfaceClearnetComponent,
+    TuiCardModule,
+    TuiSurfaceModule,
+  ],
 })
 export class InterfaceComponent {
-  private readonly window = inject(WINDOW)
-  private readonly dialogs = inject(TuiDialogService)
-  readonly copyService = inject(CopyService)
+  readonly network$ = inject(PatchDB<DataModel>).watch$('serverInfo', 'network')
 
-  @Input({ required: true }) label = ''
-  @Input({ required: true }) hostname = ''
-  @Input({ required: true }) isUi = false
-
-  launch(url: string): void {
-    this.window.open(url, '_blank', 'noreferrer')
+  @Input() packageContext?: {
+    packageId: string
+    interfaceId: string
   }
+  @Input({ required: true }) serviceInterface!: ServiceInterfaceWithAddresses
+}
 
-  showQR(data: string) {
-    this.dialogs
-      .open(new PolymorpheusComponent(QRComponent), {
-        size: 'auto',
-        data,
-      })
-      .subscribe()
+export type ServiceInterfaceWithAddresses = T.ServiceInterface & {
+  addresses: {
+    clearnet: AddressDetails[]
+    local: AddressDetails[]
+    tor: AddressDetails[]
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interface.utils.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interface.utils.ts
index 461b1a984..19b03852b 100644
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interface.utils.ts
+++ b/web/projects/ui/src/app/apps/portal/components/interfaces/interface.utils.ts
@@ -1,6 +1,7 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
-import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { T } from '@start9labs/start-sdk'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { TuiDialogOptions } from '@taiga-ui/core'
 import { TuiPromptData } from '@taiga-ui/kit'
 import { NetworkInfo } from 'src/app/services/patch-db/data-model'
@@ -44,3 +45,96 @@ export function getClearnetSpec({
     }),
   )
 }
+
+export type AddressDetails = {
+  label?: string
+  url: string
+}
+
+export function getAddresses(
+  serviceInterface: T.ServiceInterfaceWithHostInfo,
+): {
+  clearnet: AddressDetails[]
+  local: AddressDetails[]
+  tor: AddressDetails[]
+} {
+  const host = serviceInterface.hostInfo
+  const addressInfo = serviceInterface.addressInfo
+  const username = addressInfo.username ? addressInfo.username + '@' : ''
+  const suffix = addressInfo.suffix || ''
+
+  const hostnames =
+    host.kind === 'multi'
+      ? host.hostnames
+      : host.hostname
+        ? [host.hostname]
+        : []
+
+  const clearnet: AddressDetails[] = []
+  const local: AddressDetails[] = []
+  const tor: AddressDetails[] = []
+
+  hostnames.forEach(h => {
+    let scheme = ''
+    let port = ''
+
+    if (h.hostname.sslPort) {
+      port = h.hostname.sslPort === 443 ? '' : `:${h.hostname.sslPort}`
+      scheme = addressInfo.bindOptions.addSsl?.scheme
+        ? `${addressInfo.bindOptions.addSsl.scheme}://`
+        : ''
+    }
+
+    if (h.hostname.port) {
+      port = h.hostname.port === 80 ? '' : `:${h.hostname.port}`
+      scheme = addressInfo.bindOptions.scheme
+        ? `${addressInfo.bindOptions.scheme}://`
+        : ''
+    }
+
+    if (h.kind === 'onion') {
+      tor.push({
+        label: h.hostname.sslPort ? 'HTTPS' : 'HTTP',
+        url: toHref(scheme, username, h.hostname.value, port, suffix),
+      })
+    } else {
+      const hostnameKind = h.hostname.kind
+
+      if (hostnameKind === 'domain') {
+        tor.push({
+          url: toHref(
+            scheme,
+            username,
+            `${h.hostname.subdomain}.${h.hostname.domain}`,
+            port,
+            suffix,
+          ),
+        })
+      } else {
+        local.push({
+          label:
+            hostnameKind === 'local'
+              ? 'Local'
+              : `${h.networkInterfaceId} (${hostnameKind})`,
+          url: toHref(scheme, username, h.hostname.value, port, suffix),
+        })
+      }
+    }
+  })
+
+  return {
+    clearnet,
+    local,
+    tor,
+  }
+}
+
+function toHref(
+  scheme: string,
+  username: string,
+  hostname: string,
+  port: string,
+  suffix: string,
+): string {
+  return `${scheme}${username}${hostname}${port}${suffix}`
+}
diff --git a/web/projects/ui/src/app/apps/portal/components/interfaces/interfaces.component.ts b/web/projects/ui/src/app/apps/portal/components/interfaces/interfaces.component.ts
deleted file mode 100644
index 635f62486..000000000
--- a/web/projects/ui/src/app/apps/portal/components/interfaces/interfaces.component.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { CommonModule } from '@angular/common'
-import {
-  ChangeDetectionStrategy,
-  Component,
-  inject,
-  Input,
-} from '@angular/core'
-import { TuiCardModule, TuiSurfaceModule } from '@taiga-ui/experimental'
-import { PatchDB } from 'patch-db-client'
-import { InterfaceClearnetComponent } from 'src/app/apps/portal/components/interfaces/interface-clearnet.component'
-import { InterfaceLocalComponent } from 'src/app/apps/portal/components/interfaces/interface-local.component'
-import { InterfaceTorComponent } from 'src/app/apps/portal/components/interfaces/interface-tor.component'
-import { AddressInfo, DataModel } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  standalone: true,
-  selector: 'app-interfaces',
-  template: `
-    <h3 class="g-title">Clearnet</h3>
-    <app-interface-clearnet
-      *ngIf="network$ | async as network"
-      tuiCardLarge="compact"
-      tuiSurface="elevated"
-      [network]="network"
-    />
-
-    <h3 class="g-title">Tor</h3>
-    <app-interface-tor tuiCardLarge="compact" tuiSurface="elevated" />
-
-    <h3 class="g-title">Local</h3>
-    <app-interface-local tuiCardLarge="compact" tuiSurface="elevated" />
-  `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [
-    CommonModule,
-    InterfaceTorComponent,
-    InterfaceLocalComponent,
-    InterfaceClearnetComponent,
-    TuiCardModule,
-    TuiSurfaceModule,
-  ],
-})
-export class InterfacesComponent {
-  readonly network$ = inject(PatchDB<DataModel>).watch$(
-    'server-info',
-    'network',
-  )
-
-  @Input() packageContext?: {
-    packageId: string
-    interfaceId: string
-  }
-  @Input({ required: true }) addressInfo!: AddressInfo
-  @Input({ required: true }) isUi!: boolean
-}
diff --git a/web/projects/ui/src/app/apps/portal/components/logs/logs-fetch.directive.ts b/web/projects/ui/src/app/apps/portal/components/logs/logs-fetch.directive.ts
index 17128ff47..7a4e52a93 100644
--- a/web/projects/ui/src/app/apps/portal/components/logs/logs-fetch.directive.ts
+++ b/web/projects/ui/src/app/apps/portal/components/logs/logs-fetch.directive.ts
@@ -25,7 +25,7 @@ export class LogsFetchDirective {
         }),
       ),
     ),
-    tap(res => this.component.setCursor(res['start-cursor'])),
+    tap(res => this.component.setCursor(res.startCursor)),
     map(({ entries }) => convertAnsi(entries)),
     catchError(e => {
       this.errors.handleError(e)
diff --git a/web/projects/ui/src/app/apps/portal/components/logs/logs.pipe.ts b/web/projects/ui/src/app/apps/portal/components/logs/logs.pipe.ts
index 4c3df9c4c..2c4e28224 100644
--- a/web/projects/ui/src/app/apps/portal/components/logs/logs.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/components/logs/logs.pipe.ts
@@ -43,7 +43,7 @@ export class LogsPipe implements PipeTransform {
         map(() => getMessage(true)),
       ),
       defer(() => followLogs(this.options)).pipe(
-        tap(r => this.logs.setCursor(r['start-cursor'])),
+        tap(r => this.logs.setCursor(r.startCursor)),
         switchMap(r => this.api.openLogsWebsocket$(this.toConfig(r.guid))),
         bufferTime(1000),
         filter(logs => !!logs.length),
diff --git a/web/projects/ui/src/app/apps/portal/modals/config.component.ts b/web/projects/ui/src/app/apps/portal/modals/config.component.ts
index d56e0e6f8..b75d9d927 100644
--- a/web/projects/ui/src/app/apps/portal/modals/config.component.ts
+++ b/web/projects/ui/src/app/apps/portal/modals/config.component.ts
@@ -6,7 +6,7 @@ import {
   isEmptyObject,
   LoadingService,
 } from '@start9labs/shared'
-import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import {
   TuiDialogContext,
@@ -27,7 +27,11 @@ import {
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { getAllPackages, getPackage } from 'src/app/util/get-package-data'
+import {
+  getAllPackages,
+  getManifest,
+  getPackage,
+} from 'src/app/util/get-package-data'
 import { Breakages } from 'src/app/services/api/api.types'
 import { InvalidService } from 'src/app/common/form/invalid.service'
 import {
@@ -35,6 +39,7 @@ import {
   FormComponent,
 } from 'src/app/apps/portal/components/form.component'
 import { DependentInfo } from 'src/app/types/dependent-info'
+import { ToManifestPipe } from '../pipes/to-manifest'
 
 export interface PackageConfigData {
   readonly pkgId: string
@@ -52,23 +57,26 @@ export interface PackageConfigData {
       <div [innerHTML]="loadingError"></div>
     </tui-notification>
 
-    <ng-container *ngIf="!loadingText && !loadingError && pkg">
+    <ng-container
+      *ngIf="
+        !loadingText && !loadingError && pkg && (pkg | toManifest) as manifest
+      "
+    >
       <tui-notification *ngIf="success" status="success">
-        {{ pkg.manifest.title }} has been automatically configured with
-        recommended defaults. Make whatever changes you want, then click "Save".
+        {{ manifest.title }} has been automatically configured with recommended
+        defaults. Make whatever changes you want, then click "Save".
       </tui-notification>
 
       <config-dep
         *ngIf="dependentInfo && value && original"
-        [package]="pkg.manifest.title"
+        [package]="manifest.title"
         [dep]="dependentInfo.title"
         [original]="original"
         [value]="value"
       />
 
-      <tui-notification *ngIf="!pkg.installed?.['has-config']" status="warning">
-        No config options for {{ pkg.manifest.title }}
-        {{ pkg.manifest.version }}.
+      <tui-notification *ngIf="!manifest.hasConfig" status="warning">
+        No config options for {{ manifest.title }} {{ manifest.version }}.
       </tui-notification>
 
       <app-form
@@ -106,6 +114,7 @@ export interface PackageConfigData {
     TuiButtonModule,
     TuiModeModule,
     ConfigDepComponent,
+    ToManifestPipe,
   ],
   providers: [InvalidService],
 })
@@ -149,7 +158,7 @@ export class ServiceConfigModal {
       !!this.form &&
       !this.form.form.dirty &&
       !this.original &&
-      !this.pkg?.installed?.status?.configured
+      !this.pkg?.status?.configured
     )
   }
 
@@ -165,12 +174,12 @@ export class ServiceConfigModal {
 
       if (this.dependentInfo) {
         const depConfig = await this.embassyApi.dryConfigureDependency({
-          'dependency-id': this.pkgId,
-          'dependent-id': this.dependentInfo.id,
+          dependencyId: this.pkgId,
+          dependentId: this.dependentInfo.id,
         })
 
-        this.original = depConfig['old-config']
-        this.value = depConfig['new-config'] || this.original
+        this.original = depConfig.oldConfig
+        this.value = depConfig.newConfig || this.original
         this.spec = depConfig.spec
         this.patch = compare(this.original, this.value)
       } else {
@@ -195,7 +204,7 @@ export class ServiceConfigModal {
     try {
       await this.uploadFiles(config, loader)
 
-      if (hasCurrentDeps(this.pkg!)) {
+      if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patchDb))) {
         await this.configureDeps(config, loader)
       } else {
         await this.configure(config, loader)
@@ -260,7 +269,7 @@ export class ServiceConfigModal {
     const message =
       'As a result of this change, the following services will no longer work properly and may crash:<ul>'
     const content = `${message}${Object.keys(breakages).map(
-      id => `<li><b>${packages[id].manifest.title}</b></li>`,
+      id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
     )}</ul>`
     const data: TuiPromptData = { content, yes: 'Continue', no: 'Cancel' }
 
diff --git a/web/projects/ui/src/app/apps/portal/pipes/to-badge.ts b/web/projects/ui/src/app/apps/portal/pipes/to-badge.ts
deleted file mode 100644
index 04aad4ec1..000000000
--- a/web/projects/ui/src/app/apps/portal/pipes/to-badge.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { inject, Pipe, PipeTransform } from '@angular/core'
-import { BadgeService } from '../services/badge.service'
-import { Observable } from 'rxjs'
-
-@Pipe({
-  name: 'toBadge',
-  standalone: true,
-})
-export class ToBadgePipe implements PipeTransform {
-  readonly badge = inject(BadgeService)
-
-  transform(id: string): Observable<number> {
-    return this.badge.getCount(id)
-  }
-}
diff --git a/web/projects/ui/src/app/apps/portal/pipes/to-manifest.ts b/web/projects/ui/src/app/apps/portal/pipes/to-manifest.ts
new file mode 100644
index 000000000..404c1bbd3
--- /dev/null
+++ b/web/projects/ui/src/app/apps/portal/pipes/to-manifest.ts
@@ -0,0 +1,14 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { Manifest } from '@start9labs/marketplace'
+import { getManifest } from 'src/app/util/get-package-data'
+
+@Pipe({
+  name: 'toManifest',
+  standalone: true,
+})
+export class ToManifestPipe implements PipeTransform {
+  transform(pkg: PackageDataEntry): Manifest {
+    return getManifest(pkg)
+  }
+}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/apps/portal/routes/dashboard/controls.component.ts b/web/projects/ui/src/app/apps/portal/routes/dashboard/controls.component.ts
index ed037df29..195924ec4 100644
--- a/web/projects/ui/src/app/apps/portal/routes/dashboard/controls.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/dashboard/controls.component.ts
@@ -10,24 +10,23 @@ import {
   TuiButtonModule,
   tuiButtonOptionsProvider,
 } from '@taiga-ui/experimental'
-import { map, of } from 'rxjs'
-import { UIComponent } from 'src/app/apps/portal/routes/dashboard/ui.component'
+import { map, Observable } from 'rxjs'
+import { UILaunchComponent } from 'src/app/apps/portal/routes/dashboard/ui.component'
 import { ActionsService } from 'src/app/apps/portal/services/actions.service'
 import { DepErrorService } from 'src/app/services/dep-error.service'
-import {
-  PackageDataEntry,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { getManifest } from 'src/app/util/get-package-data'
+import { Manifest } from '@start9labs/marketplace'
 
 @Component({
   standalone: true,
   selector: 'fieldset[appControls]',
   template: `
-    @if (isRunning) {
+    @if (pkg.status.main.status === 'running') {
       <button
         tuiIconButton
         iconLeft="tuiIconSquare"
-        (click)="actions.stop(appControls)"
+        (click)="actions.stop(manifest)"
       >
         Stop
       </button>
@@ -35,17 +34,17 @@ import {
       <button
         tuiIconButton
         iconLeft="tuiIconRotateCw"
-        (click)="actions.restart(appControls)"
+        (click)="actions.restart(manifest)"
       >
         Restart
       </button>
     } @else {
       <button
-        *tuiLet="hasUnmet(appControls) | async as hasUnmet"
+        *tuiLet="hasUnmet(pkg) | async as hasUnmet"
         tuiIconButton
         iconLeft="tuiIconPlay"
-        [disabled]="!isConfigured"
-        (click)="actions.start(appControls, !!hasUnmet)"
+        [disabled]="!this.pkg.status.configured"
+        (click)="actions.start(manifest, !!hasUnmet)"
       >
         Start
       </button>
@@ -53,48 +52,39 @@ import {
       <button
         tuiIconButton
         iconLeft="tuiIconTool"
-        (click)="actions.configure(appControls)"
+        (click)="actions.configure(manifest)"
       >
         Configure
       </button>
     }
 
-    <app-ui [pkg]="appControls" />
+    <app-ui-launch [pkg]="pkg" />
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [TuiButtonModule, UIComponent, TuiLetModule, AsyncPipe],
+  imports: [TuiButtonModule, UILaunchComponent, TuiLetModule, AsyncPipe],
   providers: [tuiButtonOptionsProvider({ size: 's', appearance: 'none' })],
 })
 export class ControlsComponent {
   private readonly errors = inject(DepErrorService)
 
   @Input()
-  appControls!: PackageDataEntry
+  pkg!: PackageDataEntry
+
+  get manifest(): Manifest {
+    return getManifest(this.pkg)
+  }
 
   readonly actions = inject(ActionsService)
 
-  get isRunning(): boolean {
-    return (
-      this.appControls.installed?.status.main.status ===
-      PackageMainStatus.Running
+  @tuiPure
+  hasUnmet(pkg: PackageDataEntry): Observable<boolean> {
+    const id = getManifest(pkg).id
+    return this.errors.getPkgDepErrors$(id).pipe(
+      map(errors =>
+        Object.keys(pkg.currentDependencies)
+          .map(id => !!(errors[id] as any)?.[id]) // @TODO fix
+          .some(Boolean),
+      ),
     )
   }
-
-  get isConfigured(): boolean {
-    return !!this.appControls.installed?.status.configured
-  }
-
-  @tuiPure
-  hasUnmet({ installed, manifest }: PackageDataEntry) {
-    return installed
-      ? this.errors.getPkgDepErrors$(manifest.id).pipe(
-          map(errors =>
-            Object.keys(installed['current-dependencies'])
-              .filter(id => !!manifest.dependencies[id])
-              .map(id => !!(errors[manifest.id] as any)?.[id]) // @TODO fix
-              .some(Boolean),
-          ),
-        )
-      : of(false)
-  }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/dashboard/service.component.ts b/web/projects/ui/src/app/apps/portal/routes/dashboard/service.component.ts
index 299578bc8..eb6c7f54b 100644
--- a/web/projects/ui/src/app/apps/portal/routes/dashboard/service.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/dashboard/service.component.ts
@@ -11,29 +11,26 @@ import { ControlsComponent } from 'src/app/apps/portal/routes/dashboard/controls
 import { StatusComponent } from 'src/app/apps/portal/routes/dashboard/status.component'
 import { ConnectionService } from 'src/app/services/connection.service'
 import { PkgDependencyErrors } from 'src/app/services/dep-error.service'
-import {
-  PackageDataEntry,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
-import { renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   standalone: true,
   selector: 'tr[appService]',
   template: `
-    <td><img alt="logo" [src]="appService.icon" /></td>
+    <td><img alt="logo" [src]="pkg.icon" /></td>
     <td>
-      <a [routerLink]="routerLink">{{ appService.manifest.title }}</a>
+      <a [routerLink]="routerLink">{{ manifest.title }}</a>
     </td>
-    <td>{{ appService.manifest.version }}</td>
-    <td
-      [appStatus]="appService"
-      [appStatusError]="hasError(appServiceError)"
-    ></td>
+    <td>{{ manifest.version }}</td>
+    <td appStatus [pkg]="pkg" [hasDepErrors]="hasError(depErrors)"></td>
     <td [style.text-align]="'center'">
       <fieldset
-        [disabled]="!installed || !(connected$ | async)"
-        [appControls]="appService"
+        appControls
+        [disabled]="
+          this.pkg.stateInfo.state !== 'installed' || !(connected$ | async)
+        "
+        [pkg]="pkg"
       ></fieldset>
     </td>
   `,
@@ -57,19 +54,19 @@ import { renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
 })
 export class ServiceComponent {
   @Input()
-  appService!: PackageDataEntry
+  pkg!: PackageDataEntry
 
   @Input()
-  appServiceError?: PkgDependencyErrors
+  depErrors?: PkgDependencyErrors
 
   readonly connected$ = inject(ConnectionService).connected$
 
-  get routerLink() {
-    return `/portal/service/${this.appService.manifest.id}`
+  get manifest() {
+    return getManifest(this.pkg)
   }
 
-  get installed(): boolean {
-    return this.appService.state === PackageState.Installed
+  get routerLink() {
+    return `/portal/service/${this.manifest.id}`
   }
 
   @tuiPure
diff --git a/web/projects/ui/src/app/apps/portal/routes/dashboard/services.component.ts b/web/projects/ui/src/app/apps/portal/routes/dashboard/services.component.ts
index 8769ae101..c40212420 100644
--- a/web/projects/ui/src/app/apps/portal/routes/dashboard/services.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/dashboard/services.component.ts
@@ -3,6 +3,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { ServiceComponent } from 'src/app/apps/portal/routes/dashboard/service.component'
 import { ServicesService } from 'src/app/apps/portal/services/services.service'
 import { DepErrorService } from 'src/app/services/dep-error.service'
+import { ToManifestPipe } from '../../pipes/to-manifest'
 
 @Component({
   standalone: true,
@@ -21,10 +22,11 @@ import { DepErrorService } from 'src/app/services/dep-error.service'
       </thead>
       <tbody>
         @if (errors$ | async; as errors) {
-          @for (service of services$ | async; track $index) {
+          @for (pkg of services$ | async; track $index) {
             <tr
-              [appService]="service"
-              [appServiceError]="errors[service.manifest.id]"
+              appService
+              [pkg]="pkg"
+              [depErrors]="errors[(pkg | toManifest).id]"
             ></tr>
           } @empty {
             <tr>
@@ -78,7 +80,7 @@ import { DepErrorService } from 'src/app/services/dep-error.service'
     }
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [ServiceComponent, AsyncPipe],
+  imports: [ServiceComponent, AsyncPipe, ToManifestPipe],
 })
 export class ServicesComponent {
   readonly services$ = inject(ServicesService)
diff --git a/web/projects/ui/src/app/apps/portal/routes/dashboard/status.component.ts b/web/projects/ui/src/app/apps/portal/routes/dashboard/status.component.ts
index d398385e9..96f6be5c4 100644
--- a/web/projects/ui/src/app/apps/portal/routes/dashboard/status.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/dashboard/status.component.ts
@@ -2,16 +2,13 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { tuiPure } from '@taiga-ui/cdk'
 import { TuiLoaderModule } from '@taiga-ui/core'
 import { TuiIconModule } from '@taiga-ui/experimental'
-import {
-  PackageDataEntry,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import {
   HealthStatus,
   PrimaryStatus,
   renderPkgStatus,
 } from 'src/app/services/pkg-status-rendering.service'
-import { packageLoadingProgress } from 'src/app/util/package-loading-progress'
+import { InstallingProgressDisplayPipe } from '../service/pipes/install-progress.pipe'
 
 @Component({
   standalone: true,
@@ -41,27 +38,23 @@ import { packageLoadingProgress } from 'src/app/util/package-loading-progress'
 })
 export class StatusComponent {
   @Input()
-  appStatus!: PackageDataEntry
+  pkg!: PackageDataEntry
 
   @Input()
-  appStatusError = false
+  hasDepErrors = false
 
   get healthy(): boolean {
-    const status = this.getStatus(this.appStatus)
+    const status = this.getStatus(this.pkg)
 
     return (
-      !this.appStatusError && // no deps error
-      !!this.appStatus.installed?.status.configured && // no config needed
-      status.primary !== PackageState.NeedsUpdate && // no update needed
+      !this.hasDepErrors && // no deps error
+      !!this.pkg.status.configured && // no config needed
       status.health !== HealthStatus.Failure // no health issues
     )
   }
 
   get loading(): boolean {
-    return (
-      !!this.appStatus['install-progress'] ||
-      this.color === 'var(--tui-info-fill)'
-    )
+    return !!this.pkg.stateInfo || this.color === 'var(--tui-info-fill)'
   }
 
   @tuiPure
@@ -70,17 +63,15 @@ export class StatusComponent {
   }
 
   get status(): string {
-    if (this.appStatus['install-progress']) {
-      return `Installing... ${packageLoadingProgress(this.appStatus['install-progress'])?.totalProgress || 0}%`
+    if (this.pkg.stateInfo.installingInfo) {
+      return `Installing...${new InstallingProgressDisplayPipe().transform(this.pkg.stateInfo.installingInfo.progress.overall)}`
     }
 
-    switch (this.getStatus(this.appStatus).primary) {
+    switch (this.getStatus(this.pkg).primary) {
       case PrimaryStatus.Running:
         return 'Running'
       case PrimaryStatus.Stopped:
         return 'Stopped'
-      case PackageState.NeedsUpdate:
-        return 'Needs Update'
       case PrimaryStatus.NeedsConfig:
         return 'Needs Config'
       case PrimaryStatus.Updating:
@@ -103,14 +94,13 @@ export class StatusComponent {
   }
 
   get color(): string {
-    if (this.appStatus['install-progress']) {
+    if (this.pkg.stateInfo.installingInfo) {
       return 'var(--tui-info-fill)'
     }
 
-    switch (this.getStatus(this.appStatus).primary) {
+    switch (this.getStatus(this.pkg).primary) {
       case PrimaryStatus.Running:
         return 'var(--tui-success-fill)'
-      case PackageState.NeedsUpdate:
       case PrimaryStatus.NeedsConfig:
         return 'var(--tui-warning-fill)'
       case PrimaryStatus.Updating:
diff --git a/web/projects/ui/src/app/apps/portal/routes/dashboard/ui.component.ts b/web/projects/ui/src/app/apps/portal/routes/dashboard/ui.component.ts
index 265f799bf..5d917b949 100644
--- a/web/projects/ui/src/app/apps/portal/routes/dashboard/ui.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/dashboard/ui.component.ts
@@ -4,20 +4,19 @@ import {
   inject,
   Input,
 } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
 import { tuiPure } from '@taiga-ui/cdk'
 import { TuiDataListModule, TuiHostedDropdownModule } from '@taiga-ui/core'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import { ConfigService } from 'src/app/services/config.service'
 import {
-  InstalledPackageInfo,
-  InterfaceInfo,
   PackageDataEntry,
   PackageMainStatus,
 } from 'src/app/services/patch-db/data-model'
 
 @Component({
   standalone: true,
-  selector: 'app-ui',
+  selector: 'app-ui-launch',
   template: `
     @if (interfaces.length > 1) {
       <tui-hosted-dropdown [content]="content">
@@ -26,7 +25,7 @@ import {
           iconLeft="tuiIconExternalLink"
           [disabled]="!isRunning"
         >
-          Interfaces
+          Launch UI
         </button>
         <ng-template #content>
           <tui-data-list>
@@ -44,42 +43,44 @@ import {
         </ng-template>
       </tui-hosted-dropdown>
     } @else {
-      <a
-        tuiIconButton
-        iconLeft="tuiIconExternalLink"
-        target="_blank"
-        rel="noreferrer"
-        [attr.href]="getHref(interfaces[0])"
-      >
-        {{ interfaces[0]?.name }}
-      </a>
+      @if (interfaces[0]; as info) {
+        <a
+          tuiIconButton
+          iconLeft="tuiIconExternalLink"
+          target="_blank"
+          rel="noreferrer"
+          [attr.href]="getHref(info)"
+        >
+          {{ info.name }}
+        </a>
+      }
     }
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [TuiButtonModule, TuiHostedDropdownModule, TuiDataListModule],
 })
-export class UIComponent {
+export class UILaunchComponent {
   private readonly config = inject(ConfigService)
 
   @Input()
   pkg!: PackageDataEntry
 
-  get interfaces(): readonly InterfaceInfo[] {
-    return this.getInterfaces(this.pkg.installed)
+  get interfaces(): readonly T.ServiceInterfaceWithHostInfo[] {
+    return this.getInterfaces(this.pkg)
   }
 
   get isRunning(): boolean {
-    return this.pkg.installed?.status.main.status === PackageMainStatus.Running
+    return this.pkg.status.main.status === PackageMainStatus.Running
   }
 
   @tuiPure
-  getInterfaces(info?: InstalledPackageInfo): InterfaceInfo[] {
-    return info
-      ? Object.values(info.interfaceInfo).filter(({ type }) => type === 'ui')
+  getInterfaces(pkg?: PackageDataEntry): T.ServiceInterfaceWithHostInfo[] {
+    return pkg
+      ? Object.values(pkg.serviceInterfaces).filter(({ type }) => type === 'ui')
       : []
   }
 
-  getHref(info?: InterfaceInfo): string | null {
+  getHref(info?: T.ServiceInterfaceWithHostInfo): string | null {
     return info && this.isRunning ? this.config.launchableAddress(info) : null
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/actions.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/actions.component.ts
index f385cd0b3..be3f11dcf 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/actions.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/actions.component.ts
@@ -8,20 +8,19 @@ import { tuiPure } from '@taiga-ui/cdk'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import { DependencyInfo } from 'src/app/apps/portal/routes/service/types/dependency-info'
 import { ActionsService } from 'src/app/apps/portal/services/actions.service'
-import {
-  PackageDataEntry,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { Manifest } from '@start9labs/marketplace'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'service-actions',
   template: `
-    @if (isRunning) {
+    @if (pkg.status.main.status === 'running') {
       <button
         tuiButton
         appearance="secondary-destructive"
         iconLeft="tuiIconSquare"
-        (click)="actions.stop(service)"
+        (click)="actions.stop(manifest)"
       >
         Stop
       </button>
@@ -30,17 +29,17 @@ import {
         tuiButton
         appearance="secondary"
         iconLeft="tuiIconRotateCw"
-        (click)="actions.restart(service)"
+        (click)="actions.restart(manifest)"
       >
         Restart
       </button>
     }
 
-    @if (isStopped && isConfigured) {
+    @if (pkg.status.main.status === 'stopped' && isConfigured) {
       <button
         tuiButton
         iconLeft="tuiIconPlay"
-        (click)="actions.start(service, hasUnmet(dependencies))"
+        (click)="actions.start(manifest, hasUnmet(dependencies))"
       >
         Start
       </button>
@@ -51,7 +50,7 @@ import {
         tuiButton
         appearance="secondary-warning"
         iconLeft="tuiIconTool"
-        (click)="actions.configure(service)"
+        (click)="actions.configure(manifest)"
       >
         Configure
       </button>
@@ -64,7 +63,7 @@ import {
 })
 export class ServiceActionsComponent {
   @Input({ required: true })
-  service!: PackageDataEntry
+  pkg!: PackageDataEntry
 
   @Input({ required: true })
   dependencies: readonly DependencyInfo[] = []
@@ -72,19 +71,11 @@ export class ServiceActionsComponent {
   readonly actions = inject(ActionsService)
 
   get isConfigured(): boolean {
-    return this.service.installed!.status.configured
+    return this.pkg.status.configured
   }
 
-  get isRunning(): boolean {
-    return (
-      this.service.installed?.status.main.status === PackageMainStatus.Running
-    )
-  }
-
-  get isStopped(): boolean {
-    return (
-      this.service.installed?.status.main.status === PackageMainStatus.Stopped
-    )
+  get manifest(): Manifest {
+    return getManifest(this.pkg)
   }
 
   @tuiPure
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/additional.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/additional.component.ts
index db233569d..8678b9cc0 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/additional.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/additional.component.ts
@@ -8,7 +8,7 @@ import { ServiceAdditionalItemComponent } from './additional-item.component'
   selector: 'service-additional',
   template: `
     <h3 class="g-title">Additional Info</h3>
-    <ng-container *ngFor="let additional of service | toAdditional">
+    <ng-container *ngFor="let additional of pkg | toAdditional">
       <a
         *ngIf="additional.description.startsWith('http'); else button"
         class="g-action"
@@ -30,5 +30,5 @@ import { ServiceAdditionalItemComponent } from './additional-item.component'
 })
 export class ServiceAdditionalComponent {
   @Input({ required: true })
-  service!: PackageDataEntry
+  pkg!: PackageDataEntry
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/health-check.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/health-check.component.ts
index 68848965b..d56389354 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/health-check.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/health-check.component.ts
@@ -91,23 +91,16 @@ export class ServiceHealthCheckComponent {
       return 'Awaiting result...'
     }
 
-    const prefix =
-      this.check.result !== HealthResult.Failure &&
-      this.check.result !== HealthResult.Loading
-        ? this.check.result
-        : ''
-
     switch (this.check.result) {
-      case HealthResult.Failure:
-        return prefix + this.check.error
       case HealthResult.Starting:
-        return `${prefix}...`
+        return 'Starting...'
       case HealthResult.Success:
-        return `${prefix}: ${this.check.message}`
+        return `Success: ${this.check.message}`
       case HealthResult.Loading:
-        return prefix + this.check.message
+      case HealthResult.Failure:
+        return this.check.message
       default:
-        return prefix
+        return this.check.result
     }
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/interface.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/interface-list-item.component.ts
similarity index 89%
rename from web/projects/ui/src/app/apps/portal/routes/service/components/interface.component.ts
rename to web/projects/ui/src/app/apps/portal/routes/service/components/interface-list-item.component.ts
index 81da0b63f..230e213bb 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/interface.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/interface-list-item.component.ts
@@ -11,7 +11,7 @@ import { ConfigService } from 'src/app/services/config.service'
 import { ExtendedInterfaceInfo } from '../pipes/interface-info.pipe'
 
 @Component({
-  selector: 'a[serviceInterface]',
+  selector: 'a[serviceInterfaceListItem]',
   template: `
     <tui-svg [src]="info.icon" [style.color]="info.color"></tui-svg>
     <div [style.flex]="1">
@@ -35,10 +35,10 @@ import { ExtendedInterfaceInfo } from '../pipes/interface-info.pipe'
   standalone: true,
   imports: [TuiButtonModule, CommonModule, TuiSvgModule],
 })
-export class ServiceInterfaceComponent {
+export class ServiceInterfaceListItemComponent {
   private readonly config = inject(ConfigService)
 
-  @Input({ required: true, alias: 'serviceInterface' })
+  @Input({ required: true, alias: 'serviceInterfaceListItem' })
   info!: ExtendedInterfaceInfo
 
   @Input()
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/interface-list.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/interface-list.component.ts
new file mode 100644
index 000000000..c83258c0b
--- /dev/null
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/interface-list.component.ts
@@ -0,0 +1,36 @@
+import { NgForOf } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { PackageStatus } from 'src/app/services/pkg-status-rendering.service'
+import { InterfaceInfoPipe } from '../pipes/interface-info.pipe'
+import { ServiceInterfaceListItemComponent } from './interface-list-item.component'
+import { RouterLink } from '@angular/router'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+
+@Component({
+  selector: 'service-interface-list',
+  template: `
+    <h3 class="g-title">Service Interfaces</h3>
+    <a
+      *ngFor="let info of pkg | interfaceInfo"
+      class="g-action"
+      [serviceInterfaceListItem]="info"
+      [disabled]="status.primary !== 'running'"
+      [routerLink]="info.routerLink"
+    ></a>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    NgForOf,
+    RouterLink,
+    InterfaceInfoPipe,
+    ServiceInterfaceListItemComponent,
+  ],
+})
+export class ServiceInterfaceListComponent {
+  @Input({ required: true })
+  pkg!: PackageDataEntry
+
+  @Input({ required: true })
+  status!: PackageStatus
+}
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/interfaces.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/interfaces.component.ts
deleted file mode 100644
index 993a1f9a8..000000000
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/interfaces.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { NgForOf } from '@angular/common'
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { PackagePlus } from 'src/app/services/patch-db/data-model'
-import {
-  PackageStatus,
-  PrimaryStatus,
-} from 'src/app/services/pkg-status-rendering.service'
-import { InterfaceInfoPipe } from '../pipes/interface-info.pipe'
-import { ServiceInterfaceComponent } from './interface.component'
-import { RouterLink } from '@angular/router'
-
-@Component({
-  selector: 'service-interfaces',
-  template: `
-    <h3 class="g-title">Interfaces</h3>
-    <a
-      *ngFor="let info of service.pkg | interfaceInfo"
-      class="g-action"
-      [serviceInterface]="info"
-      [disabled]="!isRunning(service.status)"
-      [routerLink]="info.routerLink"
-    ></a>
-  `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  imports: [NgForOf, RouterLink, InterfaceInfoPipe, ServiceInterfaceComponent],
-})
-export class ServiceInterfacesComponent {
-  @Input({ required: true })
-  service!: PackagePlus
-
-  isRunning({ primary }: PackageStatus): boolean {
-    return primary === PrimaryStatus.Running
-  }
-}
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/menu.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/menu.component.ts
index da4d4c3ff..e1fa250ae 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/menu.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/menu.component.ts
@@ -8,7 +8,7 @@ import { RouterLink } from '@angular/router'
   selector: 'service-menu',
   template: `
     <h3 class="g-title">Menu</h3>
-    @for (menu of service | toMenu; track $index) {
+    @for (menu of pkg | toMenu; track $index) {
       @if (menu.routerLink) {
         <a
           class="g-action"
@@ -23,7 +23,7 @@ import { RouterLink } from '@angular/router'
           (click)="menu.action?.()"
         >
           @if (menu.name === 'Outbound Proxy') {
-            <div [style.color]="color">{{ proxy }}</div>
+            <div [style.color]="color">{{ pkg.outboundProxy || 'None' }}</div>
           }
         </button>
       }
@@ -35,22 +35,11 @@ import { RouterLink } from '@angular/router'
 })
 export class ServiceMenuComponent {
   @Input({ required: true })
-  service!: PackageDataEntry
+  pkg!: PackageDataEntry
 
   get color(): string {
-    return this.service.installed?.outboundProxy
+    return this.pkg.outboundProxy
       ? 'var(--tui-success-fill)'
       : 'var(--tui-warning-fill)'
   }
-
-  get proxy(): string {
-    switch (this.service.installed?.outboundProxy) {
-      case 'primary':
-        return 'System Primary'
-      case 'mirror':
-        return 'Mirror P2P'
-      default:
-        return this.service.installed?.outboundProxy?.proxyId || 'None'
-    }
-  }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/progress.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/progress.component.ts
index 9fda9bf54..2e15f4f02 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/progress.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/progress.component.ts
@@ -1,27 +1,30 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { TuiProgressModule } from '@taiga-ui/kit'
+import { Progress } from 'src/app/services/patch-db/data-model'
+import { InstallingProgressPipe } from '../pipes/install-progress.pipe'
 
 @Component({
   selector: '[progress]',
   template: `
     <ng-content></ng-content>
-    : {{ progress }}%
-    <progress
-      tuiProgressBar
-      new
-      size="xs"
-      [style.color]="
-        progress === 100 ? 'var(--tui-positive)' : 'var(--tui-link)'
-      "
-      [value]="progress / 100"
-    ></progress>
+    @if (progress | installingProgress; as decimal) {
+      : {{ decimal * 100 }}%
+      <progress
+        tuiProgressBar
+        new
+        size="xs"
+        [style.color]="
+          progress === true ? 'var(--tui-positive)' : 'var(--tui-link)'
+        "
+        [value]="decimal * 100"
+      ></progress>
+    }
   `,
   styles: [':host { line-height: 2rem }'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [TuiProgressModule],
+  imports: [TuiProgressModule, InstallingProgressPipe],
 })
 export class ServiceProgressComponent {
-  @Input({ required: true })
-  progress = 0
+  @Input({ required: true }) progress!: Progress
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/credential.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/property.component.ts
similarity index 94%
rename from web/projects/ui/src/app/apps/portal/routes/service/components/credential.component.ts
rename to web/projects/ui/src/app/apps/portal/routes/service/components/property.component.ts
index 30b8f1514..67cde13e2 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/credential.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/property.component.ts
@@ -10,7 +10,7 @@ import { TuiLabelModule } from '@taiga-ui/core'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 
 @Component({
-  selector: 'service-credential',
+  selector: 'service-property',
   template: `
     <label [style.flex]="1" [tuiLabel]="label">
       {{ masked ? mask : value }}
@@ -48,7 +48,7 @@ import { TuiButtonModule } from '@taiga-ui/experimental'
   standalone: true,
   imports: [TuiButtonModule, TuiLabelModule],
 })
-export class ServiceCredentialComponent {
+export class ServicePropertyComponent {
   @Input()
   label = ''
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/components/status.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/components/status.component.ts
index 2fce9e78e..c89d4a824 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/components/status.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/components/status.component.ts
@@ -5,22 +5,27 @@ import {
   HostBinding,
   Input,
 } from '@angular/core'
-import { InstallProgress } from 'src/app/services/patch-db/data-model'
 import { StatusRendering } from 'src/app/services/pkg-status-rendering.service'
-import { InstallProgressPipe } from '../pipes/install-progress.pipe'
+import { InstallingProgressDisplayPipe } from '../pipes/install-progress.pipe'
+import { InstallingInfo } from 'src/app/services/patch-db/data-model'
+import { UnitConversionPipesModule } from '@start9labs/shared'
 
 @Component({
   selector: 'service-status',
   template: `
-    @if (installProgress) {
+    @if (installingInfo) {
       <strong>
         Installing
         <span class="loading-dots"></span>
-        {{ installProgress | installProgress }}
+        {{ installingInfo.progress.overall | installingProgressString }}
       </strong>
     } @else {
       {{ connected ? rendering.display : 'Unknown' }}
-      <!-- @TODO should show 'this may take a while' if sigtermTimeout is > 30s -->
+
+      <span *ngIf="sigtermTimeout && (sigtermTimeout | durationToSeconds) > 30">
+        . This may take a while
+      </span>
+
       <span *ngIf="rendering.showDots" class="loading-dots"></span>
     }
   `,
@@ -35,18 +40,24 @@ import { InstallProgressPipe } from '../pipes/install-progress.pipe'
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, InstallProgressPipe],
+  imports: [
+    CommonModule,
+    InstallingProgressDisplayPipe,
+    UnitConversionPipesModule,
+  ],
 })
 export class ServiceStatusComponent {
   @Input({ required: true })
   rendering!: StatusRendering
 
   @Input()
-  installProgress?: InstallProgress
+  installingInfo?: InstallingInfo
 
   @Input()
   connected = false
 
+  @Input() sigtermTimeout?: string | null = null
+
   @HostBinding('style.color')
   get color(): string {
     if (!this.connected) return 'var(--tui-text-02)'
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/modals/credentials.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/modals/properties.component.ts
similarity index 72%
rename from web/projects/ui/src/app/apps/portal/routes/service/modals/credentials.component.ts
rename to web/projects/ui/src/app/apps/portal/routes/service/modals/properties.component.ts
index d155947ab..7c9b21717 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/modals/credentials.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/modals/properties.component.ts
@@ -6,17 +6,17 @@ import { TuiButtonModule } from '@taiga-ui/experimental'
 import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
 import { BehaviorSubject } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ServiceCredentialComponent } from '../components/credential.component'
+import { ServicePropertyComponent } from '../components/property.component'
 
 @Component({
   template: `
     @if (loading$ | async) {
       <tui-loader />
     } @else {
-      @for (cred of credentials | keyvalue: asIsOrder; track cred) {
-        <service-credential [label]="cred.key" [value]="cred.value" />
+      @for (prop of properties | keyvalue: asIsOrder; track prop) {
+        <service-property [label]="prop.key" [value]="prop.value" />
       } @empty {
-        No credentials
+        No properties
       }
     }
     <button tuiButton iconLeft="tuiIconRefreshCwLarge" (click)="refresh()">
@@ -36,32 +36,32 @@ import { ServiceCredentialComponent } from '../components/credential.component'
   imports: [
     CommonModule,
     TuiButtonModule,
-    ServiceCredentialComponent,
+    ServicePropertyComponent,
     TuiLoaderModule,
   ],
 })
-export class ServiceCredentialsModal {
+export class ServicePropertiesModal {
   private readonly api = inject(ApiService)
   private readonly errorService = inject(ErrorService)
 
   readonly id = inject<{ data: string }>(POLYMORPHEUS_CONTEXT).data
   readonly loading$ = new BehaviorSubject(true)
 
-  credentials: Record<string, string> = {}
+  properties: Record<string, string> = {}
 
   async ngOnInit() {
-    await this.getCredentials()
+    await this.getProperties()
   }
 
   async refresh() {
-    await this.getCredentials()
+    await this.getProperties()
   }
 
-  private async getCredentials(): Promise<void> {
+  private async getProperties(): Promise<void> {
     this.loading$.next(true)
 
     try {
-      this.credentials = await this.api.getPackageCredentials({ id: this.id })
+      this.properties = await this.api.getPackageProperties({ id: this.id })
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/pipes/group-actions.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/service/pipes/group-actions.pipe.ts
index 5aad8c68f..f7f82cce0 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/pipes/group-actions.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/pipes/group-actions.pipe.ts
@@ -1,6 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import { WithId } from '@start9labs/shared'
-import { Action, PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 
 @Pipe({
   name: 'groupActions',
@@ -9,12 +10,12 @@ import { Action, PackageDataEntry } from 'src/app/services/patch-db/data-model'
 export class GroupActionsPipe implements PipeTransform {
   transform(
     actions: PackageDataEntry['actions'],
-  ): Array<Array<WithId<Action>>> | null {
+  ): Array<Array<WithId<ActionMetadata>>> | null {
     if (!actions) return null
 
     const noGroup = 'noGroup'
     const grouped = Object.entries(actions).reduce<
-      Record<string, WithId<Action>[]>
+      Record<string, WithId<ActionMetadata>[]>
     >((groups, [id, action]) => {
       const actionWithId = { id, ...action }
       const groupKey = action.group || noGroup
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/pipes/install-progress.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/service/pipes/install-progress.pipe.ts
index a369ba2b2..bcb20cfdd 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/pipes/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/pipes/install-progress.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Progress } from 'src/app/services/patch-db/data-model'
+import { Progress } from '../../../../../services/patch-db/data-model'
 
 @Pipe({
   standalone: true,
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/pipes/interface-info.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/service/pipes/interface-info.pipe.ts
index cc1d793dc..365e737ba 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/pipes/interface-info.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/pipes/interface-info.pipe.ts
@@ -1,10 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import {
-  InterfaceInfo,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
+import { ServiceInterfaceWithHostInfo } from '@start9labs/start-sdk/cjs/sdk/lib/types'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 
-export interface ExtendedInterfaceInfo extends InterfaceInfo {
+export interface ExtendedInterfaceInfo extends ServiceInterfaceWithHostInfo {
   id: string
   icon: string
   color: string
@@ -17,8 +15,8 @@ export interface ExtendedInterfaceInfo extends InterfaceInfo {
   standalone: true,
 })
 export class InterfaceInfoPipe implements PipeTransform {
-  transform({ installed }: PackageDataEntry): ExtendedInterfaceInfo[] {
-    return Object.entries(installed!.interfaceInfo).map(([id, val]) => {
+  transform(pkg: PackageDataEntry): ExtendedInterfaceInfo[] {
+    return Object.entries(pkg.serviceInterfaces).map(([id, val]) => {
       let color: string
       let icon: string
       let typeDetail: string
@@ -39,11 +37,6 @@ export class InterfaceInfoPipe implements PipeTransform {
           icon = 'tuiIconTerminalLarge'
           typeDetail = 'Application Program Interface (API)'
           break
-        case 'other':
-          color = 'var(--tui-text-02)'
-          icon = 'tuiIconBoxLarge'
-          typeDetail = 'Unknown Interface Type'
-          break
       }
 
       return {
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-additional.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-additional.pipe.ts
index fcf07bbe1..b7bae96b7 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-additional.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-additional.pipe.ts
@@ -6,6 +6,7 @@ import { CopyService, MarkdownComponent } from '@start9labs/shared'
 import { from } from 'rxjs'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { getManifest } from 'src/app/util/get-package-data'
 
 export const FALLBACK_URL = 'Not provided'
 
@@ -25,21 +26,22 @@ export class ToAdditionalPipe implements PipeTransform {
   private readonly copyService = inject(CopyService)
   private readonly dialogs = inject(TuiDialogService)
 
-  transform({ manifest, installed }: PackageDataEntry): AdditionalItem[] {
+  transform(pkg: PackageDataEntry): AdditionalItem[] {
+    const manifest = getManifest(pkg)
     return [
       {
         name: 'Installed',
         description: new Intl.DateTimeFormat('en-US', {
           dateStyle: 'medium',
           timeStyle: 'medium',
-        }).format(new Date(installed?.['installed-at'] || 0)),
+        }).format(new Date(pkg.installedAt || 0)),
       },
       {
         name: 'Git Hash',
-        description: manifest['git-hash'] || 'Unknown',
-        icon: manifest['git-hash'] ? 'tuiIconCopyLarge' : '',
+        description: manifest.gitHash || 'Unknown',
+        icon: manifest.gitHash ? 'tuiIconCopyLarge' : '',
         action: () =>
-          manifest['git-hash'] && this.copyService.copy(manifest['git-hash']),
+          manifest.gitHash && this.copyService.copy(manifest.gitHash),
       },
       {
         name: 'License',
@@ -49,19 +51,19 @@ export class ToAdditionalPipe implements PipeTransform {
       },
       {
         name: 'Website',
-        description: manifest['marketing-site'] || FALLBACK_URL,
+        description: manifest.marketingSite || FALLBACK_URL,
       },
       {
         name: 'Source Repository',
-        description: manifest['upstream-repo'],
+        description: manifest.upstreamRepo,
       },
       {
         name: 'Support Site',
-        description: manifest['support-site'] || FALLBACK_URL,
+        description: manifest.supportSite || FALLBACK_URL,
       },
       {
         name: 'Donation Link',
-        description: manifest['donation-url'] || FALLBACK_URL,
+        description: manifest.donationUrl || FALLBACK_URL,
       },
     ]
   }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-menu.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-menu.pipe.ts
index 33e5e06fd..9f1ccb4e7 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-menu.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/pipes/to-menu.pipe.ts
@@ -11,12 +11,10 @@ import {
 } from 'src/app/apps/portal/modals/config.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
-import {
-  InstalledPackageInfo,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ProxyService } from 'src/app/services/proxy.service'
-import { ServiceCredentialsModal } from '../modals/credentials.component'
+import { ServicePropertiesModal } from '../modals/properties.component'
+import { getManifest } from 'src/app/util/get-package-data'
 
 export interface ServiceMenu {
   icon: string
@@ -37,8 +35,8 @@ export class ToMenuPipe implements PipeTransform {
   private readonly formDialog = inject(FormDialogService)
   private readonly proxyService = inject(ProxyService)
 
-  transform({ manifest, installed }: PackageDataEntry): ServiceMenu[] {
-    const url = installed?.['marketplace-url']
+  transform(pkg: PackageDataEntry): ServiceMenu[] {
+    const manifest = getManifest(pkg)
 
     return [
       {
@@ -55,11 +53,11 @@ export class ToMenuPipe implements PipeTransform {
       },
       {
         icon: 'tuiIconKeyLarge',
-        name: 'Credentials',
-        description: `Password, keys, or other credentials of interest`,
+        name: 'Properties',
+        description: `Runtime information, credentials, and other values of interest`,
         action: () =>
           this.dialogs
-            .open(new PolymorpheusComponent(ServiceCredentialsModal), {
+            .open(new PolymorpheusComponent(ServicePropertiesModal), {
               label: `${manifest.title} credentials`,
               data: manifest.id,
             })
@@ -75,7 +73,11 @@ export class ToMenuPipe implements PipeTransform {
         icon: 'tuiIconShieldLarge',
         name: 'Outbound Proxy',
         description: `Proxy all outbound traffic from ${manifest.title}`,
-        action: () => this.setProxy(manifest, installed!),
+        action: () =>
+          this.proxyService.presentModalSetOutboundProxy(
+            pkg.outboundProxy,
+            manifest.id,
+          ),
       },
       {
         icon: 'tuiIconFileTextLarge',
@@ -83,13 +85,13 @@ export class ToMenuPipe implements PipeTransform {
         description: `Raw, unfiltered logs`,
         routerLink: 'logs',
       },
-      url
+      pkg.marketplaceUrl
         ? {
             icon: 'tuiIconShoppingBagLarge',
             name: 'Marketplace Listing',
             description: `View ${manifest.title} on the Marketplace`,
             routerLink: `/portal/system/marketplace`,
-            params: { url, id: manifest.id },
+            params: { url: pkg.marketplaceUrl, id: manifest.id },
           }
         : {
             icon: 'tuiIconShoppingBagLarge',
@@ -125,15 +127,4 @@ export class ToMenuPipe implements PipeTransform {
       data: { pkgId: id },
     })
   }
-
-  private setProxy(
-    { id }: Manifest,
-    { outboundProxy, interfaceInfo }: InstalledPackageInfo,
-  ) {
-    this.proxyService.presentModalSetOutboundProxy({
-      outboundProxy,
-      packageId: id,
-      hasP2P: Object.values(interfaceInfo).some(i => i.type === 'p2p'),
-    })
-  }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/routes/actions.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/routes/actions.component.ts
index 8d1e9beae..5358b9e37 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/routes/actions.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/routes/actions.component.ts
@@ -16,7 +16,6 @@ import { filter, switchMap, timer } from 'rxjs'
 import { FormComponent } from 'src/app/apps/portal/components/form.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import {
-  Action,
   DataModel,
   PackageDataEntry,
   PackageState,
@@ -26,10 +25,13 @@ import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { ServiceActionComponent } from '../components/action.component'
 import { ServiceActionSuccessComponent } from '../components/action-success.component'
 import { GroupActionsPipe } from '../pipes/group-actions.pipe'
+import { ToManifestPipe } from 'src/app/apps/portal/pipes/to-manifest'
+import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   template: `
-    <ng-container *ngIf="pkg$ | async as pkg">
+    @if (pkg$ | async; as pkg) {
       <section>
         <h3 class="g-title">Standard Actions</h3>
         <button
@@ -40,7 +42,7 @@ import { GroupActionsPipe } from '../pipes/group-actions.pipe'
       </section>
       <ng-container *ngIf="pkg.actions | groupActions as actionGroups">
         <h3 *ngIf="actionGroups.length" class="g-title">
-          Actions for {{ pkg.manifest.title }}
+          Actions for {{ (pkg | toManifest).title }}
         </h3>
         <div *ngFor="let group of actionGroups">
           <button
@@ -55,18 +57,18 @@ import { GroupActionsPipe } from '../pipes/group-actions.pipe'
           ></button>
         </div>
       </ng-container>
-    </ng-container>
+    }
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ServiceActionComponent, GroupActionsPipe],
+  imports: [CommonModule, ServiceActionComponent, GroupActionsPipe, ToManifestPipe],
 })
 export class ServiceActionsRoute {
   private readonly id = getPkgId(inject(ActivatedRoute))
 
   readonly pkg$ = this.patch
-    .watch$('package-data', this.id)
-    .pipe(filter(pkg => pkg.state === PackageState.Installed))
+    .watch$('packageData', this.id)
+    .pipe(filter(pkg => pkg.stateInfo.state === PackageState.Installed))
 
   readonly action = {
     icon: 'tuiIconTrash2Large',
@@ -85,7 +87,7 @@ export class ServiceActionsRoute {
     private readonly formDialog: FormDialogService,
   ) {}
 
-  async handleAction(action: WithId<Action>) {
+  async handleAction(action: WithId<ActionMetadata>) {
     if (action.disabled) {
       this.dialogs
         .open(action.disabled, {
@@ -94,11 +96,11 @@ export class ServiceActionsRoute {
         })
         .subscribe()
     } else {
-      if (action['input-spec'] && !isEmptyObject(action['input-spec'])) {
+      if (action.input && !isEmptyObject(action.input)) {
         this.formDialog.open(FormComponent, {
           label: action.name,
           data: {
-            spec: action['input-spec'],
+            spec: action.input,
             buttons: [
               {
                 text: 'Execute',
@@ -128,13 +130,13 @@ export class ServiceActionsRoute {
   }
 
   async tryUninstall(pkg: PackageDataEntry): Promise<void> {
-    const { title, alerts } = pkg.manifest
+    const { title, alerts, id } = getManifest(pkg)
 
     let content =
       alerts.uninstall ||
       `Uninstalling ${title} will permanently delete its data`
 
-    if (hasCurrentDeps(pkg)) {
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
       content = `${content}. Services that depend on ${title} will no longer work properly and may crash`
     }
 
@@ -177,7 +179,7 @@ export class ServiceActionsRoute {
     try {
       const data = await this.embassyApi.executePackageAction({
         id: this.id,
-        'action-id': actionId,
+        actionId,
         input,
       })
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/routes/interface.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/routes/interface.component.ts
index f63f07300..57b5228dc 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/routes/interface.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/routes/interface.component.ts
@@ -3,21 +3,22 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { getPkgId } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
-import { InterfacesComponent } from 'src/app/apps/portal/components/interfaces/interfaces.component'
+import { map } from 'rxjs'
+import { InterfaceComponent } from 'src/app/apps/portal/components/interfaces/interface.component'
 import { DataModel } from 'src/app/services/patch-db/data-model'
+import { getAddresses } from '../../../components/interfaces/interface.utils'
 
 @Component({
   template: `
-    <app-interfaces
+    <app-interface
       *ngIf="interfaceInfo$ | async as interfaceInfo"
       [packageContext]="context"
-      [addressInfo]="interfaceInfo.addressInfo"
-      [isUi]="interfaceInfo.type === 'ui'"
+      [serviceInterface]="interfaceInfo"
     />
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, InterfacesComponent],
+  imports: [CommonModule, InterfaceComponent],
 })
 export class ServiceInterfaceRoute {
   private readonly route = inject(ActivatedRoute)
@@ -27,11 +28,17 @@ export class ServiceInterfaceRoute {
     interfaceId: this.route.snapshot.paramMap.get('interfaceId') || '',
   }
 
-  readonly interfaceInfo$ = inject(PatchDB<DataModel>).watch$(
-    'package-data',
-    this.context.packageId,
-    'state-info',
-    'interfaceInfo',
-    this.context.interfaceId,
-  )
+  readonly interfaceInfo$ = inject(PatchDB<DataModel>)
+    .watch$(
+      'packageData',
+      this.context.packageId,
+      'serviceInterfaces',
+      this.context.interfaceId,
+    )
+    .pipe(
+      map(info => ({
+        ...info,
+        addresses: getAddresses(info),
+      })),
+    )
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/routes/outlet.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/routes/outlet.component.ts
index 733f796f2..66fdd7c08 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/routes/outlet.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/routes/outlet.component.ts
@@ -24,7 +24,7 @@ export class ServiceOutletComponent {
     map(() => this.route.firstChild?.snapshot.paramMap?.get('pkgId')),
     filter(Boolean),
     distinctUntilChanged(),
-    switchMap(id => this.patch.watch$('package-data', id)),
+    switchMap(id => this.patch.watch$('packageData', id)),
     tap(pkg => {
       // if package disappears, navigate to list page
       if (!pkg) {
diff --git a/web/projects/ui/src/app/apps/portal/routes/service/routes/service.component.ts b/web/projects/ui/src/app/apps/portal/routes/service/routes/service.component.ts
index 152767ede..f9dd999dd 100644
--- a/web/projects/ui/src/app/apps/portal/routes/service/routes/service.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/service/routes/service.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'
 import { Manifest } from '@start9labs/marketplace'
-import { getPkgId, isEmptyObject } from '@start9labs/shared'
+import { isEmptyObject } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { combineLatest, map, switchMap } from 'rxjs'
 import { ConnectionService } from 'src/app/services/connection.service'
@@ -15,15 +15,12 @@ import { FormDialogService } from 'src/app/services/form-dialog.service'
 import {
   DataModel,
   HealthCheckResult,
-  InstalledPackageInfo,
   MainStatus,
   PackageDataEntry,
-  PackageState,
 } from 'src/app/services/patch-db/data-model'
 import {
   PackageStatus,
   PrimaryRendering,
-  PrimaryStatus,
   renderPkgStatus,
   StatusRendering,
 } from 'src/app/services/pkg-status-rendering.service'
@@ -32,7 +29,7 @@ import { ServiceActionsComponent } from '../components/actions.component'
 import { ServiceAdditionalComponent } from '../components/additional.component'
 import { ServiceDependenciesComponent } from '../components/dependencies.component'
 import { ServiceHealthChecksComponent } from '../components/health-checks.component'
-import { ServiceInterfacesComponent } from '../components/interfaces.component'
+import { ServiceInterfaceListComponent } from '../components/interface-list.component'
 import { ServiceMenuComponent } from '../components/menu.component'
 import { ServiceProgressComponent } from '../components/progress.component'
 import { ServiceStatusComponent } from '../components/status.component'
@@ -40,43 +37,60 @@ import {
   PackageConfigData,
   ServiceConfigModal,
 } from 'src/app/apps/portal/modals/config.component'
-import { ProgressDataPipe } from '../pipes/progress-data.pipe'
 import { DependencyInfo } from '../types/dependency-info'
-
-const STATES = [
-  PackageState.Installing,
-  PackageState.Updating,
-  PackageState.Restoring,
-]
+import { getManifest } from 'src/app/util/get-package-data'
+import { InstallingProgressPipe } from 'src/app/apps/portal/routes/service/pipes/install-progress.pipe'
 
 @Component({
   template: `
     @if (service$ | async; as service) {
-      @if (showProgress(service.pkg)) {
-        @if (service.pkg | progressData; as progress) {
-          <p [progress]="progress.downloadProgress">Downloading</p>
-          <p [progress]="progress.validateProgress">Validating</p>
-          <p [progress]="progress.unpackProgress">Unpacking</p>
-        }
+      <h3 class="g-title">Status</h3>
+      <service-status
+        [connected]="!!(connected$ | async)"
+        [installingInfo]="service.pkg.stateInfo.installingInfo"
+        [rendering]="getRendering(service.status)"
+        [sigtermTimeout]="
+          service.pkg.status.main.status === 'stopping'
+            ? service.pkg.status.main.timeout
+            : null
+        "
+      />
+
+      @if (
+        service.pkg.stateInfo.state === 'installing' ||
+        service.pkg.stateInfo.state === 'updating' ||
+        service.pkg.stateInfo.state === 'restoring'
+      ) {
+        <p
+          *ngFor="
+            let phase of service.pkg.stateInfo.installingInfo.progress.phases
+          "
+          [progress]="phase.progress"
+        >
+          {{ phase.name }}
+        </p>
       } @else {
-        <h3 class="g-title">Status</h3>
-        <service-status
-          [connected]="!!(connected$ | async)"
-          [installProgress]="service.pkg['install-progress']"
-          [rendering]="$any(getRendering(service.status))"
-        />
+        @if (
+          service.pkg.stateInfo.state === 'installed' &&
+          service.status.primary !== 'backing-up'
+        ) {
+          @if (connected$ | async) {
+            <service-actions
+              [pkg]="service.pkg"
+              [dependencies]="service.dependencies"
+            />
+          }
 
-        @if (isInstalled(service.pkg) && (connected$ | async)) {
-          <service-actions
-            [service]="service.pkg"
-            [dependencies]="service.dependencies"
+          <service-interface-list
+            [pkg]="service.pkg"
+            [status]="service.status"
+            ]
           />
-        }
 
-        @if (isInstalled(service.pkg) && !isBackingUp(service.status)) {
-          <service-interfaces [service]="service" />
-
-          @if (isRunning(service.status) && (health$ | async); as checks) {
+          @if (
+            service.status.primary === 'running' && (health$ | async);
+            as checks
+          ) {
             <service-health-checks [checks]="checks" />
           }
 
@@ -84,8 +98,8 @@ const STATES = [
             <service-dependencies [dependencies]="service.dependencies" />
           }
 
-          <service-menu [service]="service.pkg" />
-          <service-additional [service]="service.pkg" />
+          <service-menu [pkg]="service.pkg" />
+          <service-additional [pkg]="service.pkg" />
         }
       }
     }
@@ -94,17 +108,15 @@ const STATES = [
   standalone: true,
   imports: [
     CommonModule,
-
     ServiceProgressComponent,
     ServiceStatusComponent,
     ServiceActionsComponent,
-    ServiceInterfacesComponent,
+    ServiceInterfaceListComponent,
     ServiceHealthChecksComponent,
     ServiceDependenciesComponent,
     ServiceMenuComponent,
     ServiceAdditionalComponent,
-
-    ProgressDataPipe,
+    InstallingProgressPipe,
   ],
 })
 export class ServiceRoute {
@@ -115,12 +127,12 @@ export class ServiceRoute {
   private readonly depErrorService = inject(DepErrorService)
   private readonly router = inject(Router)
   private readonly formDialog = inject(FormDialogService)
-
   readonly connected$ = inject(ConnectionService).connected$
+
   readonly service$ = this.pkgId$.pipe(
     switchMap(pkgId =>
       combineLatest([
-        this.patch.watch$('package-data', pkgId),
+        this.patch.watch$('packageData', pkgId),
         this.depErrorService.getPkgDepErrors$(pkgId),
       ]),
     ),
@@ -132,9 +144,10 @@ export class ServiceRoute {
       }
     }),
   )
+
   readonly health$ = this.pkgId$.pipe(
     switchMap(pkgId =>
-      this.patch.watch$('package-data', pkgId, 'installed', 'status', 'main'),
+      this.patch.watch$('packageData', pkgId, 'status', 'main'),
     ),
     map(toHealthCheck),
   )
@@ -143,53 +156,35 @@ export class ServiceRoute {
     return PrimaryRendering[primary]
   }
 
-  isInstalled({ state }: PackageDataEntry): boolean {
-    return state === PackageState.Installed
-  }
-
-  isRunning({ primary }: PackageStatus): boolean {
-    return primary === PrimaryStatus.Running
-  }
-
-  isBackingUp({ primary }: PackageStatus): boolean {
-    return primary === PrimaryStatus.BackingUp
-  }
-
-  showProgress({ state }: PackageDataEntry): boolean {
-    return STATES.includes(state)
-  }
-
   private getDepInfo(
-    { installed, manifest }: PackageDataEntry,
+    pkg: PackageDataEntry,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo[] {
-    return installed
-      ? Object.keys(installed['current-dependencies'])
-          .filter(depId => !!manifest.dependencies[depId])
-          .map(depId =>
-            this.getDepValues(installed, manifest, depId, depErrors),
-          )
-      : []
+    const manifest = getManifest(pkg)
+
+    return Object.keys(pkg.currentDependencies)
+      .filter(id => !!manifest.dependencies[id])
+      .map(id => this.getDepValues(pkg, manifest, id, depErrors))
   }
 
   private getDepValues(
-    pkgInstalled: InstalledPackageInfo,
+    pkg: PackageDataEntry,
     pkgManifest: Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo {
     const { errorText, fixText, fixAction } = this.getDepErrors(
-      pkgInstalled,
+      pkg,
       pkgManifest,
       depId,
       depErrors,
     )
 
-    const depInfo = pkgInstalled['dependency-info'][depId]
+    const depInfo = pkg.dependencyInfo[depId]
 
     return {
       id: depId,
-      version: pkgManifest.dependencies[depId].version, // do we want this version range?
+      version: pkg.currentDependencies[depId].versionRange,
       title: depInfo?.title || depId,
       icon: depInfo?.icon || '',
       errorText: errorText
@@ -205,12 +200,12 @@ export class ServiceRoute {
   }
 
   private getDepErrors(
-    pkgInstalled: InstalledPackageInfo,
+    pkg: PackageDataEntry,
     pkgManifest: Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ) {
-    const depError = (depErrors[pkgManifest.id] as any)?.[depId] // @TODO fix
+    const depError = depErrors[pkgManifest.id]
 
     let errorText: string | null = null
     let fixText: string | null = null
@@ -220,18 +215,15 @@ export class ServiceRoute {
       if (depError.type === DependencyErrorType.NotInstalled) {
         errorText = 'Not installed'
         fixText = 'Install'
-        fixAction = () =>
-          this.fixDep(pkgInstalled, pkgManifest, 'install', depId)
+        fixAction = () => this.fixDep(pkg, pkgManifest, 'install', depId)
       } else if (depError.type === DependencyErrorType.IncorrectVersion) {
         errorText = 'Incorrect version'
         fixText = 'Update'
-        fixAction = () =>
-          this.fixDep(pkgInstalled, pkgManifest, 'update', depId)
+        fixAction = () => this.fixDep(pkg, pkgManifest, 'update', depId)
       } else if (depError.type === DependencyErrorType.ConfigUnsatisfied) {
         errorText = 'Config not satisfied'
         fixText = 'Auto config'
-        fixAction = () =>
-          this.fixDep(pkgInstalled, pkgManifest, 'configure', depId)
+        fixAction = () => this.fixDep(pkg, pkgManifest, 'configure', depId)
       } else if (depError.type === DependencyErrorType.NotRunning) {
         errorText = 'Not running'
         fixText = 'Start'
@@ -250,7 +242,7 @@ export class ServiceRoute {
   }
 
   async fixDep(
-    pkgInstalled: InstalledPackageInfo,
+    pkg: PackageDataEntry,
     pkgManifest: Manifest,
     action: 'install' | 'update' | 'configure',
     depId: string,
@@ -258,10 +250,10 @@ export class ServiceRoute {
     switch (action) {
       case 'install':
       case 'update':
-        return this.installDep(pkgManifest, depId)
+        return this.installDep(pkg, pkgManifest, depId)
       case 'configure':
         return this.formDialog.open<PackageConfigData>(ServiceConfigModal, {
-          label: `${pkgInstalled!['dependency-info'][depId].title} config`,
+          label: `${pkg.dependencyInfo[depId].title} config`,
           data: {
             pkgId: depId,
             dependentInfo: pkgManifest,
@@ -270,13 +262,15 @@ export class ServiceRoute {
     }
   }
 
-  private async installDep(manifest: Manifest, depId: string): Promise<void> {
-    const version = manifest.dependencies[depId].version
-
+  private async installDep(
+    pkg: PackageDataEntry,
+    manifest: Manifest,
+    depId: string,
+  ): Promise<void> {
     const dependentInfo: DependentInfo = {
       id: manifest.id,
       title: manifest.title,
-      version,
+      version: pkg.currentDependencies[depId].versionRange,
     }
     const navigationExtras: NavigationExtras = {
       state: { dependentInfo },
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/components/status.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/components/status.component.ts
index a021438f3..d8c58b8aa 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/components/status.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/components/status.component.ts
@@ -62,8 +62,8 @@ export class BackupsStatusComponent {
 
   private get hasBackup(): boolean {
     return (
-      !!this.target['embassy-os'] &&
-      this.emver.compare(this.target['embassy-os'].version, '0.3.0') !== -1
+      !!this.target.startOs &&
+      this.emver.compare(this.target.startOs.version, '0.3.0') !== -1
     )
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/components/upcoming.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/components/upcoming.component.ts
index 855231d76..55d67b043 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/components/upcoming.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/components/upcoming.component.ts
@@ -30,7 +30,7 @@ import { GetBackupIconPipe } from '../pipes/get-backup-icon.pipe'
             Running
           </span>
           <ng-template #notRunning>
-            {{ job.next | date : 'MMM d, y, h:mm a' }}
+            {{ job.next | date: 'MMM d, y, h:mm a' }}
           </ng-template>
         </td>
         <td>{{ job.name }}</td>
@@ -38,7 +38,7 @@ import { GetBackupIconPipe } from '../pipes/get-backup-icon.pipe'
           <tui-svg [src]="job.target.type | getBackupIcon"></tui-svg>
           {{ job.target.name }}
         </td>
-        <td>Packages: {{ job['package-ids'].length }}</td>
+        <td>Packages: {{ job.packageIds.length }}</td>
       </tr>
       <ng-template #blank>
         <tr><td colspan="5">You have no active or upcoming backup jobs</td></tr>
@@ -56,7 +56,7 @@ import { GetBackupIconPipe } from '../pipes/get-backup-icon.pipe'
 })
 export class BackupsUpcomingComponent {
   readonly current$ = inject(PatchDB<DataModel>)
-    .watch$('server-info', 'status-info', 'current-backup', 'job')
+    .watch$('serverInfo', 'statusInfo', 'currentBackup', 'job')
     .pipe(map(job => job || {}))
 
   readonly upcoming$ = from(inject(ApiService).getBackupJobs({})).pipe(
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/backup.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/backup.component.ts
index a061f5c28..833fedf48 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/backup.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/backup.component.ts
@@ -17,6 +17,7 @@ import {
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom, map } from 'rxjs'
 import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
+import { getManifest } from 'src/app/util/get-package-data'
 
 interface Package {
   id: string
@@ -90,16 +91,19 @@ export class BackupsBackupModal {
 
   async ngOnInit() {
     this.pkgs = await firstValueFrom(
-      this.patch.watch$('package-data').pipe(
+      this.patch.watch$('packageData').pipe(
         map(pkgs =>
           Object.values(pkgs)
-            .map(({ manifest: { id, title }, icon, state }) => ({
-              id,
-              title,
-              icon,
-              disabled: state !== PackageState.Installed,
-              checked: false,
-            }))
+            .map(pkg => {
+              const { id, title } = getManifest(pkg)
+              return {
+                id,
+                title,
+                icon: pkg.icon,
+                disabled: pkg.stateInfo.state !== PackageState.Installed,
+                checked: false,
+              }
+            })
             .sort((a, b) =>
               b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
             ),
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/edit.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/edit.component.ts
index e6219b6b7..5bdd6c7b9 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/edit.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/edit.component.ts
@@ -53,10 +53,8 @@ import { ToHumanCronPipe } from '../pipes/to-human-cron.pipe'
         (click)="selectPackages()"
       >
         Packages
-        <tui-badge
-          [appearance]="job['package-ids'].length ? 'success' : 'warning'"
-        >
-          {{ job['package-ids'].length + ' selected' }}
+        <tui-badge [appearance]="job.packageIds.length ? 'success' : 'warning'">
+          {{ job.packageIds.length + ' selected' }}
         </tui-badge>
       </button>
       <tui-input name="cron" [(ngModel)]="job.cron">
@@ -145,7 +143,7 @@ export class BackupsEditModal {
 
   selectPackages() {
     this.dialogs.open<string[]>(BACKUP, BACKUP_OPTIONS).subscribe(id => {
-      this.job['package-ids'] = id
+      this.job.packageIds = id
     })
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/history.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/history.component.ts
index fd3a59d8d..2506249c1 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/history.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/history.component.ts
@@ -62,10 +62,8 @@ import { GetBackupIconPipe } from '../pipes/get-backup-icon.pipe'
             [style.background]="selected[index] ? 'var(--tui-clear)' : ''"
           >
             <td><tui-checkbox [(ngModel)]="selected[index]"></tui-checkbox></td>
-            <td>{{ run['started-at'] | date : 'medium' }}</td>
-            <td>
-              {{ run['started-at'] | duration : run['completed-at'] }} Minutes
-            </td>
+            <td>{{ run.startedAt | date: 'medium' }}</td>
+            <td>{{ run.startedAt | duration: run.completedAt }} Minutes</td>
             <td>
               <tui-svg
                 *ngIf="run.report | hasError; else noError"
@@ -178,7 +176,7 @@ export class BackupsHistoryModal {
         label: 'Backup Report',
         data: {
           report: run.report,
-          timestamp: run['completed-at'],
+          timestamp: run.completedAt,
         },
       })
       .subscribe()
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/jobs.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/jobs.component.ts
index ff7505adf..85b3d5a4c 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/jobs.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/jobs.component.ts
@@ -22,9 +22,9 @@ import { EDIT } from './edit.component'
 @Component({
   template: `
     <tui-notification>
-      Scheduling automatic backups is an excellent way to ensure your Embassy
-      data is safely backed up. Your Embassy will issue a notification whenever
-      one of your scheduled backups succeeds or fails.
+      Scheduling automatic backups is an excellent way to ensure your StartOS
+      data is safely backed up. StartOS will issue a notification whenever one
+      of your scheduled backups succeeds or fails.
       <a
         href="https://docs.start9.com/latest/user-manual/backups/backup-jobs"
         target="_blank"
@@ -57,7 +57,7 @@ import { EDIT } from './edit.component'
               <tui-svg [src]="job.target.type | getBackupIcon"></tui-svg>
               {{ job.target.name }}
             </td>
-            <td>Packages: {{ job['package-ids'].length }}</td>
+            <td>Packages: {{ job.packageIds.length }}</td>
             <td>{{ (job.cron | toHumanCron).message }}</td>
             <td>
               <button
@@ -143,7 +143,7 @@ export class BackupsJobsModal implements OnInit {
         data.name = job.name
         data.target = job.target
         data.cron = job.cron
-        data['package-ids'] = job['package-ids']
+        data.packageIds = job.packageIds
       })
   }
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/recover.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/recover.component.ts
index 4a72d8a4d..850c8ec5e 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/recover.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/recover.component.ts
@@ -21,19 +21,19 @@ import { TuiMapperPipeModule } from '@taiga-ui/cdk'
 
 @Component({
   template: `
-    <ng-container *ngIf="packageData$ | toOptions : backups | async as options">
+    <ng-container *ngIf="packageData$ | toOptions: backups | async as options">
       <div tuiGroup orientation="vertical" [style.width.%]="100">
         <tui-checkbox-block
           *ngFor="let option of options"
-          [disabled]="option.installed || option['newer-eos']"
+          [disabled]="option.installed || option.newerStartOs"
           [(ngModel)]="option.checked"
         >
           <div [style.margin]="'0.75rem 0'">
             <strong>{{ option.title }}</strong>
             <div>Version {{ option.version }}</div>
-            <div>Backup made: {{ option.timestamp | date : 'medium' }}</div>
+            <div>Backup made: {{ option.timestamp | date: 'medium' }}</div>
             <div
-              *ngIf="option | tuiMapper : toMessage as message"
+              *ngIf="option | tuiMapper: toMessage as message"
               [style.color]="message.color"
             >
               {{ message.text }}
@@ -73,11 +73,11 @@ export class BackupsRecoverModal {
     inject<TuiDialogContext<void, RecoverData>>(POLYMORPHEUS_CONTEXT)
 
   readonly packageData$ = inject(PatchDB<DataModel>)
-    .watch$('package-data')
+    .watch$('packageData')
     .pipe(take(1))
 
   readonly toMessage = (option: RecoverOption) => {
-    if (option['newer-eos']) {
+    if (option.newerStartOs) {
       return {
         text: `Unavailable. Backup was made on a newer version of StartOS.`,
         color: 'var(--tui-error-fill)',
@@ -98,7 +98,7 @@ export class BackupsRecoverModal {
   }
 
   get backups(): Record<string, PackageBackupInfo> {
-    return this.context.data.backupInfo['package-backups']
+    return this.context.data.backupInfo.packageBackups
   }
 
   isDisabled(options: RecoverOption[]): boolean {
@@ -109,11 +109,13 @@ export class BackupsRecoverModal {
     const ids = options.filter(({ checked }) => !!checked).map(({ id }) => id)
     const loader = this.loader.open('Initializing...').subscribe()
 
+    const { targetId, password } = this.context.data
+
     try {
       await this.api.restorePackages({
         ids,
-        'target-id': this.context.data.targetId,
-        password: this.context.data.password,
+        targetId,
+        password,
       })
 
       this.context.$implicit.complete()
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/target.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/target.component.ts
index fd3458023..8e476aec9 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/target.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/target.component.ts
@@ -102,7 +102,7 @@ export class BackupsTargetModal {
   isDisabled(target: BackupTarget): boolean {
     return (
       !target.mountable ||
-      (this.context.data.type === 'restore' && !target['embassy-os'])
+      (this.context.data.type === 'restore' && !target.startOs)
     )
   }
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/targets.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/targets.component.ts
index ce89c9566..9be5651a0 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/targets.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/modals/targets.component.ts
@@ -4,7 +4,7 @@ import { ErrorService, LoadingService } from '@start9labs/shared'
 import {
   unionSelectKey,
   unionValueKey,
-} from '@start9labs/start-sdk/lib/config/configTypes'
+} from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { TuiNotificationModule } from '@taiga-ui/core'
 import { TuiButtonModule, TuiFadeModule } from '@taiga-ui/experimental'
 import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
@@ -55,7 +55,7 @@ import { BackupsTargetsComponent } from '../components/targets.component'
     <div class="g-hidden-scrollbar" tuiFade>
       <table
         class="g-table"
-        [backupsPhysical]="targets?.['unknown-disks'] || null"
+        [backupsPhysical]="targets?.unknownDisks || null"
         (add)="addPhysical($event)"
       ></table>
     </div>
@@ -106,7 +106,7 @@ export class BackupsTargetsModal implements OnInit {
       this.targets = await this.api.getBackupTargets({})
     } catch (e: any) {
       this.errorService.handleError(e)
-      this.targets = { 'unknown-disks': [], saved: [] }
+      this.targets = { unknownDisks: [], saved: [] }
     } finally {
       this.loading$.next(false)
     }
@@ -162,7 +162,7 @@ export class BackupsTargetsModal implements OnInit {
               }).then(response => {
                 this.setTargets(
                   this.targets?.saved.concat(response),
-                  this.targets?.['unknown-disks'].filter(a => a !== disk),
+                  this.targets?.unknownDisks.filter(a => a !== disk),
                 )
                 return true
               }),
@@ -225,9 +225,9 @@ export class BackupsTargetsModal implements OnInit {
 
   private setTargets(
     saved: BackupTarget[] = this.targets?.saved || [],
-    unknown: UnknownDisk[] = this.targets?.['unknown-disks'] || [],
+    unknownDisks: UnknownDisk[] = this.targets?.unknownDisks || [],
   ) {
-    this.targets = { ['unknown-disks']: unknown, saved }
+    this.targets = { unknownDisks, saved }
   }
 
   private async getSpec(target: BackupTarget) {
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/pipes/to-options.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/pipes/to-options.pipe.ts
index 83d32f4e9..9fc9555e2 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/pipes/to-options.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/pipes/to-options.pipe.ts
@@ -26,7 +26,7 @@ export class ToOptionsPipe implements PipeTransform {
             id,
             installed: !!packageData[id],
             checked: false,
-            'newer-eos': this.compare(packageBackups[id].osVersion),
+            newerStartOs: this.compare(packageBackups[id].osVersion),
           }))
           .sort((a, b) =>
             b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/services/create.service.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/services/create.service.ts
index 5a0c86917..a17b64fd8 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/services/create.service.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/services/create.service.ts
@@ -35,7 +35,7 @@ export class BackupsCreateService {
     const loader = this.loader.open('Beginning backup...').subscribe()
 
     await this.api
-      .createBackup({ 'target-id': targetId, 'package-ids': pkgIds })
+      .createBackup({ targetId, packageIds: pkgIds })
       .finally(() => loader.unsubscribe())
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/services/restore.service.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/services/restore.service.ts
index 449558eaf..96f907199 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/services/restore.service.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/services/restore.service.ts
@@ -44,7 +44,7 @@ export class BackupsRestoreService {
               this.getRecoverData(
                 target.id,
                 password,
-                target['embassy-os']?.['password-hash'] || '',
+                target.startOs?.passwordHash || '',
               ),
             ),
             take(1),
@@ -73,7 +73,7 @@ export class BackupsRestoreService {
         const loader = this.loader.open('Decrypting drive...').subscribe()
 
         return this.api
-          .getBackupInfo({ 'target-id': targetId, password })
+          .getBackupInfo({ targetId, password })
           .finally(() => loader.unsubscribe())
       }),
       catchError(e => {
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/backup-config.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/backup-config.ts
index e6b485163..f1a7b821f 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/backup-config.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/backup-config.ts
@@ -1,7 +1,7 @@
 import {
   unionSelectKey,
   unionValueKey,
-} from '@start9labs/start-sdk/lib/config/configTypes'
+} from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { RR } from 'src/app/services/api/api.types'
 
 export type BackupConfig =
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/recover-option.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/recover-option.ts
index e73e9e4c9..85cbe5847 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/recover-option.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/recover-option.ts
@@ -4,5 +4,5 @@ export interface RecoverOption extends PackageBackupInfo {
   id: string
   checked: boolean
   installed: boolean
-  'newer-eos': boolean
+  newerStartOs: boolean
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/target.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/target.ts
index fa129fdef..b8250eb4b 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/types/target.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/types/target.ts
@@ -1,6 +1,6 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
-import { Variants } from '@start9labs/start-sdk/lib/config/builder/variants'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
+import { Variants } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/variants'
 
 export const dropboxSpec = Config.of({
   name: Value.text({
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/backups/utils/job-builder.ts b/web/projects/ui/src/app/apps/portal/routes/system/backups/utils/job-builder.ts
index b84e4d369..e589609aa 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/backups/utils/job-builder.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/backups/utils/job-builder.ts
@@ -4,7 +4,7 @@ export class BackupJobBuilder {
   name: string
   target: BackupTarget
   cron: string
-  'package-ids': string[]
+  packageIds: string[]
   now = false
 
   constructor(readonly job: Partial<BackupJob>) {
@@ -12,7 +12,7 @@ export class BackupJobBuilder {
     this.name = name || ''
     this.target = target || ({} as BackupTarget)
     this.cron = cron || '0 2 * * *'
-    this['package-ids'] = job['package-ids'] || []
+    this.packageIds = job.packageIds || []
   }
 
   buildCreate(): RR.CreateBackupJobReq {
@@ -20,9 +20,9 @@ export class BackupJobBuilder {
 
     return {
       name,
-      'target-id': target.id,
+      targetId: target.id,
       cron,
-      'package-ids': this['package-ids'],
+      packageIds: this.packageIds,
       now,
     }
   }
@@ -33,9 +33,9 @@ export class BackupJobBuilder {
     return {
       id,
       name,
-      'target-id': target.id,
+      targetId: target.id,
       cron,
-      'package-ids': this['package-ids'],
+      packageIds: this.packageIds,
     }
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts
index 552fe76a5..2fe65d0b6 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts
@@ -29,9 +29,10 @@ import {
 import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { getAllPackages } from 'src/app/util/get-package-data'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { dryUpdate } from 'src/app/util/dry-update'
 import { MarketplaceAlertsService } from '../services/alerts.service'
+import { ToManifestPipe } from 'src/app/apps/portal/pipes/to-manifest'
 
 @Component({
   selector: 'marketplace-controls',
@@ -45,8 +46,11 @@ import { MarketplaceAlertsService } from '../services/alerts.service'
       >
         View Installed
       </button>
-      @if (installed) {
-        @switch (localVersion | compareEmver: pkg.manifest.version) {
+      @if (
+        localPkg.stateInfo.state === 'installed' && (localPkg | toManifest);
+        as localManifest
+      ) {
+        @switch (localManifest.version | compareEmver: pkg.manifest.version) {
           @case (1) {
             <button
               tuiButton
@@ -94,7 +98,7 @@ import { MarketplaceAlertsService } from '../services/alerts.service'
   `,
   standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [CommonModule, EmverPipesModule, TuiButtonModule],
+  imports: [CommonModule, EmverPipesModule, TuiButtonModule, ToManifestPipe],
 })
 export class MarketplaceControlsComponent {
   private readonly alerts = inject(MarketplaceAlertsService)
@@ -118,18 +122,10 @@ export class MarketplaceControlsComponent {
 
   readonly showDevTools$ = inject(ClientStorageService).showDevTools$
 
-  get installed(): boolean {
-    return this.localPkg?.state === PackageState.Installed
-  }
-
-  get localVersion(): string {
-    return this.localPkg?.manifest.version || ''
-  }
-
   async tryInstall() {
     const current = await firstValueFrom(this.marketplace.getSelectedHost$())
     const url = this.url || current.url
-    const originalUrl = this.localPkg?.installed?.['marketplace-url'] || ''
+    const originalUrl = this.localPkg?.marketplaceUrl || ''
 
     if (!this.localPkg) {
       if (await this.alerts.alertInstall(this.pkg)) this.install(url)
@@ -144,9 +140,11 @@ export class MarketplaceControlsComponent {
       return
     }
 
+    const localManifest = getManifest(this.localPkg)
+
     if (
-      hasCurrentDeps(this.localPkg) &&
-      this.emver.compare(this.localVersion, this.pkg.manifest.version) !== 0
+      hasCurrentDeps(localManifest.id, await getAllPackages(this.patch)) &&
+      this.emver.compare(localManifest.version, this.pkg.manifest.version) !== 0
     ) {
       this.dryInstall(url)
     } else {
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/notification.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/notification.component.ts
index 463243086..64dfb7e8c 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/notification.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/notification.component.ts
@@ -1,5 +1,4 @@
 import { Component, inject, Input } from '@angular/core'
-import { NgIf } from '@angular/common'
 import { TuiNotificationModule } from '@taiga-ui/core'
 import { ConfigService } from 'src/app/services/config.service'
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
index d6c656507..b9cd79fcc 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
@@ -92,7 +92,7 @@ export class MarketplaceRegistryModal {
   private readonly hosts$ = inject(PatchDB<DataModel>).watch$(
     'ui',
     'marketplace',
-    'known-hosts',
+    'knownHosts',
   )
 
   readonly stores$ = combineLatest([
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/pipes/to-local.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/pipes/to-local.pipe.ts
index 00c081b09..336c5d43a 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/pipes/to-local.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/pipes/to-local.pipe.ts
@@ -12,6 +12,6 @@ export class ToLocalPipe implements PipeTransform {
   private readonly patch = inject(PatchDB<DataModel>)
 
   transform(id: string): Observable<PackageDataEntry> {
-    return this.patch.watch$('package-data', id).pipe(filter(Boolean))
+    return this.patch.watch$('packageData', id).pipe(filter(Boolean))
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/services/alerts.service.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/services/alerts.service.ts
index 00db9d9c9..d7203dea9 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/services/alerts.service.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/services/alerts.service.ts
@@ -18,8 +18,8 @@ export class MarketplaceAlertsService {
 
   async alertMarketplace(url: string, originalUrl: string): Promise<boolean> {
     const marketplaces = await firstValueFrom(this.marketplace$)
-    const name = marketplaces['known-hosts'][url]?.name || url
-    const source = marketplaces['known-hosts'][originalUrl]?.name || originalUrl
+    const name = marketplaces.knownHosts[url]?.name || url
+    const source = marketplaces.knownHosts[originalUrl]?.name || originalUrl
     const message = source ? `installed from ${source}` : 'side loaded'
 
     return new Promise(async resolve => {
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/utils/registry.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/utils/registry.ts
index ca8afcb0f..71637defa 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/utils/registry.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/utils/registry.ts
@@ -1,4 +1,4 @@
-import { ValueSpecObject } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecObject } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { TuiDialogOptions } from '@taiga-ui/core'
 import { TuiPromptData } from '@taiga-ui/kit'
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/notifications/item.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/notifications/item.component.ts
index 87c3d1442..cc902f4ea 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/notifications/item.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/notifications/item.component.ts
@@ -21,7 +21,7 @@ import { toRouterLink } from '../../../utils/to-router-link'
   selector: '[notificationItem]',
   template: `
     <td><ng-content /></td>
-    <td>{{ notificationItem['created-at'] | date : 'MMM d, y, h:mm a' }}</td>
+    <td>{{ notificationItem.createdAt | date: 'MMM d, y, h:mm a' }}</td>
     <td [style.color]="color">
       <tui-svg [style.color]="color" [src]="icon"></tui-svg>
       {{ notificationItem.title }}
@@ -70,8 +70,9 @@ export class NotificationItemComponent {
   get manifest$(): Observable<Manifest> {
     return this.patch
       .watch$(
-        'package-data',
-        this.notificationItem['package-id'] || '',
+        'packageData',
+        this.notificationItem.packageId || '',
+        'stateInfo',
         'manifest',
       )
       .pipe(first())
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/components/menu.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/components/menu.component.ts
index adc738603..832e72135 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/components/menu.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/components/menu.component.ts
@@ -14,12 +14,12 @@ import { SettingsUpdateComponent } from './update.component'
   selector: 'settings-menu',
   template: `
     <ng-container *ngIf="server$ | async as server; else loading">
-      <settings-sync *ngIf="!server['ntp-synced']" />
+      <settings-sync *ngIf="!server.ntpSynced" />
       <section *ngFor="let cat of service.settings | keyvalue: asIsOrder">
         <h3 class="g-title" (click)="addClick(cat.key)">{{ cat.key }}</h3>
         <settings-update
           *ngIf="cat.key === 'General'"
-          [updated]="server['status-info'].updated"
+          [updated]="server.statusInfo.updated"
         />
         <ng-container *ngFor="let btn of cat.value">
           <settings-button [button]="btn">
@@ -32,13 +32,7 @@ import { SettingsUpdateComponent } from './update.component'
                   : 'var(--tui-success-fill)'
               "
             >
-              {{
-                !server.network.outboundProxy
-                  ? 'None'
-                  : server.network.outboundProxy === 'primary'
-                    ? 'System Primary'
-                    : server.network.outboundProxy.proxyId
-              }}
+              {{ server.network.outboundProxy || 'None' }}
             </div>
           </settings-button>
         </ng-container>
@@ -76,7 +70,7 @@ export class SettingsMenuComponent {
   private readonly clientStorageService = inject(ClientStorageService)
   private readonly alerts = inject(TuiAlertService)
 
-  readonly server$ = inject(PatchDB<DataModel>).watch$('server-info')
+  readonly server$ = inject(PatchDB<DataModel>).watch$('serverInfo')
   readonly service = inject(SettingsService)
 
   manageClicks = 0
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/modals/update.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/modals/update.component.ts
index f300c5b6e..b0da46104 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/modals/update.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/modals/update.component.ts
@@ -48,7 +48,7 @@ import { EOSService } from 'src/app/services/eos.service'
   ],
 })
 export class SettingsUpdateModal {
-  readonly versions = Object.entries(this.eosService.eos?.['release-notes']!)
+  readonly versions = Object.entries(this.eosService.eos?.releaseNotes!)
     .sort(([a], [b]) => a.localeCompare(b))
     .reverse()
     .map(([version, notes]) => ({
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/constants.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/constants.ts
index 2d93ab758..d56278b1e 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/constants.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/constants.ts
@@ -1,6 +1,6 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
-import { Variants } from '@start9labs/start-sdk/lib/config/builder/variants'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
+import { Variants } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/variants'
 import { Proxy } from 'src/app/services/patch-db/data-model'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 
@@ -59,38 +59,18 @@ function getStrategyUnion(proxies: Proxy[]) {
       proxy: {
         name: 'Proxy',
         spec: Config.of({
-          proxyStrategy: Value.union(
-            {
-              name: 'Proxy Strategy',
-              required: { default: 'primary' },
-              description: `<h5>Primary</h5>Use the <i>Primary Inbound</i> proxy from your proxy settings. If you do not have any inbound proxies, no proxy will be used
-<h5>Other</h5>Use a specific proxy from your proxy settings
-`,
-            },
-            Variants.of({
-              primary: {
-                name: 'Primary',
-                spec: Config.of({}),
-              },
-              other: {
-                name: 'Specific',
-                spec: Config.of({
-                  proxyId: Value.select({
-                    name: 'Select Proxy',
-                    required: { default: null },
-                    values: inboundProxies,
-                  }),
-                }),
-              },
-            }),
-          ),
+          proxyId: Value.select({
+            name: 'Select Proxy',
+            required: { default: null },
+            values: inboundProxies,
+          }),
         }),
       },
     }),
   )
 }
 
-export async function getStart9ToSpec(proxies: Proxy[]) {
+export function getStart9ToSpec(proxies: Proxy[]) {
   return configBuilderToSpec(
     Config.of({
       strategy: getStrategyUnion(proxies),
@@ -98,7 +78,7 @@ export async function getStart9ToSpec(proxies: Proxy[]) {
   )
 }
 
-export async function getCustomSpec(proxies: Proxy[]) {
+export function getCustomSpec(proxies: Proxy[]) {
   return configBuilderToSpec(
     Config.of({
       hostname: Value.text({
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/domains.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/domains.component.ts
index 0ec33bbf9..7780babf7 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/domains.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/domains/domains.component.ts
@@ -69,7 +69,7 @@ export class SettingsDomainsComponent {
   private readonly api = inject(ApiService)
   private readonly dialogs = inject(TuiDialogService)
 
-  readonly domains$ = this.patch.watch$('server-info', 'network').pipe(
+  readonly domains$ = this.patch.watch$('serverInfo', 'network').pipe(
     map(network => {
       const start9ToSubdomain = network.start9ToSubdomain
       const start9To = !start9ToSubdomain
@@ -103,7 +103,7 @@ export class SettingsDomainsComponent {
 
   async add() {
     const proxies = await firstValueFrom(
-      this.patch.watch$('server-info', 'network', 'proxies'),
+      this.patch.watch$('serverInfo', 'network', 'proxies'),
     )
 
     const options: Partial<TuiDialogOptions<FormContext<any>>> = {
@@ -128,7 +128,7 @@ export class SettingsDomainsComponent {
 
   async claim() {
     const proxies = await firstValueFrom(
-      this.patch.watch$('server-info', 'network', 'proxies'),
+      this.patch.watch$('serverInfo', 'network', 'proxies'),
     )
 
     const options: Partial<TuiDialogOptions<FormContext<any>>> = {
@@ -150,13 +150,11 @@ export class SettingsDomainsComponent {
 
     this.formDialog.open(FormComponent, options)
   }
-
+  // @TODO figure out how to get types here
   private getNetworkStrategy(strategy: any) {
-    const { ipStrategy, proxyStrategy = {} } = strategy.unionValueKey
-    const { unionSelectKey, unionValueKey = {} } = proxyStrategy
-    const proxyId = unionSelectKey === 'primary' ? null : unionValueKey.proxyId
-
-    return strategy.unionSelectKey === 'local' ? { ipStrategy } : { proxyId }
+    return strategy.unionSelectKey === 'local'
+      ? { ipStrategy: strategy.unionValueKey.ipStrategy }
+      : { proxy: strategy.unionValueKey.proxyId }
   }
 
   private async deleteDomain(hostname?: string) {
@@ -174,7 +172,7 @@ export class SettingsDomainsComponent {
       loader.unsubscribe()
     }
   }
-
+  // @TODO figure out how to get types here
   private async claimDomain({ strategy }: any): Promise<boolean> {
     const loader = this.loader.open('Saving...').subscribe()
     const networkStrategy = this.getNetworkStrategy(strategy)
@@ -189,7 +187,7 @@ export class SettingsDomainsComponent {
       loader.unsubscribe()
     }
   }
-
+  // @TODO figure out how to get types here
   private async save({ provider, strategy, hostname }: any): Promise<boolean> {
     const loader = this.loader.open('Saving...').subscribe()
     const name = provider.unionSelectKey
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/email/email.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/email/email.component.ts
index c29a9213b..bb9267d86 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/email/email.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/email/email.component.ts
@@ -9,8 +9,6 @@ import { TuiDialogService } from '@taiga-ui/core'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import { TuiInputModule } from '@taiga-ui/kit'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
-import { customSmtp } from '@start9labs/start-sdk/lib/config/configConstants'
 import { PatchDB } from 'patch-db-client'
 import { switchMap } from 'rxjs'
 import { FormModule } from 'src/app/common/form/form.module'
@@ -19,6 +17,8 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormService } from 'src/app/services/form.service'
 import { EmailInfoComponent } from './info.component'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
+import { customSmtp } from '@start9labs/start-sdk/cjs/sdk/lib/config/configConstants'
 
 @Component({
   template: `
@@ -84,7 +84,7 @@ export class SettingsEmailComponent {
   testAddress = ''
   readonly spec: Promise<InputSpec> = configBuilderToSpec(customSmtp)
   readonly form$ = this.patch
-    .watch$('server-info', 'smtp')
+    .watch$('serverInfo', 'smtp')
     .pipe(
       switchMap(async value =>
         this.formService.createForm(await this.spec, value),
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/experimental/experimental.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/experimental/experimental.component.ts
index e70b1b875..bffc72bc8 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/experimental/experimental.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/experimental/experimental.component.ts
@@ -93,37 +93,6 @@ export class SettingsExperimentalComponent {
       .subscribe(() => this.resetTor(this.wipe))
   }
 
-  zram(enabled: boolean) {
-    this.dialogs
-      .open(TUI_PROMPT, {
-        label: 'Confirm',
-        data: {
-          content: enabled
-            ? 'Are you sure you want to disable zram? It provides significant performance benefits on low RAM devices.'
-            : 'Enable zram? It will only make a difference on lower RAM devices.',
-          yes: enabled ? 'Disable' : 'Enable',
-          no: 'Cancel',
-        },
-      })
-      .pipe(filter(Boolean))
-      .subscribe(() => this.toggleZram(enabled))
-  }
-
-  private async toggleZram(enabled: boolean) {
-    const loader = this.loader
-      .open(enabled ? 'Disabling zram...' : 'Enabling zram...')
-      .subscribe()
-
-    try {
-      await this.api.toggleZram({ enable: !enabled })
-      this.alerts.open(`Zram ${enabled ? 'disabled' : 'enabled'}`).subscribe()
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      loader.unsubscribe()
-    }
-  }
-
   private async resetTor(wipeState: boolean) {
     const loader = this.loader.open('Resetting Tor...').subscribe()
 
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/interfaces.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/interfaces.component.ts
deleted file mode 100644
index 53c4d4853..000000000
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/interfaces.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
-import { PatchDB } from 'patch-db-client'
-import { InterfacesComponent } from 'src/app/apps/portal/components/interfaces/interfaces.component'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  template: `
-    <app-interfaces
-      *ngIf="ui$ | async as ui"
-      [style.max-width.rem]="50"
-      [addressInfo]="ui"
-      [isUi]="true"
-    />
-  `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  imports: [CommonModule, InterfacesComponent],
-})
-export class SettingsInterfacesComponent {
-  readonly ui$ = inject(PatchDB<DataModel>).watch$('server-info', 'ui')
-}
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/ui.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/ui.component.ts
new file mode 100644
index 000000000..84271ac19
--- /dev/null
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/interfaces/ui.component.ts
@@ -0,0 +1,70 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
+import { PatchDB } from 'patch-db-client'
+import { Observable, map } from 'rxjs'
+import {
+  InterfaceComponent,
+  ServiceInterfaceWithAddresses,
+} from 'src/app/apps/portal/components/interfaces/interface.component'
+import { getAddresses } from 'src/app/apps/portal/components/interfaces/interface.utils'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+
+@Component({
+  template: `
+    <app-interface
+      *ngIf="ui$ | async as ui"
+      [style.max-width.rem]="50"
+      [serviceInterface]="ui"
+    />
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, InterfaceComponent],
+})
+export class StartOsUiComponent {
+  readonly ui$: Observable<ServiceInterfaceWithAddresses> = inject(
+    PatchDB<DataModel>,
+  )
+    .watch$('serverInfo', 'ui')
+    .pipe(
+      map(hosts => {
+        const serviceInterface: T.ServiceInterfaceWithHostInfo = {
+          id: 'startos-ui',
+          name: 'StartOS UI',
+          description: 'The primary web user interface for StartOS',
+          type: 'ui',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          addressInfo: {
+            hostId: '',
+            username: null,
+            suffix: '',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                scheme: 'https',
+                preferredExternalPort: 443,
+                addXForwardedHeaders: null,
+              },
+              secure: {
+                ssl: false,
+              },
+            },
+          },
+          hostInfo: {
+            id: 'start-os-ui-host',
+            kind: 'multi',
+            hostnames: hosts,
+          },
+        }
+
+        return {
+          ...serviceInterface,
+          addresses: getAddresses(serviceInterface),
+        }
+      }),
+    )
+}
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/constants.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/constants.ts
index c2149c963..b7f68aef6 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/constants.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/constants.ts
@@ -1,5 +1,5 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
 import { TuiDialogOptions } from '@taiga-ui/core'
 import { TuiPromptData } from '@taiga-ui/kit'
 
@@ -27,8 +27,6 @@ export const wireguardSpec = Config.of({
 })
 
 export type WireguardSpec = typeof wireguardSpec.validator._TYPE
-export type ProxyUpdate = Partial<{
+export type ProxyUpdate = {
   name: string
-  primaryInbound: true
-  primaryOutbound: true
-}>
+}
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/menu.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/menu.component.ts
index bff56bfcc..fa2867e6f 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/menu.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/menu.component.ts
@@ -6,7 +6,6 @@ import {
   Input,
 } from '@angular/core'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import {
   TuiDataListModule,
@@ -25,6 +24,7 @@ import { Proxy } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { DELETE_OPTIONS, ProxyUpdate } from './constants'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
 
 @Component({
   selector: 'proxies-menu',
@@ -45,23 +45,6 @@ import { DELETE_OPTIONS, ProxyUpdate } from './constants'
     </tui-hosted-dropdown>
     <ng-template #dropdown>
       <tui-data-list>
-        <button
-          *ngIf="!proxy.primaryInbound && proxy.type === 'inbound-outbound'"
-          tuiOption
-          (click)="update({ primaryInbound: true })"
-        >
-          Make Primary Inbound
-        </button>
-        <button
-          *ngIf="
-            !proxy.primaryOutbound &&
-            (proxy.type === 'inbound-outbound' || proxy.type === 'outbound')
-          "
-          tuiOption
-          (click)="update({ primaryOutbound: true })"
-        >
-          Make Primary Outbound
-        </button>
         <button tuiOption (click)="rename()">Rename</button>
         <tui-opt-group>
           <button tuiOption (click)="delete()">Delete</button>
@@ -105,20 +88,6 @@ export class ProxiesMenuComponent {
       })
   }
 
-  async update(value: ProxyUpdate): Promise<boolean> {
-    const loader = this.loader.open('Saving...').subscribe()
-
-    try {
-      await this.api.updateProxy(value)
-      return true
-    } catch (e: any) {
-      this.errorService.handleError(e)
-      return false
-    } finally {
-      loader.unsubscribe()
-    }
-  }
-
   async rename() {
     const spec = { name: 'Name', required: { default: this.proxy.name } }
     const name = await Value.text(spec).build({} as any)
@@ -137,4 +106,18 @@ export class ProxiesMenuComponent {
 
     this.formDialog.open(FormComponent, options)
   }
+
+  private async update(value: ProxyUpdate): Promise<boolean> {
+    const loader = this.loader.open('Saving...').subscribe()
+
+    try {
+      await this.api.updateProxy(value)
+      return true
+    } catch (e: any) {
+      this.errorService.handleError(e)
+      return false
+    } finally {
+      loader.unsubscribe()
+    }
+  }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/proxies.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/proxies.component.ts
index 3dfc3ae29..a1af1ec9c 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/proxies.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/proxies.component.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
+import { TuiDialogOptions } from '@taiga-ui/core'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import { PatchDB } from 'patch-db-client'
 import {
@@ -42,7 +42,7 @@ export class SettingsProxiesComponent {
   private readonly formDialog = inject(FormDialogService)
 
   readonly proxies$ = inject(PatchDB<DataModel>).watch$(
-    'server-info',
+    'serverInfo',
     'network',
     'proxies',
   )
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/table.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/table.component.ts
index de31f515e..418e8e71a 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/table.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/proxies/table.component.ts
@@ -20,7 +20,6 @@ import { ProxiesMenuComponent } from './menu.component'
         <th>Name</th>
         <th>Created</th>
         <th>Type</th>
-        <th>Primary</th>
         <th>Used By</th>
         <th></th>
       </tr>
@@ -28,21 +27,8 @@ import { ProxiesMenuComponent } from './menu.component'
     <tbody>
       <tr *ngFor="let proxy of proxies">
         <td>{{ proxy.name }}</td>
-        <td>{{ proxy.createdAt | date : 'short' }}</td>
+        <td>{{ proxy.createdAt | date: 'short' }}</td>
         <td>{{ proxy.type }}</td>
-        <td>
-          <tui-badge
-            *ngIf="proxy.primaryInbound"
-            appearance="success"
-            size="m"
-            [style.margin-right.rem]="0.25"
-          >
-            Inbound
-          </tui-badge>
-          <tui-badge *ngIf="proxy.primaryOutbound" appearance="info" size="m">
-            Outbound
-          </tui-badge>
-        </td>
         <td>
           <button
             *ngIf="getLength(proxy); else unused"
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/primary-ip.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/primary-ip.pipe.ts
index 777194183..56710b348 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/primary-ip.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/primary-ip.pipe.ts
@@ -1,14 +1,16 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { IpInfo } from 'src/app/services/patch-db/data-model'
+import { HostnameInfo } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 
 @Pipe({
   standalone: true,
   name: 'primaryIp',
 })
 export class PrimaryIpPipe implements PipeTransform {
-  transform(ipInfo: IpInfo): string {
-    return Object.values(ipInfo)
-      .filter(iface => iface.ipv4)
-      .sort((a, b) => (a.wireless ? -1 : 1))[0].ipv4!
+  transform(hostnames: HostnameInfo[]): string {
+    return (
+      hostnames.map(
+        h => h.kind === 'ip' && h.hostname.kind === 'ipv4' && h.hostname.value,
+      )[0] || ''
+    )
   }
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/router.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/router.component.ts
index b34be8390..ffee1e7ae 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/router.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/router.component.ts
@@ -12,7 +12,7 @@ import { RouterPortComponent } from './table.component'
     <ng-container *ngIf="server$ | async as server">
       <router-info [enabled]="!server.network.wanConfig.upnp" />
       <table
-        *ngIf="server.ui.ipInfo | primaryIp as ip"
+        *ngIf="server.ui | primaryIp as ip"
         tuiTextfieldAppearance="unstyled"
         tuiTextfieldSize="m"
         [tuiTextfieldLabelOutside]="true"
@@ -65,5 +65,5 @@ import { RouterPortComponent } from './table.component'
   ],
 })
 export class SettingsRouterComponent {
-  readonly server$ = inject(PatchDB<DataModel>).watch$('server-info')
+  readonly server$ = inject(PatchDB<DataModel>).watch$('serverInfo')
 }
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/table.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/table.component.ts
index b7934b8de..2b5ec5812 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/table.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/router/table.component.ts
@@ -5,7 +5,6 @@ import {
   inject,
   Input,
   OnChanges,
-  SimpleChanges,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { CopyService, ErrorService, LoadingService } from '@start9labs/shared'
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/sessions.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/sessions.component.ts
index 33b2507e7..673f0a8b7 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/sessions.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/sessions.component.ts
@@ -58,8 +58,8 @@ export class SettingsSessionsComponent {
           }))
           .sort(
             (a, b) =>
-              new Date(b['last-active']).valueOf() -
-              new Date(a['last-active']).valueOf(),
+              new Date(b.lastActive).valueOf() -
+              new Date(a.lastActive).valueOf(),
           ),
       ),
     ),
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/table.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/table.component.ts
index 97491217e..418a88dfe 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/table.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/sessions/table.component.ts
@@ -49,13 +49,13 @@ import { FormsModule } from '@angular/forms'
             [ngModel]="selected$.value.includes(session)"
             (ngModelChange)="onToggle(session)"
           />
-          {{ session['user-agent'] }}
+          {{ session.userAgent }}
         </td>
         <td *ngIf="session.metadata.platforms | platformInfo as info">
           <tui-icon [icon]="info.icon"></tui-icon>
           {{ info.name }}
         </td>
-        <td>{{ session['last-active'] }}</td>
+        <td>{{ session.lastActive }}</td>
       </tr>
       <ng-template #loading>
         <tr *ngFor="let _ of single ? [''] : ['', '']">
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/ssh/table.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/ssh/table.component.ts
index 729baaae1..802ea080a 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/ssh/table.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/ssh/table.component.ts
@@ -35,7 +35,7 @@ import { TuiForModule } from '@taiga-ui/cdk'
     <tbody>
       <tr *ngFor="let key of keys; else: loading">
         <td>{{ key.hostname }}</td>
-        <td>{{ key['created-at'] | date: 'medium' }}</td>
+        <td>{{ key.createdAt | date: 'medium' }}</td>
         <td>{{ key.alg }}</td>
         <td>{{ key.fingerprint }}</td>
         <td>
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/utils.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/utils.ts
index 81c7e1f24..d45eb798e 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/utils.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/utils.ts
@@ -1,4 +1,4 @@
-import { ValueSpecObject } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecObject } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { AvailableWifi } from 'src/app/services/api/api.types'
 import { RR } from 'src/app/services/api/api.types'
 
@@ -18,7 +18,7 @@ export interface WifiData {
 
 export function parseWifi(res: RR.GetWifiRes): WifiData {
   return {
-    available: res['available-wifi'],
+    available: res.availableWifi,
     known: Object.entries(res.ssids).map(([ssid, strength]) => ({
       ssid,
       strength,
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.component.ts
index fad13a89e..becd924d2 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.component.ts
@@ -102,7 +102,7 @@ export class SettingsWifiComponent {
 
   readonly wifi$ = merge(this.getWifi$(), this.update$)
   readonly enabled$ = inject(PatchDB<DataModel>).watch$(
-    'server-info',
+    'serverInfo',
     'network',
     'wifi',
     'enabled',
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.const.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.const.ts
index 7c9e9540c..6cc0c81da 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.const.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/routes/wifi/wifi.const.ts
@@ -1,4 +1,4 @@
-import { ValueSpecObject } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecObject } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 
 export const wifiSpec: ValueSpecObject = {
   type: 'object',
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.routes.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.routes.ts
index 3b5c37a37..13b76911c 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.routes.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.routes.ts
@@ -12,13 +12,6 @@ export default [
             m => m.SettingsEmailComponent,
           ),
       },
-      {
-        path: 'experimental',
-        loadComponent: () =>
-          import('./routes/experimental/experimental.component').then(
-            m => m.SettingsExperimentalComponent,
-          ),
-      },
       {
         path: 'domains',
         loadComponent: () =>
@@ -48,10 +41,10 @@ export default [
           ),
       },
       {
-        path: 'interfaces',
+        path: 'ui',
         loadComponent: () =>
-          import('./routes/interfaces/interfaces.component').then(
-            m => m.SettingsInterfacesComponent,
+          import('./routes/interfaces/ui.component').then(
+            m => m.StartOsUiComponent,
           ),
       },
       {
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.service.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.service.ts
index f8884cd70..fd8eacc08 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.service.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.service.ts
@@ -4,7 +4,7 @@ import * as argon2 from '@start9labs/argon2'
 import { ErrorService, LoadingService } from '@start9labs/shared'
 import { TUI_PROMPT } from '@taiga-ui/kit'
 import { PatchDB } from 'patch-db-client'
-import { filter, from, take } from 'rxjs'
+import { filter, firstValueFrom, from, take } from 'rxjs'
 import { switchMap } from 'rxjs/operators'
 import { FormComponent } from 'src/app/apps/portal/components/form.component'
 import { PROMPT } from 'src/app/apps/portal/modals/prompt.component'
@@ -16,6 +16,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 import { passwordSpec, PasswordSpec, SettingBtn } from './settings.types'
+import { ConfigService } from 'src/app/services/config.service'
 
 @Injectable({ providedIn: 'root' })
 export class SettingsService {
@@ -27,6 +28,7 @@ export class SettingsService {
   private readonly formDialog = inject(FormDialogService)
   private readonly patch = inject(PatchDB<DataModel>)
   private readonly api = inject(ApiService)
+  private readonly isTor = inject(ConfigService).isTor()
 
   readonly settings: Record<string, readonly SettingBtn[]> = {
     General: [
@@ -75,8 +77,14 @@ export class SettingsService {
         icon: 'tuiIconWifi',
         routerLink: 'wifi',
       },
+      {
+        title: 'Reset Tor',
+        description: `May help resolve Tor connectivity issues`,
+        icon: 'tuiIconRefreshCw',
+        action: () => this.promptResetTor(),
+      },
     ],
-    'User Interface': [
+    'StartOS UI': [
       {
         title: 'Browser Tab Title',
         description: `Customize the display name of your browser tab`,
@@ -87,7 +95,7 @@ export class SettingsService {
         title: 'Web Addresses',
         description: 'View and manage web addresses for accessing this UI',
         icon: 'tuiIconMonitor',
-        routerLink: 'interfaces',
+        routerLink: 'ui',
       },
     ],
     'Privacy and Security': [
@@ -95,7 +103,7 @@ export class SettingsService {
         title: 'Outbound Proxy',
         description: 'Proxy outbound traffic from the StartOS main process',
         icon: 'tuiIconShield',
-        action: () => this.proxyService.presentModalSetOutboundProxy(),
+        action: () => this.setOutboundProxy(),
       },
       {
         title: 'SSH',
@@ -113,6 +121,44 @@ export class SettingsService {
     ],
   }
 
+  private async setOutboundProxy(): Promise<void> {
+    const proxy = await firstValueFrom(
+      this.patch.watch$('serverInfo', 'network', 'outboundProxy'),
+    )
+    await this.proxyService.presentModalSetOutboundProxy(proxy)
+  }
+
+  // @TODO previous this was done in experimental settings using a template ref.
+  private promptResetTor() {
+    this.dialogs
+      .open(TUI_PROMPT, {
+        label: this.isTor ? 'Warning' : 'Confirm',
+        data: {
+          content: '',
+          yes: 'Reset',
+          no: 'Cancel',
+        },
+      })
+      .pipe(filter(Boolean))
+      .subscribe(() => this.resetTor(true))
+  }
+
+  private async resetTor(wipeState: boolean) {
+    const loader = this.loader.open('Resetting Tor...').subscribe()
+
+    try {
+      await this.api.resetTor({
+        wipeState: wipeState,
+        reason: 'User triggered',
+      })
+      this.alerts.open('Tor reset in progress').subscribe()
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
   private async setBrowserTab(): Promise<void> {
     this.patch
       .watch$('ui', 'name')
@@ -187,7 +233,7 @@ export class SettingsService {
     }
 
     // confirm current password is correct
-    const { 'password-hash': passwordHash } = await getServerInfo(this.patch)
+    const { passwordHash } = await getServerInfo(this.patch)
     try {
       argon2.verify(passwordHash, value.currentPassword)
     } catch (e) {
@@ -203,8 +249,8 @@ export class SettingsService {
 
     try {
       await this.api.resetPassword({
-        'old-password': value.currentPassword,
-        'new-password': value.newPassword1,
+        oldPassword: value.currentPassword,
+        newPassword: value.newPassword1,
       })
 
       this.alerts.open('Password changed!').subscribe()
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.types.ts b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.types.ts
index 5ae9b4048..0d97b1136 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.types.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/settings/settings.types.ts
@@ -1,5 +1,5 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
 
 export interface SettingBtn {
   title: string
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/sideload/package.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/sideload/package.component.ts
index 9851f1ef3..d596df6e1 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/sideload/package.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/sideload/package.component.ts
@@ -22,6 +22,7 @@ import { combineLatest, map } from 'rxjs'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ClientStorageService } from 'src/app/services/client-storage.service'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'sideload-package',
@@ -87,12 +88,12 @@ export class SideloadPackageComponent {
   readonly button$ = combineLatest([
     inject(ClientStorageService).showDevTools$,
     inject(PatchDB<DataModel>)
-      .watch$('package-data')
+      .watch$('packageData')
       .pipe(
         map(local =>
           local[this.package.manifest.id]
             ? this.emver.compare(
-                local[this.package.manifest.id].manifest.version,
+                getManifest(local[this.package.manifest.id]).version,
                 this.package.manifest.version,
               )
             : null,
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/sideload/sideload.utils.ts b/web/projects/ui/src/app/apps/portal/routes/system/sideload/sideload.utils.ts
index b302658d3..11343029f 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/sideload/sideload.utils.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/sideload/sideload.utils.ts
@@ -39,8 +39,8 @@ export async function parseS9pk(file: File): Promise<MarketplacePkg> {
     instructions: '',
     categories: [],
     versions: [],
-    'dependency-metadata': {},
-    'published-at': '',
+    dependencyMetadata: {},
+    publishedAt: '',
   }
 }
 
@@ -152,7 +152,7 @@ async function getIcon(
   file: Blob,
   manifest: Manifest,
 ): Promise<string> {
-  const contentType = `image/${manifest.assets.icon.split('.').pop()}`
+  const contentType = '' // @TODO
   const data = file.slice(
     Number(positions['icon'][0]),
     Number(positions['icon'][0]) + Number(positions['icon'][1]),
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/updates/components/item.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/updates/components/item.component.ts
index 22aeb6b4e..40dda37d4 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/updates/components/item.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/updates/components/item.component.ts
@@ -4,7 +4,6 @@ import { RouterLink } from '@angular/router'
 import {
   AbstractMarketplaceService,
   MarketplacePkg,
-  MimeTypePipeModule,
 } from '@start9labs/marketplace'
 import {
   EmverPipesModule,
@@ -28,22 +27,28 @@ import {
   TuiProgressModule,
 } from '@taiga-ui/kit'
 import { NgDompurifyModule } from '@tinkoff/ng-dompurify'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import {
+  DataModel,
+  InstalledState,
+  PackageDataEntry,
+  UpdatingState,
+} from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { InstallProgressPipe } from '../pipes/install-progress.pipe'
+import { InstallingProgressPipe } from '../../../service/pipes/install-progress.pipe'
+import { PatchDB } from 'patch-db-client'
+import { getAllPackages } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'updates-item',
   template: `
     <tui-accordion-item borders="top-bottom">
       <div class="g-action">
-        <tui-avatar size="s" [src]="marketplacePkg | mimeType" />
+        <tui-avatar size="s" [src]="marketplacePkg" />
         <div [style.flex]="1" [style.overflow]="'hidden'">
           <strong>{{ marketplacePkg.manifest.title }}</strong>
           <div>
-            <!-- @TODO left side should be local['old-manifest'] (or whatever), not manifest. -->
-            {{ localPkg.manifest.version || '' | displayEmver }}
+            {{ localPkg.stateInfo.manifest.version | displayEmver }}
             <tui-icon icon="tuiIconArrowRight" [style.font-size.rem]="1" />
             <span [style.color]="'var(--tui-positive)'">
               {{ marketplacePkg.manifest.version | displayEmver }}
@@ -52,10 +57,13 @@ import { InstallProgressPipe } from '../pipes/install-progress.pipe'
           <div [style.color]="'var(--tui-negative)'">{{ errors }}</div>
         </div>
         <tui-progress-circle
-          *ngIf="localPkg.state === 'updating'; else button"
+          *ngIf="localPkg.stateInfo.state === 'updating'; else button"
           style="color: var(--tui-positive)"
           [max]="100"
-          [value]="localPkg['install-progress'] | installProgress"
+          [value]="
+            (localPkg.stateInfo.installingInfo.progress.overall
+              | installingProgress) || 0
+          "
         />
         <ng-template #button>
           <button
@@ -77,7 +85,7 @@ import { InstallProgressPipe } from '../pipes/install-progress.pipe'
         <p
           safeLinks
           [innerHTML]="
-            marketplacePkg.manifest['release-notes'] | markdown | dompurify
+            marketplacePkg.manifest.releaseNotes | markdown | dompurify
           "
         ></p>
         <a
@@ -110,7 +118,6 @@ import { InstallProgressPipe } from '../pipes/install-progress.pipe'
     RouterLink,
     EmverPipesModule,
     MarkdownPipeModule,
-    MimeTypePipeModule,
     NgDompurifyModule,
     SafeLinksDirective,
     SharedPipesModule,
@@ -121,11 +128,12 @@ import { InstallProgressPipe } from '../pipes/install-progress.pipe'
     TuiButtonModule,
     TuiLinkModule,
     TuiLoaderModule,
-    InstallProgressPipe,
+    InstallingProgressPipe,
   ],
 })
 export class UpdatesItemComponent {
   private readonly dialogs = inject(TuiDialogService)
+  private readonly patch = inject(PatchDB<DataModel>)
   private readonly marketplace = inject(
     AbstractMarketplaceService,
   ) as MarketplaceService
@@ -134,17 +142,21 @@ export class UpdatesItemComponent {
   marketplacePkg!: MarketplacePkg
 
   @Input({ required: true })
-  localPkg!: PackageDataEntry
+  localPkg!: PackageDataEntry<InstalledState | UpdatingState>
 
   @Input({ required: true })
-  url = ''
+  url!: string
+
+  get pkgId(): string {
+    return this.marketplacePkg.manifest.id
+  }
 
   get errors(): string {
-    return this.marketplace.updateErrors[this.marketplacePkg.manifest.id]
+    return this.marketplace.updateErrors[this.pkgId]
   }
 
   get ready(): boolean {
-    return !this.marketplace.updateQueue[this.marketplacePkg.manifest.id]
+    return !this.marketplace.updateQueue[this.pkgId]
   }
 
   async onClick() {
@@ -153,7 +165,7 @@ export class UpdatesItemComponent {
     delete this.marketplace.updateErrors[id]
     this.marketplace.updateQueue[id] = true
 
-    if (hasCurrentDeps(this.localPkg)) {
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
       const proceed = await this.alert()
 
       if (proceed) {
@@ -185,7 +197,7 @@ export class UpdatesItemComponent {
           label: 'Warning',
           size: 's',
           data: {
-            content: `Services that depend on ${this.localPkg.manifest.title} will no longer work properly and may crash`,
+            content: `Services that depend on ${this.localPkg.stateInfo.manifest.title} will no longer work properly and may crash`,
             yes: 'Continue',
             no: 'Cancel',
           },
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/filter-updates.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/filter-updates.pipe.ts
index 6e66f0c14..19abcaf77 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/filter-updates.pipe.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/filter-updates.pipe.ts
@@ -1,7 +1,12 @@
 import { inject, Pipe, PipeTransform } from '@angular/core'
 import { Emver } from '@start9labs/shared'
 import { MarketplacePkg } from '@start9labs/marketplace'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import {
+  InstalledState,
+  PackageDataEntry,
+  UpdatingState,
+} from 'src/app/services/patch-db/data-model'
+import { hasCurrentDeps } from 'src/app/util/has-deps'
 
 @Pipe({
   name: 'filterUpdates',
@@ -12,14 +17,14 @@ export class FilterUpdatesPipe implements PipeTransform {
 
   transform(
     pkgs?: MarketplacePkg[],
-    local?: Record<string, PackageDataEntry | undefined>,
+    local?: Record<string, PackageDataEntry<InstalledState | UpdatingState>>,
   ): MarketplacePkg[] | null {
     return (
       pkgs?.filter(
         ({ manifest }) =>
           this.emver.compare(
             manifest.version,
-            local?.[manifest.id]?.manifest.version, // @TODO this won't work, need old version
+            local?.[manifest.id]?.stateInfo.manifest.version,
           ) === 1,
       ) || null
     )
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/install-progress.pipe.ts b/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/install-progress.pipe.ts
deleted file mode 100644
index 8b2edd3cf..000000000
--- a/web/projects/ui/src/app/apps/portal/routes/system/updates/pipes/install-progress.pipe.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core'
-import { Progress } from 'src/app/services/patch-db/data-model'
-
-@Pipe({
-  name: 'installProgress',
-  standalone: true,
-})
-export class InstallingProgressDisplayPipe implements PipeTransform {
-  transform(progress: Progress): string {
-    if (progress === true) return 'finalizing'
-    if (progress === false || !progress.total) return 'unknown %'
-    const percentage = Math.round((100 * progress.done) / progress.total)
-
-    return percentage < 99 ? String(percentage) + '%' : 'finalizing'
-  }
-}
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/updates/updates.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/updates/updates.component.ts
index a1b7116b4..20413cdb5 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/updates/updates.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/updates/updates.component.ts
@@ -6,12 +6,18 @@ import {
 } from '@start9labs/marketplace'
 import { TuiAvatarModule, TuiCellModule } from '@taiga-ui/experimental'
 import { PatchDB } from 'patch-db-client'
-import { combineLatest } from 'rxjs'
+import { combineLatest, map } from 'rxjs'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
-import { DataModel } from 'src/app/services/patch-db/data-model'
+import {
+  DataModel,
+  InstalledState,
+  PackageDataEntry,
+  UpdatingState,
+} from 'src/app/services/patch-db/data-model'
 import { ConfigService } from 'src/app/services/config.service'
 import { FilterUpdatesPipe } from './pipes/filter-updates.pipe'
 import { UpdatesItemComponent } from './components/item.component'
+import { isInstalled, isUpdating } from 'src/app/util/get-package-data'
 
 @Component({
   template: `
@@ -69,7 +75,22 @@ export default class UpdatesComponent {
   readonly data$ = combineLatest({
     hosts: this.service.getKnownHosts$(true),
     mp: this.service.getMarketplace$(),
-    local: inject(PatchDB<DataModel>).watch$('package-data'),
+    local: inject(PatchDB<DataModel>)
+      .watch$('packageData')
+      .pipe(
+        map(pkgs =>
+          Object.values(pkgs).reduce(
+            (acc, curr) => {
+              if (isInstalled(curr) || isUpdating(curr)) return { ...acc, curr }
+              return acc
+            },
+            {} as Record<
+              string,
+              PackageDataEntry<InstalledState | UpdatingState>
+            >,
+          ),
+        ),
+      ),
     errors: this.service.getRequestErrors$(),
   })
 }
diff --git a/web/projects/ui/src/app/apps/portal/services/actions.service.ts b/web/projects/ui/src/app/apps/portal/services/actions.service.ts
index 7272cf2d5..bfacc59d4 100644
--- a/web/projects/ui/src/app/apps/portal/services/actions.service.ts
+++ b/web/projects/ui/src/app/apps/portal/services/actions.service.ts
@@ -9,8 +9,11 @@ import {
 } from 'src/app/apps/portal/modals/config.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
+import { Manifest } from '@start9labs/marketplace'
+import { getAllPackages } from 'src/app/util/get-package-data'
+import { PatchDB } from 'patch-db-client'
 
 @Injectable({
   providedIn: 'root',
@@ -21,15 +24,16 @@ export class ActionsService {
   private readonly loader = inject(LoadingService)
   private readonly api = inject(ApiService)
   private readonly formDialog = inject(FormDialogService)
+  private readonly patch = inject(PatchDB<DataModel>)
 
-  configure({ manifest }: PackageDataEntry): void {
+  configure(manifest: Manifest): void {
     this.formDialog.open<PackageConfigData>(ServiceConfigModal, {
       label: `${manifest.title} configuration`,
       data: { pkgId: manifest.id },
     })
   }
 
-  async start({ manifest }: PackageDataEntry, unmet: boolean): Promise<void> {
+  async start(manifest: Manifest, unmet: boolean): Promise<void> {
     const deps = `${manifest.title} has unmet dependencies. It will not work as expected.`
 
     if (
@@ -40,12 +44,10 @@ export class ActionsService {
     }
   }
 
-  stop(pkg: PackageDataEntry): void {
-    const { title, alerts } = pkg.manifest
-
+  async stop({ id, title, alerts }: Manifest): Promise<void> {
     let content = alerts.stop || ''
 
-    if (hasCurrentDeps(pkg)) {
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
       const depMessage = `Services that depend on ${title} will no longer work properly and may crash`
       content = content ? `${content}.\n\n${depMessage}` : depMessage
     }
@@ -54,26 +56,26 @@ export class ActionsService {
       this.dialogs
         .open(TUI_PROMPT, getOptions(content, 'Stop'))
         .pipe(filter(Boolean))
-        .subscribe(() => this.doStop(pkg.manifest.id))
+        .subscribe(() => this.doStop(id))
     } else {
-      this.doStop(pkg.manifest.id)
+      this.doStop(id)
     }
   }
 
-  restart(pkg: PackageDataEntry): void {
-    if (hasCurrentDeps(pkg)) {
+  async restart({ id, title }: Manifest): Promise<void> {
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
       this.dialogs
         .open(
           TUI_PROMPT,
           getOptions(
-            `Services that depend on ${pkg.manifest} may temporarily experiences issues`,
+            `Services that depend on ${title} may temporarily experiences issues`,
             'Restart',
           ),
         )
         .pipe(filter(Boolean))
-        .subscribe(() => this.doRestart(pkg.manifest.id))
+        .subscribe(() => this.doRestart(id))
     } else {
-      this.doRestart(pkg.manifest.id)
+      this.doRestart(id)
     }
   }
 
diff --git a/web/projects/ui/src/app/apps/portal/services/badge.service.ts b/web/projects/ui/src/app/apps/portal/services/badge.service.ts
index 2039e4db9..d631c4cef 100644
--- a/web/projects/ui/src/app/apps/portal/services/badge.service.ts
+++ b/web/projects/ui/src/app/apps/portal/services/badge.service.ts
@@ -18,6 +18,7 @@ import { EOSService } from 'src/app/services/eos.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { ConnectionService } from 'src/app/services/connection.service'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Injectable({
   providedIn: 'root',
@@ -26,7 +27,7 @@ export class BadgeService {
   private readonly emver = inject(Emver)
   private readonly patch = inject(PatchDB<DataModel>)
   private readonly settings$ = combineLatest([
-    this.patch.watch$('server-info', 'ntp-synced'),
+    this.patch.watch$('serverInfo', 'ntpSynced'),
     inject(EOSService).updateAvailable$,
   ]).pipe(map(([synced, update]) => Number(!synced) + Number(update)))
   private readonly marketplace = inject(
@@ -35,17 +36,16 @@ export class BadgeService {
 
   private readonly local$ = inject(ConnectionService).connected$.pipe(
     filter(Boolean),
-    switchMap(() => this.patch.watch$('package-data').pipe(first())),
+    switchMap(() => this.patch.watch$('packageData').pipe(first())),
     switchMap(outer =>
-      this.patch.watch$('package-data').pipe(
+      this.patch.watch$('packageData').pipe(
         pairwise(),
         filter(([prev, curr]) =>
-          Object.values(prev).some(
-            p =>
-              !curr[p.manifest.id] ||
-              (p['install-progress'] &&
-                !curr[p.manifest.id]['install-progress']),
-          ),
+          Object.values(prev).some(p => {
+            const id = getManifest(p).id
+            !curr[id] ||
+              (p.stateInfo.installingInfo && !curr[id].stateInfo.installingInfo)
+          }),
         ),
         map(([_, curr]) => curr),
         startWith(outer),
@@ -63,7 +63,8 @@ export class BadgeService {
           (list, [_, store]) =>
             store?.packages.reduce(
               (result, { manifest: { id, version } }) =>
-                this.emver.compare(version, local[id]?.manifest.version) === 1
+                this.emver.compare(version, getManifest(local[id])?.version) ===
+                1
                   ? result.add(id)
                   : result,
               list,
diff --git a/web/projects/ui/src/app/apps/portal/services/breadcrumbs.service.ts b/web/projects/ui/src/app/apps/portal/services/breadcrumbs.service.ts
index 89593a545..4a1af0350 100644
--- a/web/projects/ui/src/app/apps/portal/services/breadcrumbs.service.ts
+++ b/web/projects/ui/src/app/apps/portal/services/breadcrumbs.service.ts
@@ -7,7 +7,7 @@ import {
 } from 'src/app/services/patch-db/data-model'
 import { SYSTEM_UTILITIES } from '../constants/system-utilities'
 import { toRouterLink } from '../utils/to-router-link'
-import { getAllPackages } from '../../../util/get-package-data'
+import { getAllPackages, getManifest } from '../../../util/get-package-data'
 
 export interface Breadcrumb {
   title: string
@@ -67,12 +67,12 @@ function toBreadcrumbs(
   }
 
   const [service, ...path] = id.split('/')
-  const { icon, manifest } = packages[service]
+  const { title, version } = getManifest(packages[service])
   const breadcrumbs: Breadcrumb[] = [
     {
-      icon,
-      title: manifest.title,
-      subtitle: manifest.version,
+      icon: packages[service].icon,
+      title,
+      subtitle: version,
       routerLink: toRouterLink(service),
     },
   ]
diff --git a/web/projects/ui/src/app/apps/portal/services/notification.service.ts b/web/projects/ui/src/app/apps/portal/services/notification.service.ts
index 0c17c4f48..d5b96547e 100644
--- a/web/projects/ui/src/app/apps/portal/services/notification.service.ts
+++ b/web/projects/ui/src/app/apps/portal/services/notification.service.ts
@@ -21,7 +21,7 @@ export class NotificationService {
   private readonly localUnreadCount$ = new Subject<number>()
 
   readonly unreadCount$ = merge(
-    this.patch.watch$('server-info', 'unreadNotifications', 'count'),
+    this.patch.watch$('serverInfo', 'unreadNotifications', 'count'),
     this.localUnreadCount$,
   ).pipe(shareReplay(1))
 
@@ -102,7 +102,7 @@ export class NotificationService {
         label: 'Backup Report',
         data: {
           report: notification.data,
-          timestamp: notification['created-at'],
+          timestamp: notification.createdAt,
         },
       })
       .subscribe()
diff --git a/web/projects/ui/src/app/apps/portal/services/services.service.ts b/web/projects/ui/src/app/apps/portal/services/services.service.ts
index 458e83227..69083a8e8 100644
--- a/web/projects/ui/src/app/apps/portal/services/services.service.ts
+++ b/web/projects/ui/src/app/apps/portal/services/services.service.ts
@@ -1,21 +1,23 @@
 import { inject, Injectable } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
-import { filter, map, Observable, pairwise, shareReplay, startWith } from 'rxjs'
+import { map, Observable, shareReplay } from 'rxjs'
 import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Injectable({
   providedIn: 'root',
 })
 export class ServicesService extends Observable<readonly PackageDataEntry[]> {
   private readonly services$ = inject(PatchDB<DataModel>)
-    .watch$('package-data')
+    .watch$('packageData')
     .pipe(
       map(pkgs =>
         Object.values(pkgs).sort((a, b) =>
-          b.manifest.title.toLowerCase() > a.manifest.title.toLowerCase()
+          getManifest(b).title.toLowerCase() >
+          getManifest(a).title.toLowerCase()
             ? -1
             : 1,
         ),
diff --git a/web/projects/ui/src/app/apps/portal/utils/to-navigation-item.ts b/web/projects/ui/src/app/apps/portal/utils/to-navigation-item.ts
index d4109d496..6ec647407 100644
--- a/web/projects/ui/src/app/apps/portal/utils/to-navigation-item.ts
+++ b/web/projects/ui/src/app/apps/portal/utils/to-navigation-item.ts
@@ -1,6 +1,7 @@
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { SYSTEM_UTILITIES } from '../constants/system-utilities'
 import { toRouterLink } from './to-router-link'
+import { getManifest } from 'src/app/util/get-package-data'
 
 export interface NavigationItem {
   readonly routerLink: string
@@ -25,7 +26,7 @@ export function toNavigationItem(
 
   return {
     icon: packages[id]?.icon,
-    title: packages[id]?.manifest.title,
+    title: getManifest(packages[id]).title,
     routerLink,
   }
 }
diff --git a/web/projects/ui/src/app/common/form/control.ts b/web/projects/ui/src/app/common/form/control.ts
index e69f576ab..c17882764 100644
--- a/web/projects/ui/src/app/common/form/control.ts
+++ b/web/projects/ui/src/app/common/form/control.ts
@@ -1,6 +1,6 @@
 import { inject } from '@angular/core'
 import { FormControlComponent } from './form-control/form-control.component'
-import { ValueSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 
 export abstract class Control<Spec extends ValueSpec, Value> {
   private readonly control: FormControlComponent<Spec, Value> =
diff --git a/web/projects/ui/src/app/common/form/form-array/form-array.component.ts b/web/projects/ui/src/app/common/form/form-array/form-array.component.ts
index 40f441a63..ce3860259 100644
--- a/web/projects/ui/src/app/common/form/form-array/form-array.component.ts
+++ b/web/projects/ui/src/app/common/form/form-array/form-array.component.ts
@@ -8,8 +8,8 @@ import {
   tuiHeightCollapse,
 } from '@taiga-ui/core'
 import { TUI_PROMPT } from '@taiga-ui/kit'
+import { ValueSpecList } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { filter, takeUntil } from 'rxjs'
-import { ValueSpecList } from '@start9labs/start-sdk/lib/config/configTypes'
 import { FormService } from 'src/app/services/form.service'
 import { ERRORS } from '../form-group/form-group.component'
 
diff --git a/web/projects/ui/src/app/common/form/form-color/form-color.component.ts b/web/projects/ui/src/app/common/form/form-color/form-color.component.ts
index 9f7a119e5..fc6683143 100644
--- a/web/projects/ui/src/app/common/form/form-color/form-color.component.ts
+++ b/web/projects/ui/src/app/common/form/form-color/form-color.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecColor } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecColor } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 import { MaskitoOptions } from '@maskito/core'
 
diff --git a/web/projects/ui/src/app/common/form/form-control/form-control.component.ts b/web/projects/ui/src/app/common/form/form-control/form-control.component.ts
index 1396822f5..b71d900f5 100644
--- a/web/projects/ui/src/app/common/form/form-control/form-control.component.ts
+++ b/web/projects/ui/src/app/common/form/form-control/form-control.component.ts
@@ -13,7 +13,7 @@ import {
   TuiNotification,
 } from '@taiga-ui/core'
 import { filter, takeUntil } from 'rxjs'
-import { ValueSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { ERRORS } from '../form-group/form-group.component'
 import { FORM_CONTROL_PROVIDERS } from './form-control.providers'
 
diff --git a/web/projects/ui/src/app/common/form/form-control/form-control.providers.ts b/web/projects/ui/src/app/common/form/form-control/form-control.providers.ts
index 439a9fc53..3a8883888 100644
--- a/web/projects/ui/src/app/common/form/form-control/form-control.providers.ts
+++ b/web/projects/ui/src/app/common/form/form-control/form-control.providers.ts
@@ -1,6 +1,6 @@
 import { forwardRef, Provider } from '@angular/core'
 import { TUI_VALIDATION_ERRORS } from '@taiga-ui/kit'
-import { ValueSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { FormControlComponent } from './form-control.component'
 
 interface ValidatorsPatternError {
diff --git a/web/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts b/web/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts
index 8495919ce..c6d023092 100644
--- a/web/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts
+++ b/web/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts
@@ -6,7 +6,7 @@ import {
   tuiPure,
   TuiTime,
 } from '@taiga-ui/cdk'
-import { ValueSpecDatetime } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecDatetime } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 
 @Component({
diff --git a/web/projects/ui/src/app/common/form/form-file/form-file.component.ts b/web/projects/ui/src/app/common/form/form-file/form-file.component.ts
index 34a3b3a28..05dbdbc35 100644
--- a/web/projects/ui/src/app/common/form/form-file/form-file.component.ts
+++ b/web/projects/ui/src/app/common/form/form-file/form-file.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { TuiFileLike } from '@taiga-ui/kit'
-import { ValueSpecFile } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecFile } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 
 @Component({
diff --git a/web/projects/ui/src/app/common/form/form-group/form-group.component.ts b/web/projects/ui/src/app/common/form/form-group/form-group.component.ts
index 8c6ff8af1..c4801bd4b 100644
--- a/web/projects/ui/src/app/common/form/form-group/form-group.component.ts
+++ b/web/projects/ui/src/app/common/form/form-group/form-group.component.ts
@@ -4,7 +4,7 @@ import {
   Input,
   ViewEncapsulation,
 } from '@angular/core'
-import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { FORM_GROUP_PROVIDERS } from './form-group.providers'
 
 export const ERRORS = [
diff --git a/web/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts b/web/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts
index ef3edf4a7..895ea7225 100644
--- a/web/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts
+++ b/web/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecMultiselect } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecMultiselect } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 import { tuiPure } from '@taiga-ui/cdk'
 import { invert } from '@start9labs/shared'
diff --git a/web/projects/ui/src/app/common/form/form-number/form-number.component.ts b/web/projects/ui/src/app/common/form/form-number/form-number.component.ts
index 387b33719..bdc8e85d8 100644
--- a/web/projects/ui/src/app/common/form/form-number/form-number.component.ts
+++ b/web/projects/ui/src/app/common/form/form-number/form-number.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecNumber } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecNumber } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 
 @Component({
diff --git a/web/projects/ui/src/app/common/form/form-object/form-object.component.ts b/web/projects/ui/src/app/common/form/form-object/form-object.component.ts
index 459fc01c5..41d384828 100644
--- a/web/projects/ui/src/app/common/form/form-object/form-object.component.ts
+++ b/web/projects/ui/src/app/common/form/form-object/form-object.component.ts
@@ -7,7 +7,7 @@ import {
   Output,
 } from '@angular/core'
 import { ControlContainer } from '@angular/forms'
-import { ValueSpecObject } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecObject } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 
 @Component({
   selector: 'form-object',
diff --git a/web/projects/ui/src/app/common/form/form-select/form-select.component.ts b/web/projects/ui/src/app/common/form/form-select/form-select.component.ts
index 1c4525f86..4cbd9d40c 100644
--- a/web/projects/ui/src/app/common/form/form-select/form-select.component.ts
+++ b/web/projects/ui/src/app/common/form/form-select/form-select.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecSelect } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecSelect } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { invert } from '@start9labs/shared'
 import { Control } from '../control'
 
diff --git a/web/projects/ui/src/app/common/form/form-text/form-text.component.ts b/web/projects/ui/src/app/common/form/form-text/form-text.component.ts
index 2b5b1c8a7..e21a2c46b 100644
--- a/web/projects/ui/src/app/common/form/form-text/form-text.component.ts
+++ b/web/projects/ui/src/app/common/form/form-text/form-text.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecText } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecText } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 import { getDefaultString } from 'src/app/util/config-utilities'
 
diff --git a/web/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts b/web/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts
index bead77088..671e73e31 100644
--- a/web/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts
+++ b/web/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecTextarea } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecTextarea } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 
 @Component({
diff --git a/web/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts b/web/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts
index 629a0a7fa..36a162008 100644
--- a/web/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts
+++ b/web/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ValueSpecToggle } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpecToggle } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { Control } from '../control'
 
 @Component({
diff --git a/web/projects/ui/src/app/common/form/form-union/form-union.component.ts b/web/projects/ui/src/app/common/form/form-union/form-union.component.ts
index f438fab87..e3ba4b486 100644
--- a/web/projects/ui/src/app/common/form/form-union/form-union.component.ts
+++ b/web/projects/ui/src/app/common/form/form-union/form-union.component.ts
@@ -8,10 +8,10 @@ import {
 import { ControlContainer, FormGroupName } from '@angular/forms'
 import {
   unionSelectKey,
+  unionValueKey,
   ValueSpecSelect,
   ValueSpecUnion,
-  unionValueKey,
-} from '@start9labs/start-sdk/lib/config/configTypes'
+} from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { FormService } from 'src/app/services/form.service'
 import { tuiPure } from '@taiga-ui/cdk'
 
diff --git a/web/projects/ui/src/app/common/form/hint.pipe.ts b/web/projects/ui/src/app/common/form/hint.pipe.ts
index ecc8258ea..2a48fabba 100644
--- a/web/projects/ui/src/app/common/form/hint.pipe.ts
+++ b/web/projects/ui/src/app/common/form/hint.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { ValueSpec } from '@start9labs/start-sdk/lib/config/configTypes'
+import { ValueSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 
 @Pipe({
   name: 'hint',
diff --git a/web/projects/ui/src/app/common/toast-container/notifications-toast.component.ts b/web/projects/ui/src/app/common/toast-container/notifications-toast.component.ts
index eceb6cc62..6ec48d9c6 100644
--- a/web/projects/ui/src/app/common/toast-container/notifications-toast.component.ts
+++ b/web/projects/ui/src/app/common/toast-container/notifications-toast.component.ts
@@ -28,7 +28,7 @@ export class NotificationsToastComponent {
   readonly visible$: Observable<boolean> = merge(
     this.dismiss$,
     inject(PatchDB<DataModel>)
-      .watch$('server-info', 'unreadNotifications', 'count')
+      .watch$('serverInfo', 'unreadNotifications', 'count')
       .pipe(
         pairwise(),
         map(([prev, cur]) => cur > prev),
diff --git a/web/projects/ui/src/app/common/toast-container/refresh-alert.component.ts b/web/projects/ui/src/app/common/toast-container/refresh-alert.component.ts
index 49aabce15..4c8c58d85 100644
--- a/web/projects/ui/src/app/common/toast-container/refresh-alert.component.ts
+++ b/web/projects/ui/src/app/common/toast-container/refresh-alert.component.ts
@@ -55,7 +55,7 @@ export class RefreshAlertComponent {
   readonly show$ = merge(
     this.dismiss$,
     inject(PatchDB<DataModel>)
-      .watch$('server-info', 'version')
+      .watch$('serverInfo', 'version')
       .pipe(
         map(version => !!this.emver.compare(this.config.version, version)),
         endWith(false),
diff --git a/web/projects/ui/src/app/common/toast-container/update-toast.component.ts b/web/projects/ui/src/app/common/toast-container/update-toast.component.ts
index 6396398fa..c5a43a6c8 100644
--- a/web/projects/ui/src/app/common/toast-container/update-toast.component.ts
+++ b/web/projects/ui/src/app/common/toast-container/update-toast.component.ts
@@ -55,7 +55,7 @@ export class UpdateToastComponent {
   readonly visible$: Observable<boolean> = merge(
     this.dismiss$,
     inject(PatchDB<DataModel>)
-      .watch$('server-info', 'status-info', 'updated')
+      .watch$('serverInfo', 'statusInfo', 'updated')
       .pipe(distinctUntilChanged(), filter(Boolean), endWith(false)),
   )
 
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 3577fd80f..0ca85e270 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -644,23 +644,23 @@ export module Mock {
       name: 'My Backup Job',
       target: BackupTargets.saved[0],
       cron: '0 3 * * *',
-      'package-ids': ['bitcoind', 'lnd'],
+      packageIds: ['bitcoind', 'lnd'],
     },
     {
       id: 'hahahahaha-mwmwmwmwmwmw',
       name: 'Another Backup Job',
       target: BackupTargets.saved[1],
       cron: '0 * * * *',
-      'package-ids': ['lnd'],
+      packageIds: ['lnd'],
     },
   ]
 
   export const BackupRuns: RR.GetBackupRunsRes = [
     {
       id: 'kladhbfweubdsk',
-      'started-at': new Date().toISOString(),
-      'completed-at': new Date(new Date().valueOf() + 10000).toISOString(),
-      'package-ids': ['bitcoind', 'lnd'],
+      startedAt: new Date().toISOString(),
+      completedAt: new Date(new Date().valueOf() + 10000).toISOString(),
+      packageIds: ['bitcoind', 'lnd'],
       job: BackupJobs[0],
       report: {
         server: {
@@ -675,9 +675,9 @@ export module Mock {
     },
     {
       id: 'kladhbfwhrfeubdsk',
-      'started-at': new Date().toISOString(),
-      'completed-at': new Date(new Date().valueOf() + 10000).toISOString(),
-      'package-ids': ['bitcoind', 'lnd'],
+      startedAt: new Date().toISOString(),
+      completedAt: new Date(new Date().valueOf() + 10000).toISOString(),
+      packageIds: ['bitcoind', 'lnd'],
       job: BackupJobs[0],
       report: {
         server: {
@@ -1267,6 +1267,7 @@ export module Mock {
       manifest: MockManifestBitcoind,
     },
     icon: '/assets/img/service-icons/bitcoind.svg',
+    installedAt: new Date().toISOString(),
     lastBackup: null,
     status: {
       configured: true,
@@ -1507,6 +1508,7 @@ export module Mock {
       manifest: MockManifestBitcoinProxy,
     },
     icon: '/assets/img/service-icons/btc-rpc-proxy.png',
+    installedAt: new Date().toISOString(),
     lastBackup: null,
     status: {
       configured: false,
@@ -1647,6 +1649,7 @@ export module Mock {
       manifest: MockManifestLnd,
     },
     icon: '/assets/img/service-icons/lnd.png',
+    installedAt: new Date().toISOString(),
     lastBackup: null,
     status: {
       configured: true,
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 4b7f87156..a11cddab7 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -4,8 +4,6 @@ import {
   DataModel,
   DomainInfo,
   NetworkStrategy,
-  OsOutboundProxy,
-  ServiceOutboundProxy,
   HealthCheckResult,
 } from 'src/app/services/patch-db/data-model'
 import {
@@ -90,7 +88,7 @@ export module RR {
   export type ResetTorRes = null
 
   export type SetOsOutboundProxyReq = {
-    proxy: OsOutboundProxy
+    proxy: string | null
   } // server.proxy.set-outbound
   export type SetOsOutboundProxyRes = null
 
@@ -140,9 +138,7 @@ export module RR {
   export type AddProxyRes = null
 
   export type UpdateProxyReq = {
-    name?: string
-    primaryInbound?: true
-    primaryOutbound?: true
+    name: string
   } // net.proxy.update
   export type UpdateProxyRes = null
 
@@ -305,8 +301,8 @@ export module RR {
 
   // package
 
-  export type GetPackageCredentialsReq = { id: string } // package.credentials
-  export type GetPackageCredentialsRes = Record<string, string>
+  export type GetPackagePropertiesReq = { id: string } // package.properties
+  export type GetPackagePropertiesRes = Record<string, string>
 
   export type GetPackageLogsReq = FetchLogsReq & { id: string } // package.logs
   export type GetPackageLogsRes = FetchLogsRes
@@ -335,7 +331,6 @@ export module RR {
     // package.backup.restore
     ids: string[]
     targetId: string
-    oldPassword: string | null
     password: string
   }
   export type RestorePackagesRes = null
@@ -384,7 +379,7 @@ export module RR {
 
   export type SetServiceOutboundProxyReq = {
     packageId: string
-    proxy: ServiceOutboundProxy
+    proxy: string | null
   } // package.proxy.set-outbound
   export type SetServiceOutboundProxyRes = null
 
@@ -533,9 +528,9 @@ export interface CloudBackupTarget extends BaseBackupTarget {
 
 export interface BackupRun {
   id: string
-  'started-at': string
-  'completed-at': string
-  'package-ids': string[]
+  startedAt: string
+  completedAt: string
+  packageIds: string[]
   job: BackupJob
   report: BackupReport
 }
@@ -598,8 +593,8 @@ export enum NotificationLevel {
 export type NotificationData<T> = T extends 0
   ? null
   : T extends 1
-  ? BackupReport
-  : any
+    ? BackupReport
+    : any
 
 export interface BackupReport {
   server: {
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index ab8e42ec3..31e6a116f 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -256,9 +256,9 @@ export abstract class ApiService {
 
   // package
 
-  abstract getPackageCredentials(
-    params: RR.GetPackageCredentialsReq,
-  ): Promise<RR.GetPackageCredentialsRes>
+  abstract getPackageProperties(
+    params: RR.GetPackagePropertiesReq,
+  ): Promise<RR.GetPackagePropertiesRes>
 
   abstract getPackageLogs(
     params: RR.GetPackageLogsReq,
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index ca777fb47..68d61003f 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -450,10 +450,10 @@ export class LiveApiService extends ApiService {
 
   // package
 
-  async getPackageCredentials(
-    params: RR.GetPackageCredentialsReq,
-  ): Promise<RR.GetPackageCredentialsRes> {
-    return this.rpcRequest({ method: 'package.credentials', params })
+  async getPackageProperties(
+    params: RR.GetPackagePropertiesReq,
+  ): Promise<RR.GetPackagePropertiesRes> {
+    return this.rpcRequest({ method: 'package.properties', params })
   }
 
   async getPackageLogs(
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 114cca97f..eb21dbbeb 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -538,11 +538,6 @@ export class MockApiService extends ApiService {
               domains: [],
               services: [],
             },
-            primaryInbound: type === 'inbound-outbound' ? true : false,
-            primaryOutbound:
-              type === 'inbound-outbound' || type === 'outbound' ? true : false,
-            // primaryInbound: false,
-            // primaryOutbound: false,
           },
         ],
       },
@@ -555,13 +550,11 @@ export class MockApiService extends ApiService {
   async updateProxy(params: RR.UpdateProxyReq): Promise<RR.UpdateProxyRes> {
     await pauseFor(2000)
 
-    const value = params.name || params.primaryInbound || params.primaryOutbound
-
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: `/server-info/network/proxies/0/${Object.keys(params)[0]}`,
-        value,
+        path: `/server-info/network/proxies/0/name`,
+        value: params.name,
       },
     ]
     this.mockRevision(patch)
@@ -926,9 +919,9 @@ export class MockApiService extends ApiService {
 
   // package
 
-  async getPackageCredentials(
-    params: RR.GetPackageCredentialsReq,
-  ): Promise<RR.GetPackageCredentialsRes> {
+  async getPackageProperties(
+    params: RR.GetPackagePropertiesReq,
+  ): Promise<RR.GetPackagePropertiesRes> {
     await pauseFor(2000)
     return {
       password: 'specialPassword$',
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 12d319509..6b0edbfaa 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -110,10 +110,6 @@ export const mockPatchData: DataModel = {
         ],
       },
       proxies: [],
-      primaryProxies: {
-        inbound: null,
-        outbound: null,
-      },
       outboundProxy: null,
     },
     lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
@@ -153,6 +149,7 @@ export const mockPatchData: DataModel = {
         },
       },
       icon: '/assets/img/service-icons/bitcoind.svg',
+      installedAt: new Date().toISOString(),
       lastBackup: null,
       status: {
         configured: true,
@@ -419,6 +416,7 @@ export const mockPatchData: DataModel = {
         },
       },
       icon: '/assets/img/service-icons/lnd.png',
+      installedAt: new Date().toISOString(),
       lastBackup: null,
       status: {
         configured: true,
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 9a0512567..e8cd12003 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -1,16 +1,13 @@
 import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
-import { types } from '@start9labs/start-sdk'
+import { T } from '@start9labs/start-sdk'
 import {
   PackageDataEntry,
   PackageMainStatus,
   PackageState,
 } from 'src/app/services/patch-db/data-model'
 
-type HostnameInfoIp = types.HostnameInfoIp
-type HostnameInfoOnion = types.HostnameInfoOnion
-
 const {
   gitHash,
   useMocks,
@@ -87,10 +84,8 @@ export class ConfigService {
   }
 
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-  launchableAddress(interfaces: PackageDataEntry['serviceInterfaces']): string {
-    const ui = Object.values(interfaces).find(i => i.type === 'ui')
-
-    if (!ui) return ''
+  launchableAddress(ui: T.ServiceInterfaceWithHostInfo): string {
+    if (ui.type !== 'ui') return ''
 
     const host = ui.hostInfo
     const addressInfo = ui.addressInfo
@@ -102,14 +97,14 @@ export class ConfigService {
     if (host.kind === 'multi') {
       const onionHostname = host.hostnames.find(
         (h: any) => h.kind === 'onion',
-      ) as HostnameInfoOnion
+      ) as T.HostnameInfoOnion
 
       if (this.isTor() && onionHostname) {
         url.hostname = onionHostname.hostname.value
       } else {
         const ipHostname = host.hostnames.find(
           (h: any) => h.kind === 'ip',
-        ) as HostnameInfoIp
+        ) as T.HostnameInfoIp
 
         if (!ipHostname) return ''
 
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index 0b57acd83..3c6b97fdb 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -30,7 +30,7 @@ import {
   unionSelectKey,
   unionValueKey,
   isValueSpecListOf,
-} from '@start9labs/start-sdk/lib/config/configTypes'
+} from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 const Mustache = require('mustache')
 
 @Injectable({
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 5cda874ee..0fbd233d3 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -1,15 +1,13 @@
 import { BackupJob, ServerNotifications } from '../api/api.types'
 import { Url } from '@start9labs/shared'
 import { Manifest } from '@start9labs/marketplace'
-import { types } from '@start9labs/start-sdk'
+import { T } from '@start9labs/start-sdk'
 import {
   ActionMetadata,
   HostnameInfo,
 } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 import { customSmtp } from '@start9labs/start-sdk/cjs/sdk/lib/config/configConstants'
 
-type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
-
 export interface DataModel {
   serverInfo: ServerInfo
   packageData: { [id: string]: PackageDataEntry }
@@ -87,11 +85,7 @@ export type NetworkInfo = {
     forwards: PortForward[]
   }
   proxies: Proxy[]
-  outboundProxy: OsOutboundProxy
-  primaryProxies: {
-    inbound: string | null
-    outbound: string | null
-  }
+  outboundProxy: string | null
 }
 
 export type DomainInfo = {
@@ -99,10 +93,6 @@ export type DomainInfo = {
   subdomain: string | null
 }
 
-export type InboundProxy = { proxyId: string } | 'primary' | null
-export type OsOutboundProxy = InboundProxy
-export type ServiceOutboundProxy = OsOutboundProxy | 'mirror'
-
 export type PortForward = {
   assigned: number
   override: number | null
@@ -127,7 +117,7 @@ export type Domain = {
 }
 
 export type NetworkStrategy =
-  | { proxyId: string | null } // null means system primary
+  | { proxy: string }
   | { ipStrategy: 'ipv4' | 'ipv6' | 'dualstack' }
 
 export type Proxy = {
@@ -141,8 +131,6 @@ export type Proxy = {
     services: { id: string | null; title: string }[] // implies outbound - null means startos
     domains: string[] // implies inbound
   }
-  primaryInbound: boolean
-  primaryOutbound: boolean
 }
 
 export interface IpInfo {
@@ -164,12 +152,6 @@ export interface ServerStatusInfo {
   shuttingDown: boolean
 }
 
-export enum ServerStatus {
-  Running = 'running',
-  Updated = 'updated',
-  BackingUp = 'backing-up',
-}
-
 export type PackageDataEntry<T extends StateInfo = StateInfo> = {
   stateInfo: T
   icon: Url
@@ -183,10 +165,11 @@ export type PackageDataEntry<T extends StateInfo = StateInfo> = {
       icon: Url
     }
   }
-  serviceInterfaces: Record<string, ServiceInterfaceWithHostInfo>
+  serviceInterfaces: Record<string, T.ServiceInterfaceWithHostInfo>
   marketplaceUrl: string | null
   developerKey: string
-  outboundProxy: ServiceOutboundProxy
+  installedAt: string
+  outboundProxy: string | null
 }
 
 export type StateInfo = InstalledState | InstallingState | UpdatingState
@@ -194,11 +177,13 @@ export type StateInfo = InstalledState | InstallingState | UpdatingState
 export type InstalledState = {
   state: PackageState.Installed | PackageState.Removing
   manifest: Manifest
+  installingInfo?: undefined
 }
 
 export type InstallingState = {
   state: PackageState.Installing | PackageState.Restoring
   installingInfo: InstallingInfo
+  manifest?: undefined
 }
 
 export type UpdatingState = {
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index 5c7aa3b48..ea10ca51a 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -52,10 +52,6 @@ function getHealthStatus(status: Status): HealthStatus | null {
 
   const values = Object.values(status.main.health)
 
-  if (values.some(h => !h.result)) {
-    return HealthStatus.Waiting
-  }
-
   if (values.some(h => h.result === 'failure')) {
     return HealthStatus.Failure
   }
@@ -101,7 +97,6 @@ export enum DependencyStatus {
 
 export enum HealthStatus {
   Failure = 'failure',
-  Waiting = 'waiting',
   Starting = 'starting',
   Loading = 'loading',
   Healthy = 'healthy',
diff --git a/web/projects/ui/src/app/services/proxy.service.ts b/web/projects/ui/src/app/services/proxy.service.ts
index 2cb09ac97..fe61750e7 100644
--- a/web/projects/ui/src/app/services/proxy.service.ts
+++ b/web/projects/ui/src/app/services/proxy.service.ts
@@ -1,8 +1,5 @@
 import { Injectable } from '@angular/core'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
-import { Value } from '@start9labs/start-sdk/lib/config/builder/value'
-import { Variants } from '@start9labs/start-sdk/lib/config/builder/variants'
 import { TuiDialogOptions } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom } from 'rxjs'
@@ -13,11 +10,9 @@ import {
 import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import { ApiService } from './api/embassy-api.service'
-import {
-  DataModel,
-  OsOutboundProxy,
-  ServiceOutboundProxy,
-} from './patch-db/data-model'
+import { DataModel } from './patch-db/data-model'
+import { Config } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/config'
+import { Value } from '@start9labs/start-sdk/cjs/sdk/lib/config/builder/value'
 
 @Injectable({
   providedIn: 'root',
@@ -31,84 +26,25 @@ export class ProxyService {
     private readonly errorService: ErrorService,
   ) {}
 
-  async presentModalSetOutboundProxy(serviceContext?: {
-    packageId: string
-    outboundProxy: ServiceOutboundProxy
-    hasP2P: boolean
-  }) {
+  async presentModalSetOutboundProxy(current: string | null, pkgId?: string) {
     const network = await firstValueFrom(
-      this.patch.watch$('server-info', 'network'),
+      this.patch.watch$('serverInfo', 'network'),
     )
-
-    const outboundProxy = serviceContext?.outboundProxy
-
-    const defaultValue = !outboundProxy
-      ? 'none'
-      : outboundProxy === 'primary'
-        ? 'primary'
-        : outboundProxy === 'mirror'
-          ? 'mirror'
-          : 'other'
-
-    let variants: Record<string, { name: string; spec: Config<any> }> = {}
-
-    if (serviceContext) {
-      variants['mirror'] = {
-        name: 'Mirror P2P Interface',
-        spec: Config.of({}),
-      }
-    }
-
-    variants = {
-      ...variants,
-      primary: {
-        name: 'Use System Primary',
-        spec: Config.of({}),
-      },
-      other: {
-        name: 'Other',
-        spec: Config.of({
-          proxyId: Value.select({
-            name: 'Select Specific Proxy',
-            required: {
-              default:
-                outboundProxy && typeof outboundProxy !== 'string'
-                  ? outboundProxy.proxyId
-                  : null,
-            },
-            values: network.proxies
-              .filter(
-                p => p.type === 'outbound' || p.type === 'inbound-outbound',
-              )
-              .reduce((prev, curr) => {
-                return {
-                  [curr.id]: curr.name,
-                  ...prev,
-                }
-              }, {}),
-          }),
-        }),
-      },
-      none: {
-        name: 'None',
-        spec: Config.of({}),
-      },
-    }
-
     const config = Config.of({
-      proxy: Value.union(
-        {
-          name: 'Select Proxy',
-          required: { default: defaultValue },
-          description: `
-  <h5>Use System Primary</h5>The primary <i>inbound</i> proxy will be used. If you do not have a primary inbound proxy, no proxy will be used
-  <h5>Mirror Primary Interface</h5>If you have an inbound proxy enabled for the primary interface, outbound traffic will flow through the same proxy
-  <h5>Other</h5>The specific proxy you select will be used, overriding the default
-  `,
-          disabled: serviceContext?.hasP2P ? [] : ['mirror'],
-        },
-        Variants.of(variants),
-      ),
+      proxyId: Value.select({
+        name: 'Select Proxy',
+        required: { default: current },
+        values: network.proxies
+          .filter(
+            p => p.type === 'outbound' || p.type === 'inbound-outbound',
+          )
+          .reduce((prev, curr) => {
+            return {
+              [curr.id]: curr.name,
+              ...prev,
+            }
+          }, {}),
+      }),
     })
 
     const options: Partial<
@@ -125,15 +61,7 @@ export class ProxyService {
           {
             text: 'Save',
             handler: async value => {
-              const proxy =
-                value.proxy.unionSelectKey === 'none'
-                  ? null
-                  : value.proxy.unionSelectKey === 'primary'
-                    ? 'primary'
-                    : value.proxy.unionSelectKey === 'mirror'
-                      ? 'mirror'
-                      : { proxyId: value.proxy.unionValueKey.proxyId }
-              await this.saveOutboundProxy(proxy, serviceContext?.packageId)
+              await this.saveOutboundProxy(value.proxyId, pkgId)
               return true
             },
           },
@@ -144,7 +72,7 @@ export class ProxyService {
   }
 
   private async saveOutboundProxy(
-    proxy: OsOutboundProxy | ServiceOutboundProxy,
+    proxy: string | null,
     packageId?: string,
   ) {
     const loader = this.loader.open(`Saving`).subscribe()
@@ -153,7 +81,7 @@ export class ProxyService {
       if (packageId) {
         await this.api.setServiceOutboundProxy({ packageId, proxy })
       } else {
-        await this.api.setOsOutboundProxy({ proxy: proxy as OsOutboundProxy })
+        await this.api.setOsOutboundProxy({ proxy })
       }
     } catch (e: any) {
       this.errorService.handleError(e)
diff --git a/web/projects/ui/src/app/util/clearnetAddress.ts b/web/projects/ui/src/app/util/clearnetAddress.ts
deleted file mode 100644
index 94d483ece..000000000
--- a/web/projects/ui/src/app/util/clearnetAddress.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { DomainInfo } from '../services/patch-db/data-model'
-
-export function getClearnetAddress(
-  protocol: string,
-  domainInfo: DomainInfo | null,
-  path = '',
-) {
-  if (!domainInfo) return ''
-  const subdomain = domainInfo.subdomain ? `${domainInfo.subdomain}.` : ''
-  return `${protocol}://${subdomain}${domainInfo.domain}${path}`
-}
diff --git a/web/projects/ui/src/app/util/config-utilities.ts b/web/projects/ui/src/app/util/config-utilities.ts
index b105f56a0..b687f58f3 100644
--- a/web/projects/ui/src/app/util/config-utilities.ts
+++ b/web/projects/ui/src/app/util/config-utilities.ts
@@ -1,4 +1,4 @@
-import { DefaultString } from '@start9labs/start-sdk/lib/config/configTypes'
+import { DefaultString } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 
 export class Range {
   min?: number
diff --git a/web/projects/ui/src/app/util/configBuilderToSpec.ts b/web/projects/ui/src/app/util/configBuilderToSpec.ts
index 0174c65e5..933024342 100644
--- a/web/projects/ui/src/app/util/configBuilderToSpec.ts
+++ b/web/projects/ui/src/app/util/configBuilderToSpec.ts
@@ -1,4 +1,4 @@
-import { Config } from '@start9labs/start-sdk/lib/config/builder/config'
+import { Config } from "@start9labs/start-sdk/cjs/sdk/lib/config/builder/config";
 
 export async function configBuilderToSpec(
   builder:
diff --git a/web/projects/ui/src/app/util/get-package-info.ts b/web/projects/ui/src/app/util/get-package-info.ts
index be45db327..03a6ed305 100644
--- a/web/projects/ui/src/app/util/get-package-info.ts
+++ b/web/projects/ui/src/app/util/get-package-info.ts
@@ -26,7 +26,6 @@ export function getPackageInfo(
     warning: statuses.primary === PrimaryStatus.NeedsConfig,
     transitioning:
       primaryRendering.showDots ||
-      statuses.health === HealthStatus.Waiting ||
       statuses.health === HealthStatus.Loading ||
       statuses.health === HealthStatus.Starting,
   }