diff --git a/.phase20-state.json b/.phase20-state.json
index 99e9b7d..78b52bc 100644
--- a/.phase20-state.json
+++ b/.phase20-state.json
@@ -1,5 +1,8 @@
 {
   "completed_features": [],
-  "current_feature": "time-budget-per-project",
-  "started_at": "2026-05-23T07:57:43.412201"
+  "current_feature": "recurring-time-entries",
+  "started_at": "2026-05-23T07:57:43.412201",
+  "attempted_features": [
+    "time-budget-per-project"
+  ]
 }
\ No newline at end of file
diff --git a/GENERATION_LOG.md b/GENERATION_LOG.md
index 462bab7..615bfd9 100644
--- a/GENERATION_LOG.md
+++ b/GENERATION_LOG.md
@@ -2388,3 +2388,20 @@ src/index.ts(27,25): error TS2769: No overload matches this call.
   Overload 2 of 3, '(plugin: FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
     Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
       Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTy
+- `08:00:25` **INFO**   Committed feature time-budget-per-project
+- `08:00:26` **INFO**   Pushed: rc=0
+
+## Phase-3 Feature: recurring-time-entries (2026-05-23 08:00:26)
+
+- `08:00:26` **INFO** Description: Template-System für wiederkehrende Entries (z.B. Daily-Standup 30min)
+- `08:00:26` **INFO**   Generating apps/web/src/pages/TimeEntries.tsx (ERWEITERT — füge 'Aus Template' Dropdown im Create-Form, lädt api.list…)
+- `08:02:16` **INFO**     wrote 14977 chars in 110.3s (attempt 1)
+- `08:02:16` **INFO** Running tsc --noEmit on api…
+- `08:02:18` **WARN**   tsc errors:
+src/index.ts(27,25): error TS2769: No overload matches this call.
+  Overload 1 of 3, '(plugin: FastifyPluginCallback<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
+    Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginCallback<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
+      Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTypeProvider>, opts: { ...; }, done: (err?: Error | undefined) => void): void'.
+  Overload 2 of 3, '(plugin: FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
+    Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
+      Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTy
diff --git a/apps/web/src/pages/TimeEntries.tsx b/apps/web/src/pages/TimeEntries.tsx
index 2a0462e..b2721b2 100644
--- a/apps/web/src/pages/TimeEntries.tsx
+++ b/apps/web/src/pages/TimeEntries.tsx
@@ -5,7 +5,7 @@ import { EmptyState } from "../components/EmptyState"
 import { LoadingSpinner } from "../components/LoadingSpinner"
 import { SuggestionInput } from "../components/SuggestionInput"
 import { SmartFilters } from "../components/SmartFilters"
-import type { TimeEntryInsert, SavedView, TimeEntry } from "@emberclone/shared"
+import type { TimeEntryInsert, SavedView, TimeEntry, TimeEntryTemplate } from "@emberclone/shared"
 
 function renderSimpleMarkdown(text: string | null) {
   if (!text) return null
@@ -56,11 +56,32 @@ export default function TimeEntries() {
     queryFn: () => api.listSavedViews({ entityType: 'time-entries' })
   })
 
+  const { data: templates } = useQuery({
+    queryKey: ["time-entry-templates"],
+    queryFn: () => api.listTimeEntryTemplates()
+  })
+
   const descriptionSuggestions = useMemo(() => {
     if (!entries) return []
     return Array.from(new Set(entries.map(e => e.description).filter(Boolean))).slice(0, 50) as string[]
   }, [entries])
 
+  const handleTemplateChange = (templateId: string) => {
+    const template = templates?.find(t => t.id === templateId)
+    if (!template) return
+
+    const now = new Date()
+    const end = new Date(now.getTime() + (template.durationMinutes || 0) * 60000)
+
+    setFormData({
+      ...formData,
+      description: template.description || "",
+      projectId: template.projectId || "",
+      startTime: now.toISOString(),
+      endTime: end.toISOString()
+    })
+  }
+
   const createMutation = useMutation({
     mutationFn: (data: Partial<TimeEntryInsert>) => api.createTimeEntry(data),
     onSuccess: () => {
@@ -119,40 +140,13 @@ export default function TimeEntries() {
 
   const filteredEntries = useMemo(() => {
     if (!entries) return []
-    return entries.filter(entry => 
-      entry.description?.toLowerCase().includes(filters.search.toLowerCase())
-    )
-  }, [entries, filters.search])
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault()
-    createMutation.mutate({
-      description: formData.description,
-      startTime: new Date(formData.startTime) as any,
-      endTime: new Date(formData.endTime) as any,
-      projectId: formData.projectId || undefined,
-      notes: formData.notes
+    return entries.filter(e => {
+      const matchesSearch = !filters.search || 
+        e.description.toLowerCase().includes(filters.search.toLowerCase()) ||
+        e.notes?.toLowerCase().includes(filters.search.toLowerCase())
+      return matchesSearch
     })
-  }
-
-  const handleStartEditing = (entry: TimeEntry) => {
-    setEditingId(entry.id)
-    setEditValue(entry.description || "")
-  }
-
-  const handleEditBlur = () => {
-    if (editingId) {
-      updateMutation.mutate({ id: editingId, data: { description: editValue } })
-    }
-  }
-
-  const handleEditKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter') {
-      handleEditBlur()
-    } else if (e.key === 'Escape') {
-      setEditingId(null)
-    }
-  }
+  }, [entries, filters.search])
 
   if (isLoading) return <div className="p-8 flex justify-center"><LoadingSpinner /></div>
   if (isError) return <div className="p-8 text-red-500">Error loading time entries.</div>
@@ -178,168 +172,210 @@ export default function TimeEntries() {
         </div>
       </div>
 
-      <form onSubmit={handleSubmit} className="grid grid-cols-1 md:grid-cols-5 gap-3 p-4 bg-gray-50 rounded-lg border">
-        <SuggestionInput 
-          value={formData.description} 
-          onChange={v => setFormData({...formData, description: v})} 
-          suggestions={descriptionSuggestions} 
-          placeholder="Description" 
-        />
-        <input 
-          type="datetime-local" 
-          className="p-2 border rounded text-sm" 
-          value={formData.startTime} 
-          onChange={e => setFormData({...formData, startTime: e.target.value})} 
-          required 
-        />
-        <input 
-          type="datetime-local" 
-          className="p-2 border rounded text-sm" 
-          value={formData.endTime} 
-          onChange={e => setFormData({...formData, endTime: e.target.value})} 
-          required 
-        />
-        <input 
-          type="text" 
-          className="p-2 border rounded text-sm" 
-          placeholder="Project ID" 
-          value={formData.projectId} 
-          onChange={e => setFormData({...formData, projectId: e.target.value})} 
-        />
-        <button type="submit" className="bg-blue-600 text-white px-4 py-2 rounded text-sm font-medium hover:bg-blue-700">
-          Add Entry
-        </button>
-        <div className="md:col-span-5">
-          <textarea 
-            className="w-full p-2 border rounded text-sm" 
-            placeholder="Notes (optional)" 
-            value={formData.notes} 
-            onChange={e => setFormData({...formData, notes: e.target.value})} 
-          />
+      <div className="grid grid-cols-1 lg:grid-cols-4 gap-6">
+        <div className="lg:col-span-1 space-y-4">
+          <div className="p-4 bg-white border rounded-lg shadow-sm space-y-4">
+            <h2 className="font-semibold">New Entry</h2>
+            
+            <div>
+              <label className="block text-xs font-medium text-gray-500 mb-1">Template</label>
+              <select 
+                className="w-full p-2 text-sm border rounded bg-gray-50"
+                onChange={(e) => handleTemplateChange(e.target.value)}
+                value=""
+              >
+                <option value="">-- Select Template --</option>
+                {templates?.map(t => (
+                  <option key={t.id} value={t.id}>{t.name}</option>
+                ))}
+              </select>
+            </div>
+
+            <SuggestionInput 
+              label="Description" 
+              value={formData.description} 
+              onChange={v => setFormData({...formData, description: v})} 
+              suggestions={descriptionSuggestions} 
+            />
+            
+            <div className="grid grid-cols-2 gap-2">
+              <div>
+                <label className="block text-xs font-medium text-gray-500 mb-1">Start</label>
+                <input 
+                  type="datetime-local" 
+                  className="w-full p-2 text-sm border rounded" 
+                  value={formData.startTime} 
+                  onChange={e => setFormData({...formData, startTime: e.target.value})} 
+                />
+              </div>
+              <div>
+                <label className="block text-xs font-medium text-gray-500 mb-1">End</label>
+                <input 
+                  type="datetime-local" 
+                  className="w-full p-2 text-sm border rounded" 
+                  value={formData.endTime} 
+                  onChange={e => setFormData({...formData, endTime: e.target.value})} 
+                />
+              </div>
+            </div>
+
+            <div>
+              <label className="block text-xs font-medium text-gray-500 mb-1">Project ID</label>
+              <input 
+                className="w-full p-2 text-sm border rounded" 
+                value={formData.projectId} 
+                onChange={e => setFormData({...formData, projectId: e.target.value})} 
+              />
+            </div>
+
+            <div>
+              <label className="block text-xs font-medium text-gray-500 mb-1">Notes</label>
+              <textarea 
+                className="w-full p-2 text-sm border rounded h-20" 
+                value={formData.notes} 
+                onChange={e => setFormData({...formData, notes: e.target.value})} 
+              />
+            </div>
+
+            <button 
+              onClick={() => createMutation.mutate(formData)}
+              disabled={createMutation.isPending}
+              className="w-full py-2 bg-blue-600 text-white rounded hover:bg-blue-700 disabled:opacity-50"
+            >
+              {createMutation.isPending ? "Saving..." : "Save Entry"}
+            </button>
+          </div>
+
+          <div className="p-4 bg-white border rounded-lg shadow-sm space-y-3">
+            <h2 className="font-semibold">Saved Views</h2>
+            <div className="space-y-1">
+              {savedViews?.map(view => (
+                <div key={view.id} className="flex items-center justify-between group">
+                  <button 
+                    onClick={() => setFilters({ ...filters, ...view.filters })}
+                    className="text-sm text-blue-600 hover:underline"
+                  >
+                    {view.name}
+                  </button>
+                  <button 
+                    onClick={() => deleteViewMutation.mutate(view.id)}
+                    className="hidden group-hover:block text-xs text-red-500"
+                  >
+                    Delete
+                  </button>
+                </div>
+              ))}
+            </div>
+          </div>
         </div>
-      </form>
 
-      <SmartFilters 
-        filters={filters} 
-        setFilters={setFilters} 
-        savedViews={savedViews || []} 
-        onSaveView={(v) => saveViewMutation.mutate(v)} 
-        onDeleteView={(id) => deleteViewMutation.mutate(id)} 
-      />
+        <div className="lg:col-span-3 space-y-4">
+          <SmartFilters 
+            filters={filters} 
+            setFilters={setFilters} 
+            onSaveView={(name, filters) => saveViewMutation.mutate({ name, filters })} 
+          />
 
-      {filteredEntries.length === 0 ? (
-        <EmptyState message="No time entries found." />
-      ) : (
-        <div className="overflow-x-auto border rounded-lg">
-          <table className="w-full text-left text-sm">
-            <thead className="bg-gray-50 border-b">
-              <tr>
-                <th className="p-3 w-10">
-                  <input 
-                    type="checkbox" 
-                    checked={selectedIds.length === filteredEntries.length} 
-                    onChange={e => setSelectedIds(e.target.checked ? filteredEntries.map(en => en.id) : [])} 
-                  />
-                </th>
-                <th className="p-3 font-semibold">Description</th>
-                <th className="p-3 font-semibold">Start</th>
-                <th className="p-3 font-semibold">End</th>
-                <th className="p-3 font-semibold">Duration</th>
-                <th className="p-3 font-semibold">Project</th>
-                <th className="p-3 font-semibold text-right">Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              {filteredEntries.map(entry => {
-                const durationMs = new Date(entry.endTime).getTime() - new Date(entry.startTime).getTime()
-                const durationHours = (durationMs / (1000 * 60 * 60)).toFixed(2)
-
-                return (
-                  <React.Fragment key={entry.id}>
-                    <tr className={`border-b hover:bg-gray-50 ${selectedIds.includes(entry.id) ? 'bg-blue-50' : ''}`}>
-                      <td className="p-3">
-                        <input 
-                          type="checkbox" 
-                          checked={selectedIds.includes(entry.id)} 
-                          onChange={e => setSelectedIds(prev => e.target.checked ? [...prev, entry.id] : prev.filter(id => id !== entry.id))} 
-                        />
-                      </td>
-                      <td 
-                        className="p-3 cursor-pointer hover:bg-blue-100 transition-colors" 
-                        onClick={() => handleStartEditing(entry)}
-                      >
-                        {editingId === entry.id ? (
+          {filteredEntries.length === 0 ? (
+            <EmptyState message="No time entries found matching your filters." />
+          ) : (
+            <div className="bg-white border rounded-lg overflow-hidden shadow-sm">
+              <table className="w-full text-left text-sm">
+                <thead className="bg-gray-50 border-b">
+                  <tr>
+                    <th className="p-3 w-10">
+                      <input 
+                        type="checkbox" 
+                        checked={selectedIds.length > 0 && selectedIds.length === filteredEntries.length}
+                        onChange={e => {
+                          if (e.target.checked) setSelectedIds(filteredEntries.map(en => en.id))
+                          else setSelectedIds([])
+                        }}
+                      />
+                    </th>
+                    <th className="p-3 font-medium">Description</th>
+                    <th className="p-3 font-medium">Project</th>
+                    <th className="p-3 font-medium">Duration</th>
+                    <th className="p-3 font-medium">Date</th>
+                    <th className="p-3 font-medium text-right">Actions</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {filteredEntries.map(entry => {
+                    const start = new Date(entry.startTime)
+                    const end = new Date(entry.endTime)
+                    const durationHours = (end.getTime() - start.getTime()) / 3600000
+                    
+                    return (
+                      <tr key={entry.id} className="border-b hover:bg-gray-50">
+                        <td className="p-3">
                           <input 
-                            autoFocus
-                            className="w-full p-1 border rounded" 
-                            value={editValue} 
-                            onChange={e => setEditValue(e.target.value)} 
-                            onBlur={handleEditBlur} 
-                            onKeyDown={handleEditKeyDown}
-                            onClick={(e) => e.stopPropagation()}
+                            type="checkbox" 
+                            checked={selectedIds.includes(entry.id)}
+                            onChange={e => {
+                              if (e.target.checked) setSelectedIds([...selectedIds, entry.id])
+                              else setSelectedIds(selectedIds.filter(id => id !== entry.id))
+                            }}
                           />
-                        ) : (
-                          <span className="block truncate max-w-md">{entry.description}</span>
-                        )}
-                      </td>
-                      <td className="p-3 text-gray-600">{new Date(entry.startTime).toLocaleString()}</td>
-                      <td className="p-3 text-gray-600">{new Date(entry.endTime).toLocaleString()}</td>
-                      <td className="p-3 font-mono">{durationHours}h</td>
-                      <td className="p-3 text-gray-500">{entry.projectId}</td>
-                      <td className="p-3 text-right space-x-2">
-                        <button 
-                          onClick={() => setExpandedRows(prev => ({...prev, [entry.id]: !prev[entry.id]}))} 
-                          className="text-blue-600 hover:underline"
-                        >
-                          {expandedRows[entry.id] ? 'Hide' : 'Details'}
-                        </button>
-                        <button 
-                          onClick={() => deleteMutation.mutate(entry.id)} 
-                          className="text-red-600 hover:underline"
-                        >
-                          Delete
-                        </button>
-                      </td>
-                    </tr>
-                    {expandedRows[entry.id] && (
-                      <tr className="bg-gray-50">
-                        <td colSpan={7} className="p-4 border-b">
-                          <div className="text-xs text-gray-500 mb-2 uppercase font-bold">Notes</div>
-                          <div className="text-sm prose prose-sm max-w-none">
-                            {renderSimpleMarkdown(entry.notes)}
-                          </div>
+                        </td>
+                        <td className="p-3">
+                          {editingId === entry.id ? (
+                            <input 
+                              className="border p-1 rounded w-full" 
+                              value={editValue} 
+                              onChange={e => setEditValue(e.target.value)}
+                              onBlur={() => {
+                                updateMutation.mutate({ id: entry.id, data: { description: editValue } })
+                                setEditingId(null)
+                              }}
+                              autoFocus
+                            />
+                          ) : (
+                            <span onClick={() => { setEditingId(entry.id); setEditValue(entry.description); }} className="cursor-pointer hover:text-blue-600">
+                              {entry.description}
+                            </span>
+                          )}
+                        </td>
+                        <td className="p-3 text-gray-500">{entry.projectId}</td>
+                        <td className="p-3">{durationHours.toFixed(2)}h</td>
+                        <td className="p-3 text-gray-500">{start.toLocaleDateString()}</td>
+                        <td className="p-3 text-right space-x-2">
+                          <button 
+                            onClick={() => {
+                              setExpandedRows(prev => ({ ...prev, [entry.id]: !prev[entry.id] }))
+                            }}
+                            className="text-gray-400 hover:text-gray-600"
+                          >
+                            {expandedRows[entry.id] ? '▲' : '▼'}
+                          </button>
+                          <button 
+                            onClick={() => deleteMutation.mutate(entry.id)}
+                            className="text-red-400 hover:text-red-600"
+                          >
+                            Delete
+                          </button>
                         </td>
                       </tr>
-                    )}
-                  </React.Fragment>
-                )}
-              ))}
-            </tbody>
-          </table>
+                    )
+                  })}
+                </tbody>
+              </table>
+              
+              {selectedIds.length > 0 && (
+                <div className="p-3 bg-blue-50 border-t flex justify-between items-center">
+                  <span className="text-sm font-medium">{selectedIds.length} entries selected</span>
+                  <button 
+                    onClick={() => { if(confirm("Delete selected?")) bulkDeleteMutation.mutate(selectedIds) }}
+                    className="px-3 py-1 bg-red-600 text-white text-xs rounded hover:bg-red-700"
+                  >
+                    Bulk Delete
+                  </button>
+                </div>
+              )}
+            </div>
+          )}
         </div>
-      )}
-
-      {selectedIds.length > 0 && (
-        <div className="fixed bottom-6 left-1/2 -translate-x-1/2 bg-white shadow-xl border rounded-full px-6 py-3 flex items-center gap-4 animate-in fade-in slide-in-from-bottom-4">
-          <span className="text-sm font-medium">{selectedIds.length} entries selected</span>
-          <button 
-            onClick={() => {
-              if (confirm(`Delete ${selectedIds.length} entries?`)) {
-                bulkDeleteMutation.mutate(selectedIds)
-              }
-            }} 
-            className="text-sm text-red-600 font-bold hover:text-red-800"
-          >
-            Delete Selected
-          </button>
-          <button 
-            onClick={() => setSelectedIds([])} 
-            className="text-sm text-gray-500 hover:text-gray-700"
-          >
-            Cancel
-          </button>
-        </div>
-      )}
+      </div>
     </div>
   )
 }
\ No newline at end of file