diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html
index a5d20c6..232b667 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html
@@ -45,9 +45,9 @@
             {{~ # Avatar }}
             <div class="chatlog__author-avatar-container">
                 <img class="chatlog__author-avatar" src="{{ group.Author.AvatarUrl }}" />
-            </div>
-            {{~ # Author name and timestamp }}
+            </div>            
             <div class="chatlog__messages">
+                {{~ # Author name and timestamp }}
                 <span class="chatlog__author-name" title="{{ group.Author.FullName | HtmlEncode }}">{{ group.Author.Name | HtmlEncode }}</span>
                 <span class="chatlog__timestamp">{{ group.Timestamp | FormatDate | HtmlEncode }}</span>
 
@@ -93,6 +93,7 @@
                                                 {{ if embed.Author.IconUrl }}
                                                     <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl }}" />
                                                 {{ end }}
+
                                                 {{ if embed.Author.Name }}
                                                     <span class="chatlog__embed-author-name">
                                                         {{ if embed.Author.Url }}
@@ -187,8 +188,10 @@
                         {{ for reaction in message.Reactions }}
                             <div class="chatlog__reaction">
                                 <span class="chatlog__reaction-emoji">
+                                    {{~ # Custom emoji }}
                                     {{ if reaction.EmojiId }}
                                         <img class="emoji emoji--small" title="{{ reaction.EmojiName }}" src="https://cdn.discordapp.com/emojis/{{ reaction.EmojiId }}.png" />
+                                    {{~ # Default emoji }}
                                     {{ else }}
                                         {{ reaction.EmojiName }}
                                     {{ end }}
diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
index 998abaa..d2d4be0 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css
@@ -76,14 +76,14 @@ a {
     color: #ffffff99;
 }
 
-.chatlog__embed-fields {
-    color: #ffffff99;
-}
-
 .chatlog__embed-field-name {
     color: #ffffff;
 }
 
+.chatlog__embed-field-value {
+    color: #ffffff99;
+}
+
 .chatlog__embed-footer {
     color: #ffffff99;
 }
diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
index 2b3999c..97fec84 100644
--- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
+++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css
@@ -1,7 +1,7 @@
 /* === GENERAL === */
 
 body {
-    background-color: #fff;
+    background-color: #ffffff;
     color: #737f8d;
 }
 
@@ -14,9 +14,15 @@ a {
 }
 
 .pre--multiline {
+    border-color: #f3f3f3;
     color: #657b83;
 }
 
+.mention {
+    background-color: #f1f3fb;
+    color: #7289da;
+}
+
 /* === INFO === */
 
 .info__guild-name {
@@ -34,7 +40,7 @@ a {
 /* === CHATLOG === */
 
 .chatlog__message-group {
-    border-top: 1px solid #eceeef;
+    border-color: #eceeef;
 }
 
 .chatlog__author-name {
@@ -49,6 +55,39 @@ a {
     color: #99aab5;
 }
 
+.chatlog__embed-content-container {
+    background-color: #f9f9f94d;
+    border-color: #cccccc4d;
+}
+
+.chatlog__embed-author-name {
+    color: #4f545c;
+}
+
+.chatlog__embed-author-name-link {
+    color: #4f545c;
+}
+
+.chatlog__embed-title {
+    color: #4f545c;
+}
+
+.chatlog__embed-description {
+    color: #737f8d;
+}
+
+.chatlog__embed-field-name {
+    color: #36393e;
+}
+
+.chatlog__embed-field-value {
+    color: #737f8d;
+}
+
+.chatlog__embed-footer {
+    color: #4f535b99;
+}
+
 .chatlog__reaction {
     background-color: #4f545c0f;
 }