diff --git a/proxy.conf.json b/proxy.conf.json
index dfc5e8a..b4bfb50 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -8,11 +8,5 @@
     "target": "http://localhost:8083",
     "secure": false,
     "changeOrigin": true
-  },
-  "/api": {
-    "target": "http://localhost:8080",
-    "secure": false,
-    "changeOrigin": true,
-    "ws": true
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/components/input-card/input-card.component.html b/src/app/components/input-card/input-card.component.html
index 0239946..bdc6202 100644
--- a/src/app/components/input-card/input-card.component.html
+++ b/src/app/components/input-card/input-card.component.html
@@ -2,23 +2,11 @@
   <label>{{ label }}</label>
 
   @if (inputType === 'textarea') {
-    <textarea
-      #textareaInput
-      [placeholder]="placeholder"
-      [value]="value"
-      [rows]="rows"
-      (input)="onValueChange(textareaInput.value)"
-      class="form-input"
-    ></textarea>
+  <textarea #textareaInput [placeholder]="placeholder" [value]="value" [rows]="rows"
+    (input)="onValueChange(textareaInput.value)" class="form-input"></textarea>
   } @else {
-    <input
-      #textInput
-      type="text"
-      [placeholder]="placeholder"
-      [value]="value"
-      (input)="onValueChange(textInput.value)"
-      class="form-input"
-    />
+  <input #textInput type="text" [placeholder]="placeholder" [value]="value" (input)="onValueChange(textInput.value)"
+    class="form-input" />
   }
 
   <button type="button" class="app-btn w-100" (click)="onButtonClick()">
@@ -26,6 +14,6 @@
   </button>
 
   @if (hintText) {
-    <p class="hint-text">{{ hintText }}</p>
+  <p class="hint-text">{{ hintText }}</p>
   }
-</section>
+</section>
\ No newline at end of file
diff --git a/src/app/components/promotion-dialog/promotion-dialog.component.html b/src/app/components/promotion-dialog/promotion-dialog.component.html
index f93ad2b..420e0bc 100644
--- a/src/app/components/promotion-dialog/promotion-dialog.component.html
+++ b/src/app/components/promotion-dialog/promotion-dialog.component.html
@@ -2,26 +2,22 @@
   <div class="promotion-dialog">
     <div class="promotion-header">
       <h3>Pawn Promotion</h3>
-      <button class="app-btn" (click)="close()" aria-label="Close" style="padding:0.2rem 0.5rem;min-width:unset;">&times;</button>
+      <button class="app-btn" (click)="close()" aria-label="Close"
+        style="padding:0.2rem 0.5rem;min-width:unset;">&times;</button>
     </div>
-    
+
     <div class="promotion-body">
       <p class="promotion-prompt">Choose a piece to promote your pawn to:</p>
-      
+
       <div class="promotion-options">
         @for (piece of promotionPieces; track piece.type) {
-          <button
-            type="button"
-            class="app-btn promotion-choice"
-            [attr.data-piece]="piece.type"
-            (click)="selectPromotion(piece.type)"
-            [title]="piece.label"
-          >
-            <span class="piece-symbol">{{ piece.symbol }}</span>
-            <span class="piece-label">{{ piece.label }}</span>
-          </button>
+        <button type="button" class="app-btn promotion-choice" [attr.data-piece]="piece.type"
+          (click)="selectPromotion(piece.type)" [title]="piece.label">
+          <span class="piece-symbol">{{ piece.symbol }}</span>
+          <span class="piece-label">{{ piece.label }}</span>
+        </button>
         }
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/game/game.component.css b/src/app/pages/game/game.component.css
index 5e32f0c..130e475 100644
--- a/src/app/pages/game/game.component.css
+++ b/src/app/pages/game/game.component.css
@@ -30,6 +30,7 @@
 
 header {
   margin-bottom: var(--size-xl);
+  margin-bottom: var(--size-xl);
 }
 
 h1,
@@ -37,9 +38,13 @@ h2 {
   color: var(--color-text-primary);
   margin: 0 0 var(--size-md);
   font-size: var(--heading-h1);
+  color: var(--color-text-primary);
+  margin: 0 0 var(--size-md);
+  font-size: var(--heading-h1);
 }
 
 .meta {
+  color: var(--color-text-primary);
   color: var(--color-text-primary);
   font-size: 0.95rem;
 }
@@ -48,6 +53,8 @@ h2 {
   display: inline-block;
   margin-bottom: var(--size-sm);
   color: var(--color-text-primary);
+  margin-bottom: var(--size-sm);
+  color: var(--color-text-primary);
   text-decoration: none;
   font-weight: 600;
 }
@@ -110,6 +117,10 @@ h2 {
 }
 
 .board-section {
+  background: var(--color-bg-board);
+  border: var(--border-width) solid var(--color-border);
+  border-radius: var(--border-radius-md);
+  padding: clamp(var(--size-sm), 1vw, var(--size-lg));
   background: var(--color-bg-board);
   border: var(--border-width) solid var(--color-border);
   border-radius: var(--border-radius-md);
@@ -316,6 +327,7 @@ h2 {
 @media (max-width: 991px) {
   .game-card {
     padding: clamp(var(--size-md), 1.5vw, var(--size-lg));
+    padding: clamp(var(--size-md), 1.5vw, var(--size-lg));
   }
 
   .board-section {
@@ -325,25 +337,30 @@ h2 {
   h1,
   h2 {
     font-size: var(--heading-h1-tablet);
+    font-size: var(--heading-h1-tablet);
   }
 }
 
 @media (max-width: 768px) {
   .game-shell {
     padding: clamp(var(--size-sm), 1.5vw, var(--size-lg));
+    padding: clamp(var(--size-sm), 1.5vw, var(--size-lg));
   }
 
   .game-card {
     padding: clamp(var(--size-sm), 1vw, var(--size-md));
+    padding: clamp(var(--size-sm), 1vw, var(--size-md));
   }
 
   header {
     margin-bottom: var(--size-lg);
+    margin-bottom: var(--size-lg);
   }
 
   h1,
   h2 {
     font-size: var(--heading-h1-mobile);
+    font-size: var(--heading-h1-mobile);
   }
 
   .meta {
@@ -353,6 +370,8 @@ h2 {
   .top-section {
     gap: var(--size-xs);
     margin-bottom: var(--size-xs);
+    gap: var(--size-xs);
+    margin-bottom: var(--size-xs);
   }
 
   .board-section {
@@ -363,19 +382,24 @@ h2 {
 @media (max-width: 480px) {
   .game-shell {
     padding: var(--size-sm);
+    padding: var(--size-sm);
   }
 
   .game-card {
     padding: var(--size-sm);
     border-radius: var(--border-radius-md);
+    padding: var(--size-sm);
+    border-radius: var(--border-radius-md);
   }
 
   header {
     margin-bottom: var(--size-md);
+    margin-bottom: var(--size-md);
   }
 
   h1 {
     font-size: var(--heading-h1-small);
+    font-size: var(--heading-h1-small);
   }
 
   .meta {
@@ -385,6 +409,8 @@ h2 {
   .top-section {
     gap: var(--size-xs-gap);
     margin-bottom: var(--size-xs);
+    gap: var(--size-xs-gap);
+    margin-bottom: var(--size-xs);
   }
 
   .board-section {
diff --git a/src/app/pages/game/game.component.html b/src/app/pages/game/game.component.html
index baad535..dac651b 100644
--- a/src/app/pages/game/game.component.html
+++ b/src/app/pages/game/game.component.html
@@ -1,9 +1,6 @@
 <main class="game-shell" [class.theme-dark]="isDarkMode">
-  <app-promotion-dialog
-    [isOpen]="facade.isPromotionDialogOpen"
-    (promotionSelected)="facade.onPromotionSelected($event)"
-    (closed)="facade.onPromotionClosed()"
-  />
+  <app-promotion-dialog [isOpen]="facade.isPromotionDialogOpen" (promotionSelected)="facade.onPromotionSelected($event)"
+    (closed)="facade.onPromotionClosed()" />
 
   <section class="game-card">
     <header class="mb-3">
@@ -13,150 +10,126 @@
     </header>
 
     @if (facade.loading) {
-      <p>Loading game state...</p>
+    <p>Loading game state...</p>
     } @else if (facade.state) {
-      @if (facade.isGameFinished && facade.gameCompletionMessage) {
-        <div class="game-completion-alert alert alert-success mb-3">
-          <h2 class="completion-title">{{ facade.gameCompletionMessage }}</h2>
-          <p class="completion-subtitle mb-0">
-            <a routerLink="/" class="completion-link">Start a new game</a>
-          </p>
+    @if (facade.isGameFinished && facade.gameCompletionMessage) {
+    <div class="game-completion-alert alert alert-success mb-3">
+      <h2 class="completion-title">{{ facade.gameCompletionMessage }}</h2>
+      <p class="completion-subtitle mb-0">
+        <a routerLink="/" class="completion-link">Start a new game</a>
+      </p>
+    </div>
+    }
+    @if (facade.isGameFinished && facade.gameCompletionMessage) {
+    <div class="game-completion-alert alert alert-success mb-3">
+      <h2 class="completion-title">{{ facade.gameCompletionMessage }}</h2>
+      <p class="completion-subtitle mb-0">
+        <a routerLink="/" class="completion-link">Start a new game</a>
+      </p>
+    </div>
+    }
+    <div class="container-fluid">
+      <div class="row g-3">
+        <!-- Left Sidebar - Dummy Timers -->
+        <div class="col-lg-3 col-md-6 col-12 order-lg-1 order-2">
+          <section class="timer-card">
+            <h2>Timers</h2>
+            <div class="player-timer" [class.active-timer]="facade.state.turn === 'white'">
+              <p class="timer-label">White</p>
+              <p class="timer-value">{{ formatTimer(whiteTimerSeconds) }}</p>
+            </div>
+            <div class="player-timer" [class.active-timer]="facade.state.turn === 'black'">
+              <p class="timer-label">Black</p>
+              <p class="timer-value">{{ formatTimer(blackTimerSeconds) }}</p>
+            </div>
+          </section>
         </div>
-      }
-      <div class="container-fluid">
-        <div class="row g-3">
-          <!-- Left Sidebar - Dummy Timers -->
-          <div class="col-lg-3 col-md-6 col-12 order-lg-1 order-2">
-            <section class="timer-card">
-              <h2>Timers</h2>
-              <div class="player-timer" [class.active-timer]="facade.state.turn === 'white'">
-                <p class="timer-label">White</p>
-                <p class="timer-value">{{ formatTimer(whiteTimerSeconds) }}</p>
-              </div>
-              <div class="player-timer" [class.active-timer]="facade.state.turn === 'black'">
-                <p class="timer-label">Black</p>
-                <p class="timer-value">{{ formatTimer(blackTimerSeconds) }}</p>
-              </div>
-            </section>
-          </div>
 
-          <!-- Center - Chess Board -->
-          <div class="col-lg-6 col-md-12 col-12 order-lg-2 order-1">
-            <section class="center-column d-flex flex-column h-100">
-              <div class="board-section flex-grow-1 d-flex align-items-center justify-content-center">
-                <app-chess-board
-                  [fen]="facade.state.fen"
-                  [selectedSquare]="facade.selectedSquare"
-                  [highlightedSquares]="facade.highlightedSquares"
-                  [boardTheme]="boardTheme"
-                  (squareSelected)="facade.onBoardSquareSelected($event)"
-                />
-              </div>
+        <!-- Center - Chess Board -->
+        <div class="col-lg-6 col-md-12 col-12 order-lg-2 order-1">
+          <section class="center-column d-flex flex-column h-100">
+            <div class="board-section flex-grow-1 d-flex align-items-center justify-content-center">
+              <app-chess-board [fen]="facade.state.fen" [selectedSquare]="facade.selectedSquare"
+                [highlightedSquares]="facade.highlightedSquares" [boardTheme]="boardTheme"
+                (squareSelected)="facade.onBoardSquareSelected($event)" />
+            </div>
 
-              <section class="top-section">
-                <section class="board-theme-card" aria-label="Board design chooser">
-                  <h3>Board Design</h3>
-                  <div class="board-theme-group" role="radiogroup" aria-label="Board design">
-                    <label class="board-theme-option">
-                      <input
-                        type="radio"
-                        name="boardTheme"
-                        [checked]="boardTheme === 'arabian'"
-                        (change)="setBoardTheme('arabian')"
-                      />
-                      <span>Arabian</span>
-                    </label>
+            <section class="top-section">
+              <section class="board-theme-card" aria-label="Board design chooser">
+                <h3>Board Design</h3>
+                <div class="board-theme-group" role="radiogroup" aria-label="Board design">
+                  <label class="board-theme-option">
+                    <input type="radio" name="boardTheme" [checked]="boardTheme === 'arabian'"
+                      (change)="setBoardTheme('arabian')" />
+                    <span>Arabian</span>
+                  </label>
 
-                    <label class="board-theme-option">
-                      <input
-                        type="radio"
-                        name="boardTheme"
-                        [checked]="boardTheme === 'classic'"
-                        (change)="setBoardTheme('classic')"
-                      />
-                      <span>Classic</span>
-                    </label>
-                  </div>
-                </section>
-
-                <app-input-card
-                  label="Play move (UCI)"
-                  placeholder="e2e4"
-                  buttonLabel="Send Move"
-                  inputType="input"
-                  [value]="facade.moveInput"
-                  cardClass="move-card"
-                  hintText="Click your piece to highlight legal targets."
-                  (valueChange)="facade.moveInput = $event"
-                  (buttonClick)="facade.submitMove()"
-                />
+                  <label class="board-theme-option">
+                    <input type="radio" name="boardTheme" [checked]="boardTheme === 'classic'"
+                      (change)="setBoardTheme('classic')" />
+                    <span>Classic</span>
+                  </label>
+                </div>
               </section>
+
+              <app-input-card label="Play move (UCI)" placeholder="e2e4" buttonLabel="Send Move" inputType="input"
+                [value]="facade.moveInput" cardClass="move-card" hintText="Click your piece to highlight legal targets."
+                (valueChange)="facade.moveInput = $event" (buttonClick)="facade.submitMove()" />
             </section>
-          </div>
+          </section>
+        </div>
 
-          <!-- Right Sidebar - Export -->
-          <div class="col-lg-3 col-md-6 col-12 order-lg-3 order-3">
-            <section class="history-card">
-              <h2>Move History</h2>
+        <!-- Right Sidebar - Export -->
+        <div class="col-lg-3 col-md-6 col-12 order-lg-3 order-3">
+          <section class="history-card">
+            <h2>Move History</h2>
 
-              @if (facade.state.moves.length === 0) {
-                <p class="history-empty">No moves yet.</p>
-              } @else {
-                <ol class="history-list">
-                  @for (move of facade.state.moves; track $index) {
-                    <li>
-                      <span class="history-number">{{ $index + 1 }}.</span>
-                      <span class="history-move">{{ move }}</span>
-                    </li>
-                  }
-                </ol>
+            @if (facade.state.moves.length === 0) {
+            <p class="history-empty">No moves yet.</p>
+            } @else {
+            <ol class="history-list">
+              @for (move of facade.state.moves; track $index) {
+              <li>
+                <span class="history-number">{{ $index + 1 }}.</span>
+                <span class="history-move">{{ move }}</span>
+              </li>
               }
-            </section>
+            </ol>
+            }
+          </section>
 
-            <section class="export-card">
-              <h2>Export</h2>
-              <div class="export-mode-group" role="radiogroup" aria-label="Export mode">
-                <label class="export-mode-option">
-                  <input
-                    type="radio"
-                    name="exportType"
-                    [checked]="exportType === 'fen'"
-                    (change)="setExportType('fen')"
-                  />
-                  <span>FEN</span>
-                </label>
-                <label class="export-mode-option">
-                  <input
-                    type="radio"
-                    name="exportType"
-                    [checked]="exportType === 'pgn'"
-                    (change)="setExportType('pgn')"
-                  />
-                  <span>PGN</span>
-                </label>
-              </div>
+          <section class="export-card">
+            <h2>Export</h2>
+            <div class="export-mode-group" role="radiogroup" aria-label="Export mode">
+              <label class="export-mode-option">
+                <input type="radio" name="exportType" [checked]="exportType === 'fen'"
+                  (change)="setExportType('fen')" />
+                <span>FEN</span>
+              </label>
+              <label class="export-mode-option">
+                <input type="radio" name="exportType" [checked]="exportType === 'pgn'"
+                  (change)="setExportType('pgn')" />
+                <span>PGN</span>
+              </label>
+            </div>
 
-              <textarea
-                class="export-text"
-                [value]="exportValue"
-                [placeholder]="exportType === 'fen' ? 'FEN will appear here' : 'PGN will appear here'"
-                rows="8"
-                readonly
-              ></textarea>
+            <textarea class="export-text" [value]="exportValue"
+              [placeholder]="exportType === 'fen' ? 'FEN will appear here' : 'PGN will appear here'" rows="8"
+              readonly></textarea>
 
-              <button type="button" class="app-btn w-100" (click)="completeExport()">Done</button>
+            <button type="button" class="app-btn w-100" (click)="completeExport()">Done</button>
 
-              @if (exportNotice) {
-                <p class="export-note">{{ exportNotice }}</p>
-              }
-            </section>
-          </div>
+            @if (exportNotice) {
+            <p class="export-note">{{ exportNotice }}</p>
+            }
+          </section>
         </div>
       </div>
+    </div>
     }
 
     @if (facade.errorMessage) {
-      <p class="alert alert-danger mt-3 mb-0">{{ facade.errorMessage }}</p>
+    <p class="alert alert-danger mt-3 mb-0">{{ facade.errorMessage }}</p>
     }
   </section>
-</main>
+</main>
\ No newline at end of file
diff --git a/src/app/pages/welcome/welcome.component.html b/src/app/pages/welcome/welcome.component.html
index 9cfe144..ec83f91 100644
--- a/src/app/pages/welcome/welcome.component.html
+++ b/src/app/pages/welcome/welcome.component.html
@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="bpart" style="height:36vh;">
-          <div style="padding:5px 5px 0;">
+          <div>
             <div class="bb">
               <div class="bb-tag">JOIN</div>
               <div class="bb-title">JOIN<br />GAME</div>
@@ -94,8 +94,7 @@
               <div class="bb-tag">WELCOME</div>
               <div class="bb-title" style="font-size:clamp(16px,1.8vw,26px);">WELCOME TO<br />NOWCHESS</div>
               <div class="bb-subtitle">Play your next move from the skyline.</div>
-              <button type="button" class="app-btn" (click)="startOneVsOne()"
-                [disabled]="creating">
+              <button type="button" class="app-btn" (click)="startOneVsOne()" [disabled]="creating">
                 {{ creating ? 'CREATING...' : 'START NOW →' }}
               </button>
             </div>
@@ -248,8 +247,7 @@
         [placeholder]="importMode === 'fen' ? 'Paste FEN here' : 'Paste PGN here'" [disabled]="importing"
         rows="5"></textarea>
       <div class="dialog-actions">
-        <button type="button" class="app-btn" (click)="submitImportGame()"
-          [disabled]="importing || !importText.trim()">
+        <button type="button" class="app-btn" (click)="submitImportGame()" [disabled]="importing || !importText.trim()">
           {{ importing ? 'IMPORTING...' : 'IMPORT' }}
         </button>
         <button type="button" class="app-btn" (click)="closeImportDialog()" [disabled]="importing">CANCEL</button>
diff --git a/src/styles-variables.css b/src/styles-variables.css
index 4b83bf2..8ff4919 100644
--- a/src/styles-variables.css
+++ b/src/styles-variables.css
@@ -1,6 +1,3 @@
-/* ========================================
-   COLOR VARIABLES - Semantic Naming
-   ======================================== */
 
 /* Light Mode Colors (Default) */
 :root:not([data-theme='dark']) {