diff --git a/public/themes-manifest.json b/public/themes-manifest.json
index e5faf01..c3fed76 100644
--- a/public/themes-manifest.json
+++ b/public/themes-manifest.json
@@ -12,5 +12,5 @@
       "hasMasterSlide": true
     }
   },
-  "generated": "2025-08-20T22:36:56.857Z"
+  "generated": "2025-08-21T11:07:28.288Z"
 }
\ No newline at end of file
diff --git a/src/components/presentations/AspectRatioSelector.css b/src/components/presentations/AspectRatioSelector.css
new file mode 100644
index 0000000..29c029d
--- /dev/null
+++ b/src/components/presentations/AspectRatioSelector.css
@@ -0,0 +1,88 @@
+.aspect-ratio-selection h2 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 0.5rem;
+}
+
+.section-description {
+  color: #6b7280;
+  margin-bottom: 1.5rem;
+  font-size: 0.875rem;
+}
+
+.aspect-ratio-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  gap: 1rem;
+  margin-bottom: 2rem;
+}
+
+.aspect-ratio-card {
+  border: 2px solid #e5e7eb;
+  border-radius: 0.75rem;
+  padding: 1rem;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  background: #ffffff;
+}
+
+.aspect-ratio-card:hover {
+  border-color: #3b82f6;
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15);
+}
+
+.aspect-ratio-card.selected {
+  border-color: #3b82f6;
+  background: #eff6ff;
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15);
+}
+
+.aspect-ratio-preview {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 60px;
+  margin-bottom: 1rem;
+  background: #f9fafb;
+  border-radius: 0.5rem;
+}
+
+.preview-box {
+  background: #3b82f6;
+  border-radius: 2px;
+}
+
+.preview-box.aspect-16-9 {
+  width: 48px;
+  height: 27px;
+}
+
+.preview-box.aspect-4-3 {
+  width: 40px;
+  height: 30px;
+}
+
+.preview-box.aspect-1-1 {
+  width: 32px;
+  height: 32px;
+}
+
+.aspect-ratio-info h3 {
+  font-size: 1rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 0.25rem;
+}
+
+.ratio-description {
+  color: #6b7280;
+  font-size: 0.75rem;
+  margin-bottom: 0.5rem;
+}
+
+.ratio-dimensions {
+  font-size: 0.75rem;
+  color: #9ca3af;
+  font-weight: 500;
+}
\ No newline at end of file
diff --git a/src/components/presentations/AspectRatioSelector.tsx b/src/components/presentations/AspectRatioSelector.tsx
new file mode 100644
index 0000000..62099a8
--- /dev/null
+++ b/src/components/presentations/AspectRatioSelector.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import type { AspectRatio } from '../../types/presentation';
+import { ASPECT_RATIOS } from '../../types/presentation';
+import './AspectRatioSelector.css';
+
+interface AspectRatioSelectorProps {
+  selectedAspectRatio: AspectRatio;
+  onAspectRatioChange: (ratio: AspectRatio) => void;
+}
+
+export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
+  selectedAspectRatio,
+  onAspectRatioChange
+}) => {
+  return (
+    <section className="aspect-ratio-selection">
+      <h2>Choose Aspect Ratio</h2>
+      <p className="section-description">
+        Select the aspect ratio that best fits your display setup
+      </p>
+      
+      <div className="aspect-ratio-grid">
+        {ASPECT_RATIOS.map((ratio) => (
+          <div
+            key={ratio.id}
+            className={`aspect-ratio-card ${selectedAspectRatio === ratio.id ? 'selected' : ''}`}
+            onClick={() => onAspectRatioChange(ratio.id)}
+          >
+            <div className="aspect-ratio-preview">
+              <div className={`preview-box ${ratio.cssClass}`}></div>
+            </div>
+            <div className="aspect-ratio-info">
+              <h3>{ratio.name}</h3>
+              <p className="ratio-description">{ratio.description}</p>
+              <div className="ratio-dimensions">
+                {ratio.width} × {ratio.height}
+              </div>
+            </div>
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/CreationActions.css b/src/components/presentations/CreationActions.css
new file mode 100644
index 0000000..0db2ed2
--- /dev/null
+++ b/src/components/presentations/CreationActions.css
@@ -0,0 +1,96 @@
+.creation-actions {
+  margin-top: 2rem;
+}
+
+.selected-theme-info {
+  margin-bottom: 2rem;
+}
+
+.theme-preview-info h3 {
+  font-size: 1.125rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 0.5rem;
+}
+
+.theme-preview-info p {
+  color: #6b7280;
+  margin-bottom: 1rem;
+  line-height: 1.5;
+}
+
+.theme-stats {
+  display: flex;
+  gap: 1rem;
+  font-size: 0.875rem;
+  color: #9ca3af;
+}
+
+.theme-stats span {
+  background: #f3f4f6;
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+}
+
+.creation-error {
+  background: #fee2e2;
+  border: 1px solid #fca5a5;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  margin-top: 1rem;
+}
+
+.creation-error p {
+  color: #dc2626;
+  margin: 0;
+  font-size: 0.875rem;
+}
+
+.action-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: 0.75rem;
+  padding-top: 2rem;
+  border-top: 1px solid #e5e7eb;
+}
+
+.button {
+  padding: 0.75rem 1.5rem;
+  border-radius: 0.5rem;
+  font-weight: 500;
+  font-size: 0.875rem;
+  border: none;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  min-width: 120px;
+}
+
+.button:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.button.secondary {
+  background: #f9fafb;
+  color: #374151;
+  border: 1px solid #d1d5db;
+}
+
+.button.secondary:hover:not(:disabled) {
+  background: #f3f4f6;
+  border-color: #9ca3af;
+}
+
+.button.primary {
+  background: #3b82f6;
+  color: white;
+}
+
+.button.primary:hover:not(:disabled) {
+  background: #2563eb;
+}
+
+.button.primary:focus {
+  outline: 2px solid #3b82f6;
+  outline-offset: 2px;
+}
\ No newline at end of file
diff --git a/src/components/presentations/CreationActions.tsx b/src/components/presentations/CreationActions.tsx
new file mode 100644
index 0000000..f9807dc
--- /dev/null
+++ b/src/components/presentations/CreationActions.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import type { Theme } from '../../types/theme';
+import './CreationActions.css';
+
+interface CreationActionsProps {
+  selectedTheme: Theme | null;
+  error: string | null;
+  creating: boolean;
+  presentationTitle: string;
+  onCancel: () => void;
+  onCreate: () => void;
+}
+
+export const CreationActions: React.FC<CreationActionsProps> = ({
+  selectedTheme,
+  error,
+  creating,
+  presentationTitle,
+  onCancel,
+  onCreate
+}) => {
+  return (
+    <section className="creation-actions">
+      <div className="selected-theme-info">
+        {selectedTheme && (
+          <div className="theme-preview-info">
+            <h3>Selected Theme: {selectedTheme.name}</h3>
+            <p>{selectedTheme.description}</p>
+            <div className="theme-stats">
+              <span>{selectedTheme.layouts.length} layouts available</span>
+              {selectedTheme.author && <span>by {selectedTheme.author}</span>}
+            </div>
+          </div>
+        )}
+        
+        {error && (
+          <div className="creation-error">
+            <p>Failed to create presentation: {error}</p>
+          </div>
+        )}
+      </div>
+      
+      <div className="action-buttons">
+        <button 
+          onClick={onCancel} 
+          className="button secondary"
+          type="button"
+          disabled={creating}
+        >
+          Cancel
+        </button>
+        <button 
+          onClick={onCreate}
+          className="button primary"
+          type="button"
+          disabled={!selectedTheme || !presentationTitle.trim() || creating}
+        >
+          {creating ? 'Creating...' : 'Create Presentation'}
+        </button>
+      </div>
+    </section>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/EmptyPresentationState.css b/src/components/presentations/EmptyPresentationState.css
new file mode 100644
index 0000000..ebfc844
--- /dev/null
+++ b/src/components/presentations/EmptyPresentationState.css
@@ -0,0 +1,129 @@
+.empty-presentation {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 400px;
+  padding: 2rem;
+}
+
+.empty-content {
+  text-align: center;
+  max-width: 600px;
+}
+
+.empty-content h2 {
+  font-size: 1.875rem;
+  font-weight: 700;
+  color: #1f2937;
+  margin-bottom: 1rem;
+}
+
+.empty-content > p {
+  font-size: 1.125rem;
+  color: #6b7280;
+  margin-bottom: 2rem;
+}
+
+.theme-preview {
+  background: #f9fafb;
+  border: 1px solid #e5e7eb;
+  border-radius: 0.75rem;
+  padding: 1.5rem;
+  margin: 2rem 0;
+  text-align: left;
+}
+
+.theme-preview h3 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 0.5rem;
+}
+
+.theme-description {
+  color: #6b7280;
+  margin-bottom: 1.5rem;
+  line-height: 1.5;
+}
+
+.available-layouts h4 {
+  font-size: 1rem;
+  font-weight: 600;
+  color: #374151;
+  margin-bottom: 1rem;
+}
+
+.layouts-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+  gap: 1rem;
+}
+
+.layout-preview-card {
+  background: #ffffff;
+  border: 1px solid #d1d5db;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  text-align: center;
+}
+
+.layout-preview-card .layout-name {
+  font-weight: 600;
+  color: #1f2937;
+  font-size: 0.875rem;
+  margin-bottom: 0.5rem;
+  display: block;
+}
+
+.layout-preview-card .layout-description {
+  color: #6b7280;
+  font-size: 0.75rem;
+  margin-bottom: 0.5rem;
+  display: block;
+}
+
+.layout-preview-card .slot-count {
+  color: #9ca3af;
+  font-size: 0.75rem;
+  font-weight: 500;
+}
+
+.more-layouts {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f3f4f6;
+  border: 1px dashed #9ca3af;
+  border-radius: 0.5rem;
+  color: #6b7280;
+  font-size: 0.875rem;
+  font-weight: 500;
+}
+
+.action-button {
+  padding: 0.75rem 1.5rem;
+  border-radius: 0.5rem;
+  font-weight: 500;
+  font-size: 0.875rem;
+  border: none;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.action-button.primary {
+  background: #3b82f6;
+  color: white;
+}
+
+.action-button.primary:hover {
+  background: #2563eb;
+}
+
+.action-button.large {
+  padding: 1rem 2rem;
+  font-size: 1rem;
+}
\ No newline at end of file
diff --git a/src/components/presentations/EmptyPresentationState.tsx b/src/components/presentations/EmptyPresentationState.tsx
new file mode 100644
index 0000000..b04f8f1
--- /dev/null
+++ b/src/components/presentations/EmptyPresentationState.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import type { Theme } from '../../types/theme';
+import './EmptyPresentationState.css';
+
+interface EmptyPresentationStateProps {
+  theme: Theme | null;
+  onAddFirstSlide: () => void;
+}
+
+export const EmptyPresentationState: React.FC<EmptyPresentationStateProps> = ({
+  theme,
+  onAddFirstSlide
+}) => {
+  return (
+    <div className="empty-presentation">
+      <div className="empty-content">
+        <h2>Start creating your presentation</h2>
+        <p>Add your first slide to begin editing your presentation</p>
+        
+        {theme && (
+          <div className="theme-preview">
+            <h3>Using Theme: {theme.name}</h3>
+            <p className="theme-description">{theme.description}</p>
+            
+            <div className="available-layouts">
+              <h4>Available Layouts ({theme.layouts.length})</h4>
+              <div className="layouts-grid">
+                {theme.layouts.slice(0, 6).map((layout) => (
+                  <div key={layout.id} className="layout-preview-card">
+                    <div className="layout-name">{layout.name}</div>
+                    <div className="layout-description">{layout.description}</div>
+                    <div className="slot-count">{layout.slots.length} slots</div>
+                  </div>
+                ))}
+                {theme.layouts.length > 6 && (
+                  <div className="more-layouts">
+                    +{theme.layouts.length - 6} more layouts
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+        )}
+        
+        <button 
+          type="button" 
+          className="action-button primary large"
+          onClick={onAddFirstSlide}
+        >
+          Add First Slide
+        </button>
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/NewPresentationPage.tsx b/src/components/presentations/NewPresentationPage.tsx
index 7879275..79f8375 100644
--- a/src/components/presentations/NewPresentationPage.tsx
+++ b/src/components/presentations/NewPresentationPage.tsx
@@ -2,10 +2,14 @@ import React, { useState, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import type { Theme } from '../../types/theme';
 import type { AspectRatio } from '../../types/presentation';
-import { ASPECT_RATIOS } from '../../types/presentation';
 import { getThemes } from '../../themes';
 import { createPresentation } from '../../utils/presentationStorage';
-import { ThemeSelector } from './ThemeSelector';
+import { loggers } from '../../utils/logger';
+import { AlertDialog } from '../ui/AlertDialog.tsx';
+import { PresentationDetailsForm } from './PresentationDetailsForm.tsx';
+import { AspectRatioSelector } from './AspectRatioSelector.tsx';
+import { ThemeSelectionSection } from './ThemeSelectionSection.tsx';
+import { CreationActions } from './CreationActions.tsx';
 import './NewPresentationPage.css';
 
 export const NewPresentationPage: React.FC = () => {
@@ -18,6 +22,10 @@ export const NewPresentationPage: React.FC = () => {
   const [presentationTitle, setPresentationTitle] = useState('');
   const [presentationDescription, setPresentationDescription] = useState('');
   const [creating, setCreating] = useState(false);
+  const [alertDialog, setAlertDialog] = useState<{ isOpen: boolean; message: string; type?: 'info' | 'warning' | 'error' | 'success' }>({
+    isOpen: false,
+    message: ''
+  });
 
   useEffect(() => {
     const loadThemes = async () => {
@@ -42,12 +50,20 @@ export const NewPresentationPage: React.FC = () => {
 
   const handleCreatePresentation = async () => {
     if (!selectedTheme) {
-      alert('Please select a theme for your presentation');
+      setAlertDialog({
+        isOpen: true,
+        message: 'Please select a theme for your presentation',
+        type: 'warning'
+      });
       return;
     }
 
     if (!presentationTitle.trim()) {
-      alert('Please enter a title for your presentation');
+      setAlertDialog({
+        isOpen: true,
+        message: 'Please enter a title for your presentation',
+        type: 'warning'
+      });
       return;
     }
 
@@ -62,13 +78,13 @@ export const NewPresentationPage: React.FC = () => {
         aspectRatio: selectedAspectRatio
       });
 
-      console.log('Presentation created successfully:', presentation);
+      loggers.presentation.info('Presentation created successfully', { presentationId: presentation.metadata.id, name: presentation.metadata.name });
       
       // Navigate to the new presentation editor (slide 1)
       navigate(`/presentations/${presentation.metadata.id}/edit/slides/1`);
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to create presentation');
-      console.error('Error creating presentation:', err);
+      loggers.presentation.error('Failed to create presentation', err instanceof Error ? err : new Error(String(err)));
     } finally {
       setCreating(false);
     }
@@ -116,122 +132,41 @@ export const NewPresentationPage: React.FC = () => {
 
       <main className="page-content">
         <div className="creation-form">
-          <section className="presentation-details">
-            <h2>Presentation Details</h2>
-            <div className="form-group">
-              <label htmlFor="title">Title *</label>
-              <input
-                id="title"
-                type="text"
-                value={presentationTitle}
-                onChange={(e) => setPresentationTitle(e.target.value)}
-                placeholder="Enter presentation title"
-                className="form-input"
-                required
-              />
-            </div>
-            
-            <div className="form-group">
-              <label htmlFor="description">Description</label>
-              <textarea
-                id="description"
-                value={presentationDescription}
-                onChange={(e) => setPresentationDescription(e.target.value)}
-                placeholder="Optional description of your presentation"
-                className="form-textarea"
-                rows={3}
-              />
-            </div>
-          </section>
+          <PresentationDetailsForm
+            title={presentationTitle}
+            description={presentationDescription}
+            onTitleChange={setPresentationTitle}
+            onDescriptionChange={setPresentationDescription}
+          />
 
-          <section className="aspect-ratio-selection">
-            <h2>Choose Aspect Ratio</h2>
-            <p className="section-description">
-              Select the aspect ratio that best fits your display setup
-            </p>
-            
-            <div className="aspect-ratio-grid">
-              {ASPECT_RATIOS.map((ratio) => (
-                <div
-                  key={ratio.id}
-                  className={`aspect-ratio-card ${selectedAspectRatio === ratio.id ? 'selected' : ''}`}
-                  onClick={() => setSelectedAspectRatio(ratio.id)}
-                >
-                  <div className="aspect-ratio-preview">
-                    <div className={`preview-box ${ratio.cssClass}`}></div>
-                  </div>
-                  <div className="aspect-ratio-info">
-                    <h3>{ratio.name}</h3>
-                    <p className="ratio-description">{ratio.description}</p>
-                    <div className="ratio-dimensions">
-                      {ratio.width} × {ratio.height}
-                    </div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </section>
+          <AspectRatioSelector
+            selectedAspectRatio={selectedAspectRatio}
+            onAspectRatioChange={setSelectedAspectRatio}
+          />
 
-          <section className="theme-selection">
-            <h2>Choose a Theme</h2>
-            <p className="section-description">
-              Select a theme that matches the style and tone of your presentation
-            </p>
-            
-            {themes.length > 0 ? (
-              <ThemeSelector
-                themes={themes}
-                selectedTheme={selectedTheme}
-                onThemeSelect={setSelectedTheme}
-              />
-            ) : (
-              <div className="no-themes">
-                <p>No themes available. Please check your theme configuration.</p>
-              </div>
-            )}
-          </section>
+          <ThemeSelectionSection
+            themes={themes}
+            selectedTheme={selectedTheme}
+            onThemeSelect={setSelectedTheme}
+          />
 
-          <section className="creation-actions">
-            <div className="selected-theme-info">
-              {selectedTheme && (
-                <div className="theme-preview-info">
-                  <h3>Selected Theme: {selectedTheme.name}</h3>
-                  <p>{selectedTheme.description}</p>
-                  <div className="theme-stats">
-                    <span>{selectedTheme.layouts.length} layouts available</span>
-                    {selectedTheme.author && <span>by {selectedTheme.author}</span>}
-                  </div>
-                </div>
-              )}
-              
-              {error && (
-                <div className="creation-error">
-                  <p>Failed to create presentation: {error}</p>
-                </div>
-              )}
-            </div>
-            
-            <div className="action-buttons">
-              <button 
-                onClick={() => navigate('/themes')} 
-                className="button secondary"
-                type="button"
-                disabled={creating}
-              >
-                Cancel
-              </button>
-              <button 
-                onClick={handleCreatePresentation}
-                className="button primary"
-                type="button"
-                disabled={!selectedTheme || !presentationTitle.trim() || creating}
-              >
-                {creating ? 'Creating...' : 'Create Presentation'}
-              </button>
-            </div>
-          </section>
+          <CreationActions
+            selectedTheme={selectedTheme}
+            error={error}
+            creating={creating}
+            presentationTitle={presentationTitle}
+            onCancel={() => navigate('/themes')}
+            onCreate={handleCreatePresentation}
+          />
         </div>
       </main>
+
+      <AlertDialog
+        isOpen={alertDialog.isOpen}
+        onClose={() => setAlertDialog({ isOpen: false, message: '' })}
+        message={alertDialog.message}
+        type={alertDialog.type}
+      />
     </div>
   );
 };
\ No newline at end of file
diff --git a/src/components/presentations/PresentationDetailsForm.css b/src/components/presentations/PresentationDetailsForm.css
new file mode 100644
index 0000000..f7d14f8
--- /dev/null
+++ b/src/components/presentations/PresentationDetailsForm.css
@@ -0,0 +1,39 @@
+.presentation-details h2 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 1rem;
+}
+
+.form-group {
+  margin-bottom: 1.5rem;
+}
+
+.form-group label {
+  display: block;
+  font-weight: 500;
+  color: #374151;
+  margin-bottom: 0.5rem;
+}
+
+.form-input,
+.form-textarea {
+  width: 100%;
+  padding: 0.75rem;
+  border: 1px solid #d1d5db;
+  border-radius: 0.5rem;
+  font-size: 0.875rem;
+  transition: border-color 0.2s ease;
+}
+
+.form-input:focus,
+.form-textarea:focus {
+  outline: none;
+  border-color: #3b82f6;
+  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+}
+
+.form-textarea {
+  resize: vertical;
+  min-height: 80px;
+}
\ No newline at end of file
diff --git a/src/components/presentations/PresentationDetailsForm.tsx b/src/components/presentations/PresentationDetailsForm.tsx
new file mode 100644
index 0000000..595e271
--- /dev/null
+++ b/src/components/presentations/PresentationDetailsForm.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import './PresentationDetailsForm.css';
+
+interface PresentationDetailsFormProps {
+  title: string;
+  description: string;
+  onTitleChange: (title: string) => void;
+  onDescriptionChange: (description: string) => void;
+}
+
+export const PresentationDetailsForm: React.FC<PresentationDetailsFormProps> = ({
+  title,
+  description,
+  onTitleChange,
+  onDescriptionChange
+}) => {
+  return (
+    <section className="presentation-details">
+      <h2>Presentation Details</h2>
+      <div className="form-group">
+        <label htmlFor="title">Title *</label>
+        <input
+          id="title"
+          type="text"
+          value={title}
+          onChange={(e) => onTitleChange(e.target.value)}
+          placeholder="Enter presentation title"
+          className="form-input"
+          required
+        />
+      </div>
+      
+      <div className="form-group">
+        <label htmlFor="description">Description</label>
+        <textarea
+          id="description"
+          value={description}
+          onChange={(e) => onDescriptionChange(e.target.value)}
+          placeholder="Optional description of your presentation"
+          className="form-textarea"
+          rows={3}
+        />
+      </div>
+    </section>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/PresentationEditor.css b/src/components/presentations/PresentationEditor.css
index b6c5f94..0ae7d77 100644
--- a/src/components/presentations/PresentationEditor.css
+++ b/src/components/presentations/PresentationEditor.css
@@ -41,30 +41,12 @@
   color: #334155;
 }
 
-.presentation-title {
-  flex: 1;
-  min-width: 0;
-}
-
-.presentation-title h1 {
-  margin: 0;
-  font-size: 1.5rem;
-  font-weight: 600;
-  color: #1e293b;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.presentation-description {
-  margin: 0.25rem 0 0 0;
+.presentation-title span  {
   color: #64748b;
-  font-size: 0.875rem;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
 .presentation-meta {
   display: flex;
   gap: 1rem;
diff --git a/src/components/presentations/PresentationEditor.tsx b/src/components/presentations/PresentationEditor.tsx
index 71b5c11..6b1ac25 100644
--- a/src/components/presentations/PresentationEditor.tsx
+++ b/src/components/presentations/PresentationEditor.tsx
@@ -5,7 +5,14 @@ import type { Theme } from '../../types/theme';
 import { getPresentationById, updatePresentation } from '../../utils/presentationStorage';
 import { getTheme } from '../../themes';
 import { useDialog } from '../../hooks/useDialog';
-import { AlertDialog, ConfirmDialog } from '../../components/ui';
+import { AlertDialog } from '../ui/AlertDialog.tsx';
+import { ConfirmDialog } from '../ui/ConfirmDialog.tsx';
+import { LoadingState } from './shared/LoadingState.tsx';
+import { ErrorState } from './shared/ErrorState.tsx';
+import { EmptyPresentationState } from './EmptyPresentationState.tsx';
+import { SlidesSidebar } from './SlidesSidebar.tsx';
+import { loggers } from '../../utils/logger';
+import { useSlideOperations } from '../../hooks/useSlideOperations';
 import './PresentationEditor.css';
 
 export const PresentationEditor: React.FC = () => {
@@ -19,7 +26,6 @@ export const PresentationEditor: React.FC = () => {
   const [theme, setTheme] = useState<Theme | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
-  const [saving, setSaving] = useState(false);
   
   const currentSlideIndex = slideNumber ? parseInt(slideNumber, 10) - 1 : 0;
   
@@ -28,14 +34,20 @@ export const PresentationEditor: React.FC = () => {
     isConfirmOpen,
     alertOptions,
     confirmOptions,
-    showAlert,
     closeAlert,
     closeConfirm,
     handleConfirm,
-    showError,
     confirmDelete
   } = useDialog();
 
+  const { duplicateSlide, deleteSlide, saving } = useSlideOperations({
+    presentation,
+    presentationId: presentationId || '',
+    onPresentationUpdate: setPresentation,
+    onError: setError,
+    confirmDelete
+  });
+
   useEffect(() => {
     const loadPresentationAndTheme = async () => {
       if (!presentationId) {
@@ -81,18 +93,6 @@ export const PresentationEditor: React.FC = () => {
     navigate(`/presentations/${presentationId}/edit/slides/${slideNum}`);
   };
 
-  const goToPreviousSlide = () => {
-    if (currentSlideIndex > 0) {
-      goToSlide(currentSlideIndex - 1);
-    }
-  };
-
-  const goToNextSlide = () => {
-    if (presentation && currentSlideIndex < presentation.slides.length - 1) {
-      goToSlide(currentSlideIndex + 1);
-    }
-  };
-
   const addNewSlide = () => {
     if (!presentation) return;
     
@@ -100,155 +100,11 @@ export const PresentationEditor: React.FC = () => {
     navigate(`/presentations/${presentationId}/slide/new/edit`);
   };
 
-  const duplicateSlide = async (slideIndex: number) => {
-    if (!presentation) return;
-    
-    const slideToDuplicate = presentation.slides[slideIndex];
-    if (!slideToDuplicate) return;
-    
-    try {
-      setSaving(true);
-      setError(null);
-      
-      // Create a duplicate slide with new ID
-      const duplicatedSlide = {
-        ...slideToDuplicate,
-        id: `slide_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
-        order: slideIndex + 1 // Insert right after the original
-      };
-      
-      // Create updated presentation with the duplicated slide
-      const updatedPresentation = { ...presentation };
-      const newSlides = [...presentation.slides];
-      
-      // Insert the duplicated slide after the original
-      newSlides.splice(slideIndex + 1, 0, duplicatedSlide);
-      
-      // Update slide order for all slides after the insertion point
-      newSlides.forEach((slide, index) => {
-        slide.order = index;
-      });
-      
-      updatedPresentation.slides = newSlides;
-      
-      // Save the updated presentation
-      await updatePresentation(updatedPresentation);
-      
-      // Update local state
-      setPresentation(updatedPresentation);
-      
-      // Navigate to the duplicated slide
-      const newSlideNumber = slideIndex + 2; // +2 because we inserted after and slide numbers are 1-based
-      navigate(`/presentations/${presentationId}/edit/slides/${newSlideNumber}`);
-      
-    } catch (err) {
-      console.error('Error duplicating slide:', err);
-      setError(err instanceof Error ? err.message : 'Failed to duplicate slide');
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const deleteSlide = async (slideIndex: number) => {
-    if (!presentation) return;
-    
-    const slideToDelete = presentation.slides[slideIndex];
-    if (!slideToDelete) return;
-    
-    const slideNumber = slideIndex + 1;
-    const totalSlides = presentation.slides.length;
-    let confirmMessage = `Are you sure you want to delete slide ${slideNumber}?`;
-    
-    if (totalSlides === 1) {
-      confirmMessage = `Are you sure you want to delete the only slide in this presentation? The presentation will be empty after deletion.`;
-    } else {
-      confirmMessage += ` This will remove the slide and renumber all subsequent slides. This action cannot be undone.`;
-    }
-    
-    const confirmed = await confirmDelete(confirmMessage);
-    if (!confirmed) {
-      return;
-    }
-    
-    try {
-      setSaving(true);
-      setError(null);
-      
-      // Create updated presentation with the slide removed
-      const updatedPresentation = { ...presentation };
-      updatedPresentation.slides = presentation.slides.filter((_, index) => index !== slideIndex);
-      
-      // Update slide order for remaining slides
-      updatedPresentation.slides.forEach((slide, index) => {
-        slide.order = index;
-      });
-      
-      // Save the updated presentation
-      await updatePresentation(updatedPresentation);
-      
-      // Update local state
-      setPresentation(updatedPresentation);
-      
-      // Handle navigation after deletion
-      const totalSlides = updatedPresentation.slides.length;
-      if (totalSlides === 0) {
-        // No slides left, stay on editor main view
-        navigate(`/presentations/${presentationId}/edit`);
-      } else {
-        // Navigate to appropriate slide
-        let newSlideIndex = slideIndex;
-        if (slideIndex >= totalSlides) {
-          // If we deleted the last slide, go to the new last slide
-          newSlideIndex = totalSlides - 1;
-        }
-        // Navigate to the adjusted slide number
-        const slideNumber = newSlideIndex + 1;
-        navigate(`/presentations/${presentationId}/edit/slides/${slideNumber}`);
-      }
-      
-    } catch (err) {
-      console.error('Error deleting slide:', err);
-      setError(err instanceof Error ? err.message : 'Failed to delete slide');
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const savePresentation = async () => {
-    if (!presentation) return;
-    
-    try {
-      setSaving(true);
-      
-      // TODO: Implement presentation saving
-      console.log('Save presentation functionality to be implemented');
-      showAlert({
-        message: 'Auto-save will be implemented. Changes are saved automatically.',
-        type: 'info',
-        title: 'Auto-save Feature'
-      });
-      
-    } catch (err) {
-      console.error('Error saving presentation:', err);
-      showError('Failed to save presentation. Please try again.');
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const previewPresentation = () => {
-    if (!presentation) return;
-    
-    const slideNum = Math.max(1, currentSlideIndex + 1);
-    navigate(`/presentations/${presentationId}/view/slides/${slideNum}`);
-  };
 
   if (loading) {
     return (
       <div className="presentation-editor">
-        <div className="loading-content">
-          <div className="loading-spinner">Loading presentation editor...</div>
-        </div>
+        <LoadingState message="Loading presentation editor..." />
       </div>
     );
   }
@@ -256,11 +112,12 @@ export const PresentationEditor: React.FC = () => {
   if (error) {
     return (
       <div className="presentation-editor">
-        <div className="error-content">
-          <h2>Error Loading Presentation</h2>
-          <p>{error}</p>
-          <Link to="/themes" className="back-link">← Back to Themes</Link>
-        </div>
+        <ErrorState
+          title="Error Loading Presentation"
+          message={error}
+          backLink="/themes"
+          backText="← Back to Themes"
+        />
       </div>
     );
   }
@@ -268,11 +125,12 @@ export const PresentationEditor: React.FC = () => {
   if (!presentation || !theme) {
     return (
       <div className="presentation-editor">
-        <div className="not-found-content">
-          <h2>Presentation Not Found</h2>
-          <p>The requested presentation could not be found.</p>
-          <Link to="/themes" className="back-link">← Back to Themes</Link>
-        </div>
+        <ErrorState
+          title="Presentation Not Found"
+          message="The requested presentation could not be found."
+          backLink="/themes"
+          backText="← Back to Themes"
+        />
       </div>
     );
   }
@@ -286,202 +144,50 @@ export const PresentationEditor: React.FC = () => {
         <div className="presentation-info">
           <Link to="/themes" className="back-link">← Back</Link>
           <div className="presentation-title">
-            <h1>{presentation.metadata.name}</h1>
+            <span>{presentation.metadata.name}</span>
             {presentation.metadata.description && (
-              <p className="presentation-description">{presentation.metadata.description}</p>
+              <span className="presentation-description">{presentation.metadata.description}</span>
             )}
           </div>
           <div className="presentation-meta">
-            <span className="theme-badge">Theme: {theme.name}</span>
             <span className="slide-counter">
-              {totalSlides === 0 ? 'No slides' : `Editing slide ${currentSlideIndex + 1} of ${totalSlides}`}
+              {totalSlides === 0 ? 'No slides' : `Slide ${currentSlideIndex + 1} of ${totalSlides}`}
             </span>
             {saving && <span className="saving-indicator">Saving...</span>}
           </div>
         </div>
-        
-        <div className="editor-actions">
-          <button 
-            type="button" 
-            className="action-button secondary"
-            onClick={savePresentation}
-            disabled={saving}
-          >
-            {saving ? 'Saving...' : 'Save'}
-          </button>
-          <button 
-            type="button" 
-            className="action-button secondary"
-            onClick={previewPresentation}
-          >
-            Preview
-          </button>
-          <button 
-            type="button" 
-            className="action-button primary"
-            onClick={addNewSlide}
-          >
-            Add Slide
-          </button>
-        </div>
       </header>
 
       <main className="editor-content">
         {totalSlides === 0 ? (
-          <div className="empty-presentation">
-            <div className="empty-content">
-              <h2>Start creating your presentation</h2>
-              <p>Add your first slide to begin editing your presentation</p>
-              
-              {theme && (
-                <div className="theme-preview">
-                  <h3>Using Theme: {theme.name}</h3>
-                  <p className="theme-description">{theme.description}</p>
-                  
-                  <div className="available-layouts">
-                    <h4>Available Layouts ({theme.layouts.length})</h4>
-                    <div className="layouts-grid">
-                      {theme.layouts.slice(0, 6).map((layout) => (
-                        <div key={layout.id} className="layout-preview-card">
-                          <div className="layout-name">{layout.name}</div>
-                          <div className="layout-description">{layout.description}</div>
-                          <div className="slot-count">{layout.slots.length} slots</div>
-                        </div>
-                      ))}
-                      {theme.layouts.length > 6 && (
-                        <div className="more-layouts">
-                          +{theme.layouts.length - 6} more layouts
-                        </div>
-                      )}
-                    </div>
-                  </div>
-                </div>
-              )}
-              
-              <button 
-                type="button" 
-                className="action-button primary large"
-                onClick={addNewSlide}
-              >
-                Add First Slide
-              </button>
-            </div>
-          </div>
+          <EmptyPresentationState
+            theme={theme}
+            onAddFirstSlide={addNewSlide}
+          />
         ) : (
           <div className="editor-layout">
-            <aside className="slide-sidebar">
-              <div className="sidebar-header">
-                <h3>Slides</h3>
-                <button 
-                  type="button"
-                  className="add-slide-button"
-                  onClick={addNewSlide}
-                  title="Add new slide"
-                >
-                  +
-                </button>
-              </div>
-              
-              <div className="slides-list">
-                {presentation.slides.map((slide, index) => (
-                  <div
-                    key={slide.id}
-                    className={`slide-thumbnail ${index === currentSlideIndex ? 'active' : ''}`}
-                    onClick={() => goToSlide(index)}
-                    onDoubleClick={() => navigate(`/presentations/${presentationId}/slide/${slide.id}/edit`)}
-                  >
-                    <div className="thumbnail-number">{index + 1}</div>
-                    <div className="thumbnail-preview">
-                      <div className="thumbnail-content">
-                        <span className="layout-name">{slide.layoutId}</span>
-                        <span className="content-count">
-                          {Object.keys(slide.content).length} items
-                        </span>
-                      </div>
-                    </div>
-                    <div className="thumbnail-actions">
-                      <button
-                        type="button"
-                        className="thumbnail-action edit"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          navigate(`/presentations/${presentationId}/slide/${slide.id}/edit`);
-                        }}
-                        title="Edit slide content"
-                        disabled={saving}
-                      >
-                        ✏️
-                      </button>
-                      <button
-                        type="button"
-                        className="thumbnail-action"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          duplicateSlide(index);
-                        }}
-                        title="Duplicate slide"
-                        disabled={saving}
-                      >
-                        ⧉
-                      </button>
-                      <button
-                        type="button"
-                        className="thumbnail-action delete"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          deleteSlide(index);
-                        }}
-                        title="Delete slide"
-                        disabled={saving}
-                      >
-                        ✕
-                      </button>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            </aside>
+            <SlidesSidebar
+              slides={presentation.slides}
+              currentSlideIndex={currentSlideIndex}
+              saving={saving}
+              onSlideClick={goToSlide}
+              onSlideDoubleClick={(slideId) => navigate(`/presentations/${presentationId}/slide/${slideId}/edit`)}
+              onAddSlide={addNewSlide}
+              onEditSlide={(slideId) => navigate(`/presentations/${presentationId}/slide/${slideId}/edit`)}
+              onDuplicateSlide={duplicateSlide}
+              onDeleteSlide={deleteSlide}
+            />
 
             <div className="slide-editor-area">
               {currentSlide ? (
                 <div className="slide-editor">
                   <div className="slide-header">
-                    <h3>Slide {currentSlideIndex + 1} - {currentSlide.layoutId}</h3>
-                    <div className="slide-controls">
-                      <button 
-                        type="button"
-                        className="control-button edit-slide-button"
-                        onClick={() => navigate(`/presentations/${presentationId}/slide/${currentSlide.id}/edit`)}
-                        disabled={saving}
-                      >
-                        ✏️ Edit Content
-                      </button>
-                      <button 
-                        type="button"
-                        className="control-button"
-                        onClick={goToPreviousSlide}
-                        disabled={currentSlideIndex === 0}
-                      >
-                        ← Previous
-                      </button>
-                      <button 
-                        type="button"
-                        className="control-button"
-                        onClick={goToNextSlide}
-                        disabled={currentSlideIndex === totalSlides - 1}
-                      >
-                        Next →
-                      </button>
-                    </div>
+                    <h3>Slide {currentSlideIndex + 1}</h3>
                   </div>
-                  
                   <div className="slide-content-editor">
                     <div className="content-preview">
                       {/* TODO: Render actual slide content with editing capabilities */}
                       <div className="editor-placeholder">
-                        <h4>Slide Content Editor</h4>
-                        <p>Layout: {currentSlide.layoutId}</p>
-                        <p>Content slots: {Object.keys(currentSlide.content).length}</p>
                         <div className="content-slots">
                           {Object.entries(currentSlide.content).map(([slotId, content]) => (
                             <div key={slotId} className="content-slot">
@@ -503,7 +209,7 @@ export const PresentationEditor: React.FC = () => {
                           value={currentSlide.notes}
                           onChange={(e) => {
                             // TODO: Update slide notes
-                            console.log('Update notes:', e.target.value);
+                            loggers.presentation.debug('Slide notes updated', { slideId: currentSlide.id, notesLength: e.target.value.length });
                           }}
                           placeholder="Add speaker notes for this slide..."
                           className="notes-textarea"
diff --git a/src/components/presentations/PresentationViewer.tsx b/src/components/presentations/PresentationViewer.tsx
index 52a5333..f828ac4 100644
--- a/src/components/presentations/PresentationViewer.tsx
+++ b/src/components/presentations/PresentationViewer.tsx
@@ -4,6 +4,7 @@ import type { Presentation } from '../../types/presentation';
 import type { Theme } from '../../types/theme';
 import { getPresentationById } from '../../utils/presentationStorage';
 import { getTheme } from '../../themes';
+import { loggers } from '../../utils/logger';
 import './PresentationViewer.css';
 
 export const PresentationViewer: React.FC = () => {
@@ -86,7 +87,7 @@ export const PresentationViewer: React.FC = () => {
 
   const enterPresentationMode = () => {
     // TODO: Implement full-screen presentation mode
-    console.log('Full-screen presentation mode to be implemented');
+    loggers.ui.info('Full-screen presentation mode requested - feature to be implemented');
   };
 
   if (loading) {
diff --git a/src/components/presentations/PresentationsList.tsx b/src/components/presentations/PresentationsList.tsx
index 83c011b..e13d593 100644
--- a/src/components/presentations/PresentationsList.tsx
+++ b/src/components/presentations/PresentationsList.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import type { Presentation } from '../../types/presentation';
 import { getAllPresentations, deletePresentation } from '../../utils/presentationStorage';
+import { loggers } from '../../utils/logger';
 import './PresentationsList.css';
 
 export const PresentationsList: React.FC = () => {
@@ -38,7 +39,7 @@ export const PresentationsList: React.FC = () => {
       await deletePresentation(id);
       setPresentations(prev => prev.filter(p => p.metadata.id !== id));
     } catch (err) {
-      console.error('Error deleting presentation:', err);
+      loggers.presentation.error('Failed to delete presentation', err instanceof Error ? err : new Error(String(err)));
       alert('Failed to delete presentation. Please try again.');
     } finally {
       setDeleting(null);
diff --git a/src/components/presentations/SlideEditor.tsx b/src/components/presentations/SlideEditor.tsx
index 309d834..5fab243 100644
--- a/src/components/presentations/SlideEditor.tsx
+++ b/src/components/presentations/SlideEditor.tsx
@@ -6,6 +6,7 @@ import { getPresentationById, updatePresentation } from '../../utils/presentatio
 import { getTheme } from '../../themes';
 import { renderTemplateWithSampleData } from '../../utils/templateRenderer';
 import { sanitizeSlideTemplate } from '../../utils/htmlSanitizer';
+import { loggers } from '../../utils/logger';
 import './SlideEditor.css';
 
 export const SlideEditor: React.FC = () => {
@@ -175,7 +176,7 @@ export const SlideEditor: React.FC = () => {
       
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to save slide');
-      console.error('Error saving slide:', err);
+      loggers.presentation.error('Failed to save slide', err instanceof Error ? err : new Error(String(err)));
     } finally {
       setSaving(false);
     }
diff --git a/src/components/presentations/SlidesSidebar.css b/src/components/presentations/SlidesSidebar.css
new file mode 100644
index 0000000..5293d04
--- /dev/null
+++ b/src/components/presentations/SlidesSidebar.css
@@ -0,0 +1,53 @@
+.slide-sidebar {
+  width: 240px;
+  background: #ffffff;
+  border-right: 1px solid #e5e7eb;
+  display: flex;
+  flex-direction: column;
+  min-height: 100%;
+}
+
+.sidebar-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 1rem;
+  border-bottom: 1px solid #e5e7eb;
+  background: #f9fafb;
+}
+
+.sidebar-header h3 {
+  font-size: 1rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin: 0;
+}
+
+.add-slide-button {
+  background: #3b82f6;
+  color: white;
+  border: none;
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  font-size: 1.25rem;
+  font-weight: bold;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.add-slide-button:hover {
+  background: #2563eb;
+}
+
+.slides-list {
+  flex: 1;
+  padding: 1rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/src/components/presentations/SlidesSidebar.tsx b/src/components/presentations/SlidesSidebar.tsx
new file mode 100644
index 0000000..90a96e3
--- /dev/null
+++ b/src/components/presentations/SlidesSidebar.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import type { Slide } from '../../types/presentation';
+import { SlideThumbnail } from './shared/SlideThumbnail.tsx';
+import './SlidesSidebar.css';
+
+interface SlidesSidebarProps {
+  slides: Slide[];
+  currentSlideIndex: number;
+  saving: boolean;
+  onSlideClick: (index: number) => void;
+  onSlideDoubleClick: (slideId: string) => void;
+  onAddSlide: () => void;
+  onEditSlide: (slideId: string) => void;
+  onDuplicateSlide: (index: number) => void;
+  onDeleteSlide: (index: number) => void;
+}
+
+export const SlidesSidebar: React.FC<SlidesSidebarProps> = ({
+  slides,
+  currentSlideIndex,
+  saving,
+  onSlideClick,
+  onSlideDoubleClick,
+  onAddSlide,
+  onEditSlide,
+  onDuplicateSlide,
+  onDeleteSlide
+}) => {
+  return (
+    <aside className="slide-sidebar">
+      <div className="sidebar-header">
+        <h3>Slides</h3>
+        <button 
+          type="button"
+          className="add-slide-button"
+          onClick={onAddSlide}
+          title="Add new slide"
+        >
+          +
+        </button>
+      </div>
+      
+      <div className="slides-list">
+        {slides.map((slide, index) => (
+          <SlideThumbnail
+            key={slide.id}
+            slide={slide}
+            index={index}
+            isActive={index === currentSlideIndex}
+            isDisabled={saving}
+            onClick={() => onSlideClick(index)}
+            onDoubleClick={() => onSlideDoubleClick(slide.id)}
+            onEdit={() => onEditSlide(slide.id)}
+            onDuplicate={() => onDuplicateSlide(index)}
+            onDelete={() => onDeleteSlide(index)}
+          />
+        ))}
+      </div>
+    </aside>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/ThemeSelectionSection.css b/src/components/presentations/ThemeSelectionSection.css
new file mode 100644
index 0000000..86acefb
--- /dev/null
+++ b/src/components/presentations/ThemeSelectionSection.css
@@ -0,0 +1,26 @@
+.theme-selection h2 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 0.5rem;
+}
+
+.section-description {
+  color: #6b7280;
+  margin-bottom: 1.5rem;
+  font-size: 0.875rem;
+}
+
+.no-themes {
+  background: #fef3c7;
+  border: 1px solid #f59e0b;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  text-align: center;
+}
+
+.no-themes p {
+  color: #92400e;
+  margin: 0;
+  font-size: 0.875rem;
+}
\ No newline at end of file
diff --git a/src/components/presentations/ThemeSelectionSection.tsx b/src/components/presentations/ThemeSelectionSection.tsx
new file mode 100644
index 0000000..820607b
--- /dev/null
+++ b/src/components/presentations/ThemeSelectionSection.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import type { Theme } from '../../types/theme';
+import { ThemeSelector } from './ThemeSelector';
+import './ThemeSelectionSection.css';
+
+interface ThemeSelectionSectionProps {
+  themes: Theme[];
+  selectedTheme: Theme | null;
+  onThemeSelect: (theme: Theme | null) => void;
+}
+
+export const ThemeSelectionSection: React.FC<ThemeSelectionSectionProps> = ({
+  themes,
+  selectedTheme,
+  onThemeSelect
+}) => {
+  return (
+    <section className="theme-selection">
+      <h2>Choose a Theme</h2>
+      <p className="section-description">
+        Select a theme that matches the style and tone of your presentation
+      </p>
+      
+      {themes.length > 0 ? (
+        <ThemeSelector
+          themes={themes}
+          selectedTheme={selectedTheme}
+          onThemeSelect={onThemeSelect}
+        />
+      ) : (
+        <div className="no-themes">
+          <p>No themes available. Please check your theme configuration.</p>
+        </div>
+      )}
+    </section>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/shared/ErrorState.css b/src/components/presentations/shared/ErrorState.css
new file mode 100644
index 0000000..d478ea0
--- /dev/null
+++ b/src/components/presentations/shared/ErrorState.css
@@ -0,0 +1,67 @@
+.error-content {
+  text-align: center;
+  padding: 2rem;
+  min-height: 200px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.error-content h2 {
+  color: #dc2626;
+  font-size: 1.5rem;
+  font-weight: 600;
+  margin-bottom: 1rem;
+}
+
+.error-content p {
+  color: #6b7280;
+  margin-bottom: 2rem;
+  max-width: 400px;
+  line-height: 1.5;
+}
+
+.error-actions {
+  display: flex;
+  gap: 1rem;
+  align-items: center;
+  justify-content: center;
+}
+
+.button {
+  padding: 0.75rem 1.5rem;
+  border-radius: 0.5rem;
+  font-weight: 500;
+  font-size: 0.875rem;
+  border: none;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.button.secondary {
+  background: #f9fafb;
+  color: #374151;
+  border: 1px solid #d1d5db;
+}
+
+.button.secondary:hover {
+  background: #f3f4f6;
+  border-color: #9ca3af;
+}
+
+.back-link {
+  color: #3b82f6;
+  text-decoration: none;
+  font-weight: 500;
+  transition: color 0.2s ease;
+}
+
+.back-link:hover {
+  color: #2563eb;
+  text-decoration: underline;
+}
\ No newline at end of file
diff --git a/src/components/presentations/shared/ErrorState.tsx b/src/components/presentations/shared/ErrorState.tsx
new file mode 100644
index 0000000..2a9be4f
--- /dev/null
+++ b/src/components/presentations/shared/ErrorState.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import './ErrorState.css';
+
+interface ErrorStateProps {
+  title?: string;
+  message: string;
+  backLink?: string;
+  backText?: string;
+  onRetry?: () => void;
+  retryText?: string;
+  className?: string;
+}
+
+export const ErrorState: React.FC<ErrorStateProps> = ({
+  title = "Error",
+  message,
+  backLink,
+  backText = "← Back to Themes",
+  onRetry,
+  retryText = "Try Again",
+  className = ""
+}) => {
+  return (
+    <div className={`error-content ${className}`.trim()}>
+      <h2>{title}</h2>
+      <p>{message}</p>
+      <div className="error-actions">
+        {onRetry && (
+          <button 
+            onClick={onRetry}
+            className="button secondary"
+            type="button"
+          >
+            {retryText}
+          </button>
+        )}
+        {backLink && (
+          <Link to={backLink} className="back-link">
+            {backText}
+          </Link>
+        )}
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/shared/LoadingState.css b/src/components/presentations/shared/LoadingState.css
new file mode 100644
index 0000000..73f2ea5
--- /dev/null
+++ b/src/components/presentations/shared/LoadingState.css
@@ -0,0 +1,31 @@
+.loading-content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 200px;
+  padding: 2rem;
+}
+
+.loading-spinner {
+  color: #6b7280;
+  font-size: 0.875rem;
+  font-weight: 500;
+}
+
+.loading-spinner::after {
+  content: '';
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  margin-left: 10px;
+  border: 2px solid #e5e7eb;
+  border-top: 2px solid #3b82f6;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  vertical-align: middle;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
\ No newline at end of file
diff --git a/src/components/presentations/shared/LoadingState.tsx b/src/components/presentations/shared/LoadingState.tsx
new file mode 100644
index 0000000..c0d7b67
--- /dev/null
+++ b/src/components/presentations/shared/LoadingState.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import './LoadingState.css';
+
+interface LoadingStateProps {
+  message?: string;
+  className?: string;
+}
+
+export const LoadingState: React.FC<LoadingStateProps> = ({ 
+  message = "Loading...",
+  className = ""
+}) => {
+  return (
+    <div className={`loading-content ${className}`.trim()}>
+      <div className="loading-spinner">{message}</div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/src/components/presentations/shared/SlideThumbnail.css b/src/components/presentations/shared/SlideThumbnail.css
new file mode 100644
index 0000000..056de18
--- /dev/null
+++ b/src/components/presentations/shared/SlideThumbnail.css
@@ -0,0 +1,106 @@
+.slide-thumbnail {
+  display: flex;
+  flex-direction: column;
+  border: 2px solid #e5e7eb;
+  border-radius: 0.5rem;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  background: #ffffff;
+  overflow: hidden;
+  position: relative;
+}
+
+.slide-thumbnail:hover {
+  border-color: #3b82f6;
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15);
+}
+
+.slide-thumbnail.active {
+  border-color: #3b82f6;
+  background: #eff6ff;
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15);
+}
+
+.thumbnail-number {
+  position: absolute;
+  top: 0.5rem;
+  left: 0.5rem;
+  background: #374151;
+  color: white;
+  font-size: 0.75rem;
+  font-weight: 600;
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+  z-index: 10;
+}
+
+.slide-thumbnail.active .thumbnail-number {
+  background: #3b82f6;
+}
+
+.thumbnail-preview {
+  padding: 2rem 1rem 1rem;
+  min-height: 80px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f9fafb;
+}
+
+.thumbnail-content {
+  text-align: center;
+}
+
+.layout-name {
+  display: block;
+  font-size: 0.75rem;
+  font-weight: 600;
+  color: #374151;
+  margin-bottom: 0.25rem;
+}
+
+.content-count {
+  font-size: 0.625rem;
+  color: #6b7280;
+}
+
+.thumbnail-actions {
+  display: flex;
+  justify-content: center;
+  gap: 0.25rem;
+  padding: 0.5rem;
+  background: #ffffff;
+  border-top: 1px solid #e5e7eb;
+}
+
+.thumbnail-action {
+  background: none;
+  border: none;
+  padding: 0.25rem;
+  border-radius: 0.25rem;
+  cursor: pointer;
+  font-size: 0.875rem;
+  transition: background-color 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 28px;
+  height: 28px;
+}
+
+.thumbnail-action:hover:not(:disabled) {
+  background: #f3f4f6;
+}
+
+.thumbnail-action:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.thumbnail-action.edit:hover:not(:disabled) {
+  background: #dbeafe;
+}
+
+.thumbnail-action.delete:hover:not(:disabled) {
+  background: #fee2e2;
+}
\ No newline at end of file
diff --git a/src/components/presentations/shared/SlideThumbnail.tsx b/src/components/presentations/shared/SlideThumbnail.tsx
new file mode 100644
index 0000000..2703327
--- /dev/null
+++ b/src/components/presentations/shared/SlideThumbnail.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import type { Slide } from '../../../types/presentation';
+import './SlideThumbnail.css';
+
+interface SlideThumbnailProps {
+  slide: Slide;
+  index: number;
+  isActive: boolean;
+  isDisabled?: boolean;
+  onClick: () => void;
+  onDoubleClick?: () => void;
+  onEdit: () => void;
+  onDuplicate: () => void;
+  onDelete: () => void;
+}
+
+export const SlideThumbnail: React.FC<SlideThumbnailProps> = ({
+  slide,
+  index,
+  isActive,
+  isDisabled = false,
+  onClick,
+  onDoubleClick,
+  onEdit,
+  onDuplicate,
+  onDelete
+}) => {
+  return (
+    <div
+      className={`slide-thumbnail ${isActive ? 'active' : ''}`}
+      onClick={onClick}
+      onDoubleClick={onDoubleClick}
+    >
+      <div className="thumbnail-number">{index + 1}</div>
+      <div className="thumbnail-preview">
+        <div className="thumbnail-content">
+          <span className="layout-name">{slide.layoutId}</span>
+          <span className="content-count">
+            {Object.keys(slide.content).length} items
+          </span>
+        </div>
+      </div>
+      <div className="thumbnail-actions">
+        <button
+          type="button"
+          className="thumbnail-action edit"
+          onClick={(e) => {
+            e.stopPropagation();
+            onEdit();
+          }}
+          title="Edit slide content"
+          disabled={isDisabled}
+        >
+          ✏️
+        </button>
+        <button
+          type="button"
+          className="thumbnail-action"
+          onClick={(e) => {
+            e.stopPropagation();
+            onDuplicate();
+          }}
+          title="Duplicate slide"
+          disabled={isDisabled}
+        >
+          ⧉
+        </button>
+        <button
+          type="button"
+          className="thumbnail-action delete"
+          onClick={(e) => {
+            e.stopPropagation();
+            onDelete();
+          }}
+          title="Delete slide"
+          disabled={isDisabled}
+        >
+          ✕
+        </button>
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/src/hooks/useSlideOperations.ts b/src/hooks/useSlideOperations.ts
new file mode 100644
index 0000000..85a533f
--- /dev/null
+++ b/src/hooks/useSlideOperations.ts
@@ -0,0 +1,144 @@
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import type { Presentation, Slide } from '../types/presentation';
+import { updatePresentation } from '../utils/presentationStorage';
+import { loggers } from '../utils/logger';
+
+interface UseSlideOperationsProps {
+  presentation: Presentation | null;
+  presentationId: string;
+  onPresentationUpdate: (presentation: Presentation) => void;
+  onError: (error: string) => void;
+  confirmDelete: (message: string) => Promise<boolean>;
+}
+
+export const useSlideOperations = ({
+  presentation,
+  presentationId,
+  onPresentationUpdate,
+  onError,
+  confirmDelete
+}: UseSlideOperationsProps) => {
+  const navigate = useNavigate();
+  const [saving, setSaving] = useState(false);
+
+  const duplicateSlide = async (slideIndex: number) => {
+    if (!presentation) return;
+    
+    const slideToDuplicate = presentation.slides[slideIndex];
+    if (!slideToDuplicate) return;
+    
+    try {
+      setSaving(true);
+      onError('');
+      
+      // Create a duplicate slide with new ID
+      const duplicatedSlide: Slide = {
+        ...slideToDuplicate,
+        id: `slide_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
+        order: slideIndex + 1 // Insert right after the original
+      };
+      
+      // Create updated presentation with the duplicated slide
+      const updatedPresentation = { ...presentation };
+      const newSlides = [...presentation.slides];
+      
+      // Insert the duplicated slide after the original
+      newSlides.splice(slideIndex + 1, 0, duplicatedSlide);
+      
+      // Update slide order for all slides after the insertion point
+      newSlides.forEach((slide, index) => {
+        slide.order = index;
+      });
+      
+      updatedPresentation.slides = newSlides;
+      
+      // Save the updated presentation
+      await updatePresentation(updatedPresentation);
+      
+      // Update local state
+      onPresentationUpdate(updatedPresentation);
+      
+      // Navigate to the duplicated slide
+      const newSlideNumber = slideIndex + 2; // +2 because we inserted after and slide numbers are 1-based
+      navigate(`/presentations/${presentationId}/edit/slides/${newSlideNumber}`);
+      
+    } catch (err) {
+      loggers.presentation.error('Failed to duplicate slide', err instanceof Error ? err : new Error(String(err)));
+      onError(err instanceof Error ? err.message : 'Failed to duplicate slide');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  const deleteSlide = async (slideIndex: number) => {
+    if (!presentation) return;
+    
+    const slideToDelete = presentation.slides[slideIndex];
+    if (!slideToDelete) return;
+    
+    const slideNumber = slideIndex + 1;
+    const totalSlides = presentation.slides.length;
+    let confirmMessage = `Are you sure you want to delete slide ${slideNumber}?`;
+    
+    if (totalSlides === 1) {
+      confirmMessage = `Are you sure you want to delete the only slide in this presentation? The presentation will be empty after deletion.`;
+    } else {
+      confirmMessage += ` This will remove the slide and renumber all subsequent slides. This action cannot be undone.`;
+    }
+    
+    const confirmed = await confirmDelete(confirmMessage);
+    if (!confirmed) {
+      return;
+    }
+    
+    try {
+      setSaving(true);
+      onError('');
+      
+      // Create updated presentation with the slide removed
+      const updatedPresentation = { ...presentation };
+      updatedPresentation.slides = presentation.slides.filter((_, index) => index !== slideIndex);
+      
+      // Update slide order for remaining slides
+      updatedPresentation.slides.forEach((slide, index) => {
+        slide.order = index;
+      });
+      
+      // Save the updated presentation
+      await updatePresentation(updatedPresentation);
+      
+      // Update local state
+      onPresentationUpdate(updatedPresentation);
+      
+      // Handle navigation after deletion
+      const totalSlides = updatedPresentation.slides.length;
+      if (totalSlides === 0) {
+        // No slides left, stay on editor main view
+        navigate(`/presentations/${presentationId}/edit`);
+      } else {
+        // Navigate to appropriate slide
+        let newSlideIndex = slideIndex;
+        if (slideIndex >= totalSlides) {
+          // If we deleted the last slide, go to the new last slide
+          newSlideIndex = totalSlides - 1;
+        }
+        // Navigate to the adjusted slide number
+        const slideNumber = newSlideIndex + 1;
+        navigate(`/presentations/${presentationId}/edit/slides/${slideNumber}`);
+      }
+      
+    } catch (err) {
+      loggers.presentation.error('Failed to delete slide', err instanceof Error ? err : new Error(String(err)));
+      onError(err instanceof Error ? err.message : 'Failed to delete slide');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return {
+    duplicateSlide,
+    deleteSlide,
+    saving
+  };
+};
\ No newline at end of file
diff --git a/src/utils/cssParser.ts b/src/utils/cssParser.ts
index 706f731..ed3040d 100644
--- a/src/utils/cssParser.ts
+++ b/src/utils/cssParser.ts
@@ -1,3 +1,5 @@
+import { loggers } from './logger';
+
 export interface CSSVariables {
   [key: string]: string;
 }
@@ -47,7 +49,7 @@ export const loadCSSVariables = async (cssFilePath: string): Promise<CSSVariable
     const cssContent = await response.text();
     return parseCSSVariables(cssContent);
   } catch (error) {
-    console.warn(`Could not load CSS variables from ${cssFilePath}:`, error);
+    loggers.theme.warn(`Could not load CSS variables from ${cssFilePath}`, error instanceof Error ? error : new Error(String(error)));
     return {};
   }
 };
@@ -159,7 +161,7 @@ export const loadThemeFromCSS = async (cssFilePath: string): Promise<{
       variables: parseCSSVariables(cssContent)
     };
   } catch (error) {
-    console.warn(`Could not load theme from ${cssFilePath}:`, error);
+    loggers.theme.warn(`Could not load theme from ${cssFilePath}`, error instanceof Error ? error : new Error(String(error)));
     return {
       metadata: null,
       variables: {}
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
new file mode 100644
index 0000000..674d405
--- /dev/null
+++ b/src/utils/logger.ts
@@ -0,0 +1,204 @@
+import log from 'loglevel';
+
+/**
+ * Application logger configuration and utilities
+ */
+
+// Define log levels for different parts of the application
+export enum LogLevel {
+  TRACE = 0,
+  DEBUG = 1,
+  INFO = 2,
+  WARN = 3,
+  ERROR = 4,
+  SILENT = 5,
+}
+
+// Log categories for better organization
+export enum LogCategory {
+  PRESENTATION = 'presentation',
+  THEME = 'theme',
+  STORAGE = 'storage',
+  UI = 'ui',
+  SECURITY = 'security',
+  PERFORMANCE = 'performance',
+  GENERAL = 'general',
+}
+
+/**
+ * Configure logging based on environment
+ */
+function configureLogger(): void {
+  // Set default log level based on environment
+  const isDevelopment = import.meta.env.DEV;
+  const isProduction = import.meta.env.PROD;
+  
+  if (isDevelopment) {
+    log.setLevel(LogLevel.DEBUG);
+  } else if (isProduction) {
+    log.setLevel(LogLevel.WARN);
+  } else {
+    log.setLevel(LogLevel.INFO);
+  }
+
+  // Add timestamp and category formatting
+  const originalFactory = log.methodFactory;
+  log.methodFactory = function (methodName, logLevel, loggerName) {
+    const rawMethod = originalFactory(methodName, logLevel, loggerName);
+    
+    return function (category: LogCategory | string, message: string, ...args: LogData[]) {
+      const timestamp = new Date().toISOString();
+      const formattedMessage = `[${timestamp}] [${methodName.toUpperCase()}] [${category}] ${message}`;
+      
+      if (args.length > 0) {
+        rawMethod(formattedMessage, ...args);
+      } else {
+        rawMethod(formattedMessage);
+      }
+    };
+  };
+  
+  // Apply the new factory
+  log.setLevel(log.getLevel());
+}
+
+/**
+ * Valid log data types
+ */
+type LogData = string | number | boolean | null | undefined | Error | Record<string, unknown> | unknown[];
+
+/**
+ * Logger interface for the application
+ */
+export interface Logger {
+  trace(category: LogCategory, message: string, ...args: LogData[]): void;
+  debug(category: LogCategory, message: string, ...args: LogData[]): void;
+  info(category: LogCategory, message: string, ...args: LogData[]): void;
+  warn(category: LogCategory, message: string, ...args: LogData[]): void;
+  error(category: LogCategory, message: string, ...args: LogData[]): void;
+}
+
+/**
+ * Create a logger instance with proper configuration
+ */
+function createLogger(): Logger {
+  configureLogger();
+  
+  return {
+    trace: (category: LogCategory, message: string, ...args: LogData[]) => {
+      log.trace(category, message, ...args);
+    },
+    
+    debug: (category: LogCategory, message: string, ...args: LogData[]) => {
+      log.debug(category, message, ...args);
+    },
+    
+    info: (category: LogCategory, message: string, ...args: LogData[]) => {
+      log.info(category, message, ...args);
+    },
+    
+    warn: (category: LogCategory, message: string, ...args: LogData[]) => {
+      log.warn(category, message, ...args);
+    },
+    
+    error: (category: LogCategory, message: string, ...args: LogData[]) => {
+      log.error(category, message, ...args);
+    },
+  };
+}
+
+// Export the configured logger instance
+export const logger = createLogger();
+
+/**
+ * Convenience functions for common logging scenarios
+ */
+export const loggers = {
+  presentation: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.PRESENTATION, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.PRESENTATION, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.PRESENTATION, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.PRESENTATION, message, ...args),
+  },
+  
+  theme: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.THEME, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.THEME, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.THEME, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.THEME, message, ...args),
+  },
+  
+  storage: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.STORAGE, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.STORAGE, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.STORAGE, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.STORAGE, message, ...args),
+  },
+  
+  ui: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.UI, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.UI, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.UI, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.UI, message, ...args),
+  },
+  
+  security: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.SECURITY, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.SECURITY, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.SECURITY, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.SECURITY, message, ...args),
+  },
+  
+  performance: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.PERFORMANCE, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.PERFORMANCE, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.PERFORMANCE, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.PERFORMANCE, message, ...args),
+  },
+  
+  general: {
+    info: (message: string, ...args: LogData[]) => logger.info(LogCategory.GENERAL, message, ...args),
+    warn: (message: string, ...args: LogData[]) => logger.warn(LogCategory.GENERAL, message, ...args),
+    error: (message: string, ...args: LogData[]) => logger.error(LogCategory.GENERAL, message, ...args),
+    debug: (message: string, ...args: LogData[]) => logger.debug(LogCategory.GENERAL, message, ...args),
+  },
+};
+
+/**
+ * Performance timing utility
+ */
+export function createPerformanceTimer(operation: string) {
+  const startTime = performance.now();
+  
+  return {
+    end: () => {
+      const endTime = performance.now();
+      const duration = endTime - startTime;
+      loggers.performance.info(`Operation '${operation}' completed in ${duration.toFixed(2)}ms`);
+      return duration;
+    }
+  };
+}
+
+/**
+ * Error logging utility with stack trace
+ */
+export function logError(category: LogCategory, message: string, error?: Error | unknown, context?: Record<string, any>) {
+  if (error instanceof Error) {
+    logger.error(category, `${message}: ${error.message}`, {
+      stack: error.stack,
+      context,
+    });
+  } else {
+    logger.error(category, message, { error, context });
+  }
+}
+
+/**
+ * Development-only logging
+ */
+export function devLog(category: LogCategory, message: string, ...args: any[]) {
+  if (import.meta.env.DEV) {
+    logger.debug(category, `[DEV] ${message}`, ...args);
+  }
+}
\ No newline at end of file
diff --git a/src/utils/themeLoader.ts b/src/utils/themeLoader.ts
index a5c7b2b..f9d39e8 100644
--- a/src/utils/themeLoader.ts
+++ b/src/utils/themeLoader.ts
@@ -1,5 +1,6 @@
 import type { Theme, SlideLayout, SlotConfig } from '../types/theme';
 import { parseThemeMetadata, parseCSSVariables } from './cssParser';
+import { loggers } from './logger';
 
 // Theme cache management
 let themeCache: Theme[] | null = null;
@@ -36,11 +37,11 @@ export const discoverThemes = async (bustCache = false): Promise<Theme[]> => {
           themes.push(theme);
         }
       } catch (error) {
-        console.warn(`Failed to load theme ${themeId}:`, error);
+        loggers.theme.warn(`Failed to load theme ${themeId}`, error instanceof Error ? error : new Error(String(error)));
       }
     }
   } catch (error) {
-    console.warn('Failed to load themes manifest:', error);
+    loggers.theme.warn('Failed to load themes manifest', error instanceof Error ? error : new Error(String(error)));
     // Fallback to default theme if manifest fails
     try {
       const defaultTheme = await loadTheme('default', bustCache);
@@ -104,7 +105,7 @@ export const loadTheme = async (themeId: string, bustCache = false): Promise<The
       masterSlideTemplate
     };
   } catch (error) {
-    console.warn(`Could not load theme ${themeId}:`, error);
+    loggers.theme.warn(`Could not load theme ${themeId}`, error instanceof Error ? error : new Error(String(error)));
     return null;
   }
 };
@@ -160,7 +161,7 @@ const discoverLayouts = async (basePath: string, themeId: string, bustCache = fa
     const results = await Promise.all(layoutPromises);
     layouts.push(...results.filter((layout): layout is SlideLayout => layout !== null));
   } catch (error) {
-    console.warn('Error discovering layouts:', error);
+    loggers.theme.warn('Error discovering layouts', error instanceof Error ? error : new Error(String(error)));
   }
   
   return layouts;