diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
index e9ee054ab..c841581d2 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -91,9 +91,14 @@ const qualityTokens = [
 const mediaInfoTokens = [
   { token: '{MediaInfo Simple}', example: 'x264 DTS' },
   { token: '{MediaInfo Full}', example: 'x264 DTS [EN+DE]' },
-  { token: '{MediaInfo VideoCodec}', example: 'x264' },
+
   { token: '{MediaInfo AudioCodec}', example: 'DTS' },
   { token: '{MediaInfo AudioChannels}', example: '5.1' },
+  { token: '{MediaInfo AudioLanguages}', example: '[EN+DE]' },
+  { token: '{MediaInfo SubtitleLanguages}', example: '[DE]' },
+
+  { token: '{MediaInfo VideoCodec}', example: 'x264' },
+  { token: '{MediaInfo VideoBitDepth}', example: '10' },
   { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' }
 ];
 
@@ -179,7 +184,6 @@ class NamingModal extends Component {
       advancedSettings,
       season,
       episode,
-      daily,
       anime,
       additional,
       onInputChange,
@@ -341,30 +345,27 @@ class NamingModal extends Component {
                     </div>
                   </FieldSet>
 
-                  {
-                    daily &&
-                      <FieldSet legend="Air-Date">
-                        <div className={styles.groups}>
-                          {
-                            airDateTokens.map(({ token, example }) => {
-                              return (
-                                <NamingOption
-                                  key={token}
-                                  name={name}
-                                  value={value}
-                                  token={token}
-                                  example={example}
-                                  tokenSeparator={tokenSeparator}
-                                  tokenCase={tokenCase}
-                                  onPress={this.onOptionPress}
-                                />
-                              );
-                            }
-                            )
-                          }
-                        </div>
-                      </FieldSet>
-                  }
+                  <FieldSet legend="Air-Date">
+                    <div className={styles.groups}>
+                      {
+                        airDateTokens.map(({ token, example }) => {
+                          return (
+                            <NamingOption
+                              key={token}
+                              name={name}
+                              value={value}
+                              token={token}
+                              example={example}
+                              tokenSeparator={tokenSeparator}
+                              tokenCase={tokenCase}
+                              onPress={this.onOptionPress}
+                            />
+                          );
+                        }
+                        )
+                      }
+                    </div>
+                  </FieldSet>
 
                   {
                     anime &&
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingOption.css b/frontend/src/Settings/MediaManagement/Naming/NamingOption.css
index d9f865936..89149e213 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingOption.css
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingOption.css
@@ -1,6 +1,6 @@
 .option {
   display: flex;
-  align-items: center;
+  align-items: stretch;
   flex-wrap: wrap;
   margin: 3px;
   border: 1px solid $borderColor;
@@ -17,7 +17,7 @@
 }
 
 .small {
-  width: 460px;
+  width: 480px;
 }
 
 .large {
@@ -34,7 +34,6 @@
 .example {
   display: flex;
   align-items: center;
-  align-self: stretch;
   flex: 0 0 50%;
   padding: 6px 16px;
   background-color: #ddd;