diff --git a/src/app/episode-details/episode-details.component.css b/src/app/episode-details/episode-details.component.css
index 0c78f80..1c7c99f 100644
--- a/src/app/episode-details/episode-details.component.css
+++ b/src/app/episode-details/episode-details.component.css
@@ -2,4 +2,17 @@
     margin-left: 15px;
     width: 100px;
     float:right;
-}
\ No newline at end of file
+}
+
+.them-name {
+  cursor: pointer;
+  width: 100%;
+  display: flex;
+  padding: 10px;
+  vertical-align: center;
+}
+
+.them-name:hover {
+  box-shadow: 0 0 5px rgba(0,0,0,0.5);
+  border-radius: 10px;
+}
diff --git a/src/app/episode-details/episode-details.component.html b/src/app/episode-details/episode-details.component.html
index 1efaf7e..ee4ca98 100644
--- a/src/app/episode-details/episode-details.component.html
+++ b/src/app/episode-details/episode-details.component.html
@@ -1,18 +1,18 @@
 <div *ngIf="episode">
   <div *ngIf="currentUser.isAdmin" class="row">
-      <div class="col mb-2">
-        <button type="button" class="btn btn-block btn-outline-info" (click)="linkThemes(episode)">Link themes</button>
-      </div>  
+    <div class="col mb-2">
+      <button type="button" class="btn btn-block btn-outline-info" (click)="linkThemes(episode)">Link themes</button>
     </div>
+  </div>
   <div class="row">
-        <div class="col">
-          Current: {{ now | date:'hh:mm:ss EEEE dd LLL' }}
-        </div>
+    <div class="col">
+      Current: {{ now | date:'hh:mm:ss EEEE dd LLL' }}
+    </div>
   </div>
-  <div class="row mb-2">  
-        <div class="col">
-          Started: {{ episode.startTime | date:'hh:mm:ss EEEE dd LLL'}}
-        </div>    
+  <div class="row mb-2">
+    <div class="col">
+      Started: {{ episode.startTime | date:'hh:mm:ss EEEE dd LLL'}}
+    </div>
   </div>
   <div class="row mb-2">
     <div class="col-4">
@@ -28,38 +28,47 @@ <h2>{{episode.name}}</h2>
   </div>
   <div *ngIf="currentUser.isAdmin" class="row mb-3">
     <div class="col-6">
-      <button type="button" class="btn btn-warning btn-block" [disabled]='episode.started' (click)="startEpisode(episode)">Start episode</button>
+      <button type="button" class="btn btn-warning btn-block" [disabled]='episode.started'
+              (click)="startEpisode(episode)">Start episode
+      </button>
     </div>
     <div class="col-6">
-      <button type="button" class="btn btn-danger btn-block" [disabled]='!episode.started' (click)="stopEpisode(episode)">Stop episode</button>
-    </div>  
+      <button type="button" class="btn btn-danger btn-block" [disabled]='!episode.started'
+              (click)="stopEpisode(episode)">Stop episode
+      </button>
+    </div>
   </div>
   <div class="row">
-      <div class="col">
-        <div class="table-responsive">
-            <table class="table table-hover">
-              <caption>Theme list</caption>
-                <thead class="thead-light">
-                  <tr>
-                    <th>Timecode</th>
-                    <th class="hidden">Title</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                  <tbody>
-                    <tr *ngFor="let theme of episode?.themeList" [class.table-success]="theme.passed">
-                      <td>{{ theme.timecode }}</td>
-                      <td [innerHTML]="theme.title | linkify"></td>
-                      <td><button class="btn btn-dark item" [disabled]="!episode.started" (click)="track(episode, theme)">Track</button></td>
-                    </tr>
-                  </tbody>
-            </table>
-        </div>
+    <div class="col">
+      <div class="table-responsive">
+        <table class="table">
+          <caption>Theme list</caption>
+          <thead class="thead-light">
+          <tr>
+            <th>Timecode</th>
+            <th class="hidden">Title</th>
+            <th></th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr *ngFor="let theme of episode?.themeList" [class.table-success]="theme.passed">
+            <td>{{ theme.timecode }}</td>
+            <td [innerHTML]="theme.title | linkify"></td>
+            <td>
+              <button type="button" class="btn btn-warning item" (click)="unlinkThemes(episode.id, theme.id)">Unlink</button>
+              <button type="button" class="btn btn-dark item" [disabled]="!episode.started" (click)="track(episode, theme)">Track</button>
+            </td>
+          </tr>
+          </tbody>
+        </table>
       </div>
+    </div>
   </div>
   <div *ngIf="currentUser.isAdmin" class="row mb-5">
-      <div class="col-12 mb-5">
-            <button type="button" class="btn btn-info btn-sm btn-block" *ngIf='isFinished(episode)' (click)="export(episode)">Export this episode</button>
-      </div>
+    <div class="col-12 mb-5">
+      <button type="button" class="btn btn-info btn-sm btn-block" *ngIf='isFinished(episode)' (click)="export(episode)">
+        Export this episode
+      </button>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/episode-details/episode-details.component.ts b/src/app/episode-details/episode-details.component.ts
index cb5cbd8..c0d35ec 100644
--- a/src/app/episode-details/episode-details.component.ts
+++ b/src/app/episode-details/episode-details.component.ts
@@ -93,4 +93,8 @@ export class EpisodeDetailsComponent implements OnInit {
     });
  }
 
+  unlinkThemes(id: number, themeId: number) {
+    this.episodeService.unlinkThemesToEpisode(id, themeId).subscribe(data => { this.getEpisodeDetails()});
+  }
+
 }
diff --git a/src/app/post-details/post-details.component.html b/src/app/post-details/post-details.component.html
index 9ff0b22..9856ba3 100644
--- a/src/app/post-details/post-details.component.html
+++ b/src/app/post-details/post-details.component.html
@@ -24,7 +24,7 @@ <h6>Гости:</h6>
             <h6>Темы:</h6>
             <div class="col-12 mb-3 mx-3">
               <ul *ngFor="let theme of episode?.themeList" class="list-group">
-                <li *ngIf="theme.timecode">{{theme.title}} - {{theme.timecode}}</li>
+                <li *ngIf="theme.timecode">{{theme.title}} - <em>{{theme.timecode}}</em></li>
               </ul>
             </div>
 
@@ -68,4 +68,4 @@ <h6> Стать патроном: <a href="http://patreon.com/automation_remarks
         <app-sidenav></app-sidenav>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/src/app/service/episode.service.ts b/src/app/service/episode.service.ts
index fdd9a96..eed375c 100644
--- a/src/app/service/episode.service.ts
+++ b/src/app/service/episode.service.ts
@@ -57,6 +57,10 @@ export class EpisodeService {
     return this.apiClient.post(`${this.baseUrl}/${episode.id}`, selectedThemeIds)
   }
 
+  unlinkThemesToEpisode(id: number, themeId: number): Observable<any> {
+    return this.apiClient.post(`${this.baseUrl}/${id}/theme/${themeId}/unlink`, {})
+  }
+
   removeEpisode(id: Number): Observable<any> {
     return this.apiClient.delete(`${this.baseUrl}/${id}/remove`)
   }