diff --git a/resources/lang/af/cachet.php b/resources/lang/af/cachet.php
index 36584718..41e1c854 100755
--- a/resources/lang/af/cachet.php
+++ b/resources/lang/af/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operasioneel',
             2 => 'Prestasieprobleme',
             3 => 'Gedeeltelike Onderbreking',
             4 => 'Groot Onderbreking',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/af/dashboard.php b/resources/lang/af/dashboard.php
index b85bccb3..8c53c3df 100755
--- a/resources/lang/af/dashboard.php
+++ b/resources/lang/af/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/af/forms.php b/resources/lang/af/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/af/forms.php
+++ b/resources/lang/af/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/ar/cachet.php b/resources/lang/ar/cachet.php
index e5138db1..f15122a0 100755
--- a/resources/lang/ar/cachet.php
+++ b/resources/lang/ar/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operational',
             2 => 'Performance Issues',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ar/dashboard.php b/resources/lang/ar/dashboard.php
index c41e295d..2686a17d 100755
--- a/resources/lang/ar/dashboard.php
+++ b/resources/lang/ar/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/ar/forms.php b/resources/lang/ar/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/ar/forms.php
+++ b/resources/lang/ar/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/ar/pagination.php b/resources/lang/ar/pagination.php
index add1092a..dff61b92 100755
--- a/resources/lang/ar/pagination.php
+++ b/resources/lang/ar/pagination.php
@@ -23,6 +23,6 @@ return [
     */
 
     'previous' => '&laquo; Previous',
-    'next'     => 'Next &raquo;',
+    'next'     => 'التالي &raquo;',
 
 ];
diff --git a/resources/lang/ar/setup.php b/resources/lang/ar/setup.php
index 518c20db..d6390c21 100755
--- a/resources/lang/ar/setup.php
+++ b/resources/lang/ar/setup.php
@@ -10,14 +10,14 @@
  */
 
 return [
-    'setup'             => 'Setup',
-    'title'             => 'Setup Cachet',
-    'service_details'   => 'Service details',
-    'env_setup'         => 'Environment setup',
+    'setup'             => 'تنصيب',
+    'title'             => 'إعداد Cachet',
+    'service_details'   => 'تفاصيل الخدمة',
+    'env_setup'         => 'إعداد البيئة',
     'status_page_setup' => 'Status page setup',
     'show_support'      => 'Show support for Cachet?',
-    'admin_account'     => 'Administrator account',
-    'complete_setup'    => 'Complete setup',
-    'completed'         => 'Cachet has been configured successfully!',
-    'finish_setup'      => 'Go to dashboard',
+    'admin_account'     => 'حساب المدير',
+    'complete_setup'    => 'إكمال الإعداد',
+    'completed'         => 'تم إعداد cachet بنجاح!',
+    'finish_setup'      => 'انتقل إلى لوحة التحكم',
 ];
diff --git a/resources/lang/ca/cachet.php b/resources/lang/ca/cachet.php
index e5138db1..f15122a0 100755
--- a/resources/lang/ca/cachet.php
+++ b/resources/lang/ca/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operational',
             2 => 'Performance Issues',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ca/dashboard.php b/resources/lang/ca/dashboard.php
index c41e295d..2686a17d 100755
--- a/resources/lang/ca/dashboard.php
+++ b/resources/lang/ca/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/ca/forms.php b/resources/lang/ca/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/ca/forms.php
+++ b/resources/lang/ca/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/cs/cachet.php b/resources/lang/cs/cachet.php
index b1afe3cd..7ab75c8a 100755
--- a/resources/lang/cs/cachet.php
+++ b/resources/lang/cs/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'V provozu',
             2 => 'Problémy s výkonem',
             3 => 'Částečný výpadek',
             4 => 'Závažný výpadek',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Přihlásit',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Přihlásit se k zasílání upozornění e-mailem.',
             'subscribed'         => 'Proběhlo přihlášení k e-mailovým upozorněním, potvrďte ho prosím na vašem e-mailu.',
             'verified'           => 'E-mail pro zasílání upozornění byl ověřen. Děkujeme!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Odběr e-mailových upozornění byl zrušen.',
             'failure'            => 'Došlo k chybě při nastavení odběru e-mailů.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/cs/dashboard.php b/resources/lang/cs/dashboard.php
index 81cf7944..60359d6e 100755
--- a/resources/lang/cs/dashboard.php
+++ b/resources/lang/cs/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Šablony incidentů',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident přidán.',
-            'failure' => 'Na incidentu se něco pokazilo.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident aktualizován.',
-            'failure' => 'S incidentem se něco pokazilo.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Šablona vytvořena.',
-                'failure' => 'Na šabloně incidentu se něco se pokazilo.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Šablona byla aktualizována!',
-                'failure' => 'Při aktualizaci šablony incidentu se něco pokazilo',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Naplánováno na :timestamp',
         'add'          => [
-            'title'   => 'Přidat plánovanou odstávku',
-            'success' => 'Plán byl přidán.',
-            'failure' => 'Něco se pokazilo při přidávání plánu.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Upravit plánované odstávky',
-            'success' => 'Plán byl aktualizován!',
-            'failure' => 'Něco se pokazilo při úpravě plánu.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Plán byl vymazán a nebude se zobrazovat na vaší stavové stránce.',
-            'failure' => 'Plán se nepodařilo smazat. Zkuste to prosím znovu.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'Měli byste přidat službu.',
-            'success' => 'Služba vytvořena.',
-            'failure' => 'Na službě se objevila chyba.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Služba byla aktualizována.',
-            'failure' => 'Na službě se objevila chyba.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Můžete přidat skupinu služeb.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Skupina služeb byla přidána.',
-                'failure' => 'Vyskytla se chyba skupiny služeb.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Skupina služeb byla aktualizována.',
-                'failure' => 'Vyskytla se chyba skupiny služeb.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metrika vytvořena.',
-            'failure' => 'Něco se stalo s metrikou.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metrika aktualizována.',
-            'failure' => 'Něco se stalo s metrikou.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Odběratelé',
-        'description'  => 'Odběratelé obdrží aktualizace e-mailem v okamžiku, kdy dojde ke vzniku incidentu.',
-        'verified'     => 'Ověřeno',
-        'not_verified' => 'Neověřeno',
-        'add'          => [
+        'subscribers'      => 'Odběratelé',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Ověřeno',
+        'not_verified'     => 'Neověřeno',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Odběratel přidán.',
-            'failure' => 'Na službě se objevila chyba.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Odběratel aktualizován.',
-            'failure' => 'Něco se pokazilo při aktualizaci.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Členové týmu budou schopni přidat nebo upravit komponenty a incidenty.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Nový člen týmu byl přidán.',
-            'failure' => 'Nastala chyba při mazání uživatele.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Profil byl aktualizován.',
-            'failure' => 'Něco se pokazilo při aktualizaci.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'Nastala chyba při mazání uživatele.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Zabezpečení',
             'two-factor' => 'Uživatelé bez dvoufaktorového ověřování',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Vaše stavová stránka je téměř připravena! Možná budete chtít upravit další nastavení',
-        'close'   => 'Přejděte do řídicího panelu',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Vytvoření komponent',
             'incident'   => 'Vytvoření incidentů',
diff --git a/resources/lang/cs/forms.php b/resources/lang/cs/forms.php
index c88099e3..52afcdcf 100755
--- a/resources/lang/cs/forms.php
+++ b/resources/lang/cs/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Na kdy naplánovat údržbu/výpadek?',
         'incident_time'      => 'Kdy k incidentu došlo?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Viditelnost incidentu',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viditelné veřejnosti',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Jméno',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Jméno',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Zobrazit grafy na stavové stránce?',
             'about-this-page'        => 'O této stránce',
             'days-of-incidents'      => 'Kolik dní incidentů zobrazovat?',
-            'banner'                 => 'Obrázek banneru',
-            'banner-help'            => 'Doručuje se nenahrávat soubory větší než 930 pixelů na šířku.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Doručuje se nenahrávat soubory větší než 930 pixelů na šířku.",
             'subscribers'            => 'Umožnit lidem, aby se přihlašovali k odběru e-mailových upozornění?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Oddělené čárkami. Výše uvedené domény jsou ve výchozím nastavení automaticky povoleny.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Vlastní šablona stylů',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Barva pozadí',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Barva textu',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/da/cachet.php b/resources/lang/da/cachet.php
index f758c2e6..80415247 100755
--- a/resources/lang/da/cachet.php
+++ b/resources/lang/da/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Normal',
             2 => 'Hastighedsproblemer',
             3 => 'Nogen udfald',
             4 => 'Store problemer',
         ],
+        'group' => [
+            'other' => 'Andre komponenter',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonner på seneste hændelser.',
         'button'    => 'Abonner',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'Du abonner i øjeblikket på alle opdateringer.',
+            'my_subscriptions' => 'Du abonnere i øjeblikket på følgende opdateringer.',
+        ],
+        'email' => [
             'subscribe'          => 'Få opdateringer pr. email.',
             'subscribed'         => 'Du er blevet tilmeldt emailnotifikationer. Vi har sendt dig en bekræftelse på den indtastede email-adresse.',
             'verified'           => 'Din tilmelding er nu blevet bekræftet, tak.',
+            'manage'             => 'Administrer dit abonnement.',
             'unsubscribe'        => 'Afmeld emailnotifikationer.',
             'unsubscribed'       => 'Du er nu blevet frameldt vores emailnotifikationer.',
             'failure'            => 'Noget gik galt med bekræftelsen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Hold dig opdateret med de seneste opdateringer fra :app.',
     'powered_by'      => ':app statusside er bygget på <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Om siden',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/da/dashboard.php b/resources/lang/da/dashboard.php
index 447f962b..4706cbdc 100755
--- a/resources/lang/da/dashboard.php
+++ b/resources/lang/da/dashboard.php
@@ -22,13 +22,13 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Opret hændelse',
-            'success' => 'Hændelse oprettet.',
-            'failure' => 'Noget gik galt i oprettelsen af hændelsen.',
+            'success' => 'Hændelse tilføjet.',
+            'failure' => 'Der opstod en fejl i forsøget på at tilføje hændelsen. Prøv venligst igen.',
         ],
         'edit' => [
             'title'   => 'Redigér hændelse',
             'success' => 'Hændelse opdateret.',
-            'failure' => 'Kunne ikke opdatere hændelsen. Prøv venligst igen.',
+            'failure' => 'Der opstod en fejl under forsøget på at redigere hændelsen. Prøv venligst igen.',
         ],
         'delete' => [
             'success' => 'Hændelsen er blevet slettet og vil ikke blive vist på din statusside.',
@@ -41,13 +41,13 @@ return [
             'add'   => [
                 'title'   => 'Opret hændelses skabelon',
                 'message' => 'Du bør tilføje en hændelses skabelon.',
-                'success' => 'Template created.',
-                'failure' => 'Noget gik galt i oprettelsen af skabelonen.',
+                'success' => 'Din nye hændelses skabelon er blevet oprettet.',
+                'failure' => 'En fejl er opstået med hændelses skabelonen.',
             ],
             'edit' => [
                 'title'   => 'Redigér skabelon',
-                'success' => 'Skabelonen opdateret!',
-                'failure' => 'Noget gik galt under opdateringen af skabelonen',
+                'success' => 'Hændelses skabelonen er blevet opdateret.',
+                'failure' => 'Der opstod en fejl under forsøget på at opdatere hændelses skabelonen',
             ],
             'delete' => [
                 'success' => 'Hændelses skabelonen er blevet slettet.',
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Der er intet planlagt.|Der er 1 planlagt.|Der er <strong>:count</strong> planlagte.',
         'scheduled_at' => 'Planlagt til :timestamp',
         'add'          => [
-            'title'   => 'Tilføj planlagt nedetid',
-            'success' => 'Nedetid tilføjet.',
-            'failure' => 'Noget gik galt med oprettelsen.',
+            'title'   => 'Tilføj planlagt vedligeholdelse',
+            'success' => 'Planlagt vedligeholdelse tilføjet.',
+            'failure' => 'Noget gik galt under forsøget på at tilføje planlagt vedligeholdelse. Prøv venligst igen.',
         ],
         'edit' => [
-            'title'   => 'Redigér planlagt nedetid',
-            'success' => 'Nedetid opreteret!',
-            'failure' => 'Noget gik galt under opdateringen.',
+            'title'   => 'Rediger planlagt vedligeholdelse',
+            'success' => 'Planlagt vedligeholdelse er blevet opdateret!',
+            'failure' => 'Noget gik galt under forsøget på at opdatere planlagt vedligeholdelse. Prøv venligst igen.',
         ],
         'delete' => [
-            'success' => 'Planlagt nedetid fjernet og vil ikke længere blive vist.',
-            'failure' => 'Planlagt nedetid kunne ikke slettes, prøv igen senere.',
+            'success' => 'Planlagt vedligeholdelse er blevet slette og vil ikke længere blive vist på din status side.',
+            'failure' => 'Den planlagt vedligeholdelse kunne ikke slettes. Prøv venligst igen.',
         ],
     ],
 
@@ -85,13 +85,13 @@ return [
         'add'                => [
             'title'   => 'Tilføj komponent',
             'message' => 'Du bør tilføje en komponent.',
-            'success' => 'Komponent tilføjet.',
-            'failure' => 'Noget gik galt med oprettelsen.',
+            'success' => 'Komponent oprettet.',
+            'failure' => 'Noget gik galt med komponentet. Prøv venligst igen.',
         ],
         'edit' => [
             'title'   => 'Redigér komponent',
-            'success' => 'Komponent opdteret.',
-            'failure' => 'Komponentet kunne ikke opdateres. Prøv venligst igen.',
+            'success' => 'Komponent opdateret.',
+            'failure' => 'Noget gik galt med komponentet. Prøv venligst igen.',
         ],
         'delete' => [
             'success' => 'Komponentet er blevet slettet!',
@@ -104,13 +104,13 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Tilføj komponentgruppe',
-                'success' => 'Komponentgruppe tilføjet.',
-                'failure' => 'Noget gik galt med oprettelsen.',
+                'success' => 'Komponent gruppe tilføjet.',
+                'failure' => 'Noget gik galt med komponentet gruppen. Prøv venligst igen.',
             ],
             'edit' => [
                 'title'   => 'Redigér komponentgruppe',
-                'success' => 'Gruppe opdateret.',
-                'failure' => 'Komponent gruppen kunne ikke redigeres. Prøv venligst igen.',
+                'success' => 'Komponent gruppe opdateret.',
+                'failure' => 'Noget gik galt med komponentet gruppen. Prøv venligst igen.',
             ],
             'delete' => [
                 'success' => 'Komponent gruppen er blevet slettet!',
@@ -126,12 +126,12 @@ return [
             'title'   => 'Opret graf',
             'message' => 'Du bør tilføje en graf.',
             'success' => 'Graf oprettet.',
-            'failure' => 'Noget gik galt med oprettelsen.',
+            'failure' => 'Noget gik galt med graffen. Prøv venligst igen.',
         ],
         'edit' => [
             'title'   => 'Redigér graf',
             'success' => 'Graf opdateret.',
-            'failure' => 'Noget gik galt med målestokken.',
+            'failure' => 'Noget gik galt med graffen. Prøv venligst igen.',
         ],
         'delete' => [
             'success' => 'Grafen er blevet slette og vil ikke længere blive vist på din status side.',
@@ -140,19 +140,21 @@ return [
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Abonnenter vil modtage notifikationer når hændelser oprettes.',
-        'verified'     => 'Bekræftet',
-        'not_verified' => 'Ej bekræftet',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Abonnenter vil modtage notifikationer når hændelser oprettes eller komponenter opdateres.',
+        'verified'         => 'Bekræftet',
+        'not_verified'     => 'Ej bekræftet',
+        'subscriber'       => ':email, abonnerede :date',
+        'no_subscriptions' => 'Abonnere på alle opdateringer',
+        'add'              => [
             'title'   => 'Tilføj abonnent',
             'success' => 'Subscriber added.',
-            'failure' => 'Noget gik galt med oprettelsen.',
+            'failure' => 'Noget gik galt under forsøget på at tilføje en abonnent. Prøv venligst igen.',
         ],
         'edit' => [
             'title'   => 'Redigér abonnent',
             'success' => 'Subscriber updated.',
-            'failure' => 'Something went wrong when updating.',
+            'failure' => 'Noget gik galt under forsøget på at redigere abonnenten. Prøv venligst igen.',
         ],
     ],
 
@@ -165,21 +167,21 @@ return [
         'add'         => [
             'title'   => 'Tilføj bruger',
             'success' => 'Bruger tilføjet.',
-            'failure' => 'Noget gik galt med oprettelsen.',
+            'failure' => 'Brugeren kunne ikke tilføjes. Prøv venligst igen.',
         ],
         'edit' => [
             'title'   => 'Redigér profil',
-            'success' => 'Profile updated.',
-            'failure' => 'Something went wrong when updating.',
+            'success' => 'Profil opdateret.',
+            'failure' => 'Noget gik galt under forsøget på at opdatere profilen. Prøv venligst igen.',
         ],
         'delete' => [
             'success' => 'Slet bruger.',
-            'failure' => 'Noget gik galt under sletningen af brugeren.',
+            'failure' => 'Brugeren kunne ikke tilføjes. Prøv venligst igen.',
         ],
         'invite' => [
             'title'   => 'Invite a New Team Member',
             'success' => 'The users invited.',
-            'failure' => 'Something went wrong with the invite.',
+            'failure' => 'Invitationen kunne ikke sendes. Prøv venligst igen.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Tilpasning',
+            'header'        => 'Brugerdefineret header HTML',
+            'footer'        => 'Brugerdefineret footer html',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Brugere uden two-factor login',
diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php
index c8eeba0a..a2aaccf2 100755
--- a/resources/lang/da/forms.php
+++ b/resources/lang/da/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Hvornår skal vedligeholdelses vinduet skeduleres til?',
         'incident_time'      => 'Hvornår skete hændelsen?',
         'notify_subscribers' => 'Underret abonnenter',
-        'visibility'         => 'Synlig',
+        'visibility'         => 'Hændelses synlighed',
         'public'             => 'Synlig for offentligheden',
         'logged_in_only'     => 'Kun synlig for brugere der er logget ind',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Navn',
-            'collapsed' => 'Minimer gruppen som standard',
+            'name'               => 'Navn',
+            'collapsing'         => 'Vælg synlighed af gruppen',
+            'visible'            => 'Altid åben',
+            'collapsed'          => 'Minimer gruppen som standard',
+            'collapsed_incident' => 'Minimer gruppen, men hold den åben hvis der er fejl',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Sidens navn',
+            'site-name'              => 'Sidenavn',
             'site-url'               => 'Sidens URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'Om',
             'days-of-incidents'      => 'Hvor mange dage skal der vises hændelser for?',
-            'banner'                 => 'Banner Image',
-            'banner-help'            => 'Det anbefales ikke at uploade billeder bredere end 930px.',
+            'banner'                 => 'Banner billede',
+            'banner-help'            => "Det anbefales ikke at uploade billeder bredere end 930px.",
             'subscribers'            => 'Tillad at man kan tilmelde sig emailnotifikationer?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Komma adskilt. Domænet ovenfor har automatisk adgang.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Tilpasset stylesheet',
+            'custom-css' => 'Tilpasset CSS',
         ],
         'theme' => [
-            'background-color'        => 'Background Color',
+            'background-color'        => 'Baggrundsfarve',
             'background-fills'        => 'Baggrundsfyld (Komponenter, hændelser og footer)',
             'banner-background-color' => 'Banner Background Color',
             'banner-padding'          => 'Banner Padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text Color',
+            'text-color'              => 'Tekstfarve',
             'dashboard-login'         => 'Vis oversigtsside ikon i bunden af siden?',
             'reds'                    => 'Rød (Brugt til fejl)',
             'blues'                   => 'Blå (Brugt til information)',
diff --git a/resources/lang/de/cachet.php b/resources/lang/de/cachet.php
index 4b1ae65a..374e4f8f 100755
--- a/resources/lang/de/cachet.php
+++ b/resources/lang/de/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Funktionsfähig',
             2 => 'Leistungsprobleme',
             3 => 'Teilweiser Ausfall',
             4 => 'Schwerer Ausfall',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonnieren Sie um die neuesten Updates zu erhalten.',
         'button'    => 'Abonnieren',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Aktualisierungen per E-Mail abonnieren.',
             'subscribed'         => 'Sie haben E-Mail-Benachrichtigungen abonniert, überprüfen Sie bitte Ihre E-Mail, um Ihr Abonnement zu bestätigen.',
             'verified'           => 'Ihre E-Mail-Abonnement ist bestätigt worden. Danke!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Von E-Mail-Updates deabonnieren.',
             'unsubscribed'       => 'Ihre E-Mail-Abonnement wurde gekündigt.',
             'failure'            => 'Etwas ist mit dem Abonnement schief gelaufen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status-Seite betrieben mit <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'Über diese Seite',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/de/dashboard.php b/resources/lang/de/dashboard.php
index 00f6bc4c..c7986ecd 100755
--- a/resources/lang/de/dashboard.php
+++ b/resources/lang/de/dashboard.php
@@ -23,16 +23,16 @@ return [
         'add'                      => [
             'title'   => 'Vorfall hinzufügen',
             'success' => 'Vorfall hinzugefügt.',
-            'failure' => 'Etwas ist mit dem Vorfall schiefgelaufen.',
+            'failure' => 'Es ist ein Fehler beim Hinzufügen der Störung aufgetreten. Bitte erneut versuchen.',
         ],
         'edit' => [
             'title'   => 'Vorfall bearbeiten',
             'success' => 'Vorfall aktualisiert.',
-            'failure' => 'Etwas ist mit dem Vorfall schiefgelaufen.',
+            'failure' => 'Es ist ein Fehler beim Editieren der Störung aufgetreten. Bitte erneut versuchen.',
         ],
         'delete' => [
             'success' => 'Der Vorfall wurde gelöscht und wird nicht mehr angezeigt.',
-            'failure' => 'Der Vorfall konnte nicht gelöscht werden. Bitte versuche es erneut.',
+            'failure' => 'Die Störung konnte nicht gelöscht werden. Bitte versuche es erneut.',
         ],
 
         // Incident templates
@@ -41,12 +41,12 @@ return [
             'add'   => [
                 'title'   => 'Vorfallvorlage erstellen',
                 'message' => 'Du solltest eine Vorfall-Vorlage hinzufügen.',
-                'success' => 'Vorlage erstellt.',
+                'success' => 'Deine neue Störungsvorlage wurde angelegt.',
                 'failure' => 'Etwas ist mit der Vorfallvorlage schiefgelaufen.',
             ],
             'edit' => [
                 'title'   => 'Vorlage bearbeiten',
-                'success' => 'Vorlage aktualisiert!',
+                'success' => 'Die Vorfallvorlage wurde aktualisiert.',
                 'failure' => 'Etwas ist mit dem Updaten der Vorfallvorlage schiefgelaufen',
             ],
             'delete' => [
@@ -64,12 +64,12 @@ return [
         'add'          => [
             'title'   => 'Planmäßige Wartung hinzufügen',
             'success' => 'Zeitplan hinzugefügt.',
-            'failure' => 'Etwas ist mit dem hinzufügen des Zeitplanes schiefgelaufen.',
+            'failure' => 'Etwas lief schief mit dem Hinzufügen des Zeitplans. Bitte versuchen Sie es erneut.',
         ],
         'edit' => [
             'title'   => 'Planmäßige Wartung bearbeiten',
             'success' => 'Zeitplan wurde aktualisiert!',
-            'failure' => 'Etwas ist mit dem Bearbeiten des Zeitplanes schiefgelaufen.',
+            'failure' => 'Etwas lief schief mit dem Editieren des Zeitplans. Bitte versuchen Sie es erneut.',
         ],
         'delete' => [
             'success' => 'Der Zeitplan wurde gelöscht und wird nicht auf Ihrer Statusseite angezeigt.',
@@ -86,12 +86,12 @@ return [
             'title'   => 'Komponente hinzufügen',
             'message' => 'Sie sollten eine Komponente erstellen.',
             'success' => 'Komponente erstellt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Komponente bearbeiten',
             'success' => 'Komponente aktualisiert.',
-            'failure' => 'Mit der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'Die Komponente wurde gelöscht!',
@@ -105,16 +105,16 @@ return [
             'add'           => [
                 'title'   => 'Eine Komponentengruppe hinzufügen',
                 'success' => 'Komponentengruppe hinzugefügt.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Komponentengruppe bearbeiten',
                 'success' => 'Komponentengruppe aktualisiert.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Die Komponentengruppe wurde gelöscht!',
-                'failure' => 'Die Komponentengruppe konnte nicht gelöscht werden. Bitte versuche es erneut.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -126,12 +126,12 @@ return [
             'title'   => 'Metrik erstellen',
             'message' => 'Du solltest eine Metrik hinzufügen.',
             'success' => 'Metrik erstellt.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'failure' => 'Es lieft etwas mit der Metrik schief, bitte nochmal versuchen.',
         ],
         'edit' => [
             'title'   => 'Metrik bearbeiten',
             'success' => 'Metrik aktualisiert.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'failure' => 'Es lieft etwas mit der Metrik schief, bitte nochmal versuchen.',
         ],
         'delete' => [
             'success' => 'Die Metrik wurde gelöscht und wird nicht mehr angezeigt.',
@@ -140,19 +140,21 @@ return [
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Abonnenten',
-        'description'  => 'Abonnenten erhalten E-Mail Updates wenn Vorfälle erstellt werden.',
-        'verified'     => 'Verifiziert',
-        'not_verified' => 'Nicht verifiziert',
-        'add'          => [
+        'subscribers'      => 'Abonnenten',
+        'description'      => 'Abonnenten erhalten E-Mail Updates, wenn Vorfälle erstellt oder Komponenten bearbeitet werden.',
+        'verified'         => 'Verifiziert',
+        'not_verified'     => 'Nicht verifiziert',
+        'subscriber'       => ':email, abonniert am :date',
+        'no_subscriptions' => 'Aktualisierungen per E-Mail abonnieren',
+        'add'              => [
             'title'   => 'Einen neuen Abonnenten hinzufügen',
             'success' => 'Abonnent hinzugefügt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Etwas lief schief dem dem Hinzufügen eines Abonnenten. Bitte versuchen Sie es erneut.',
         ],
         'edit' => [
             'title'   => 'Abonnent aktualisieren',
             'success' => 'Abonnent aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'failure' => 'Etwas lief schief mit dem Bearbeiten eines Abonnenten. Bitte versuchen sie es erneut.',
         ],
     ],
 
@@ -165,21 +167,21 @@ return [
         'add'         => [
             'title'   => 'Neues Teammitglied hinzufügen',
             'success' => 'Teammitglied hinzugefügt.',
-            'failure' => 'Mit der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Teammitglied konnte nicht hinzugefügt werden. Bitte versuchen Sie es erneut.',
         ],
         'edit' => [
             'title'   => 'Profil aktualisieren',
             'success' => 'Profil aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'failure' => 'Etwas lief schief mit dem Aktualisieren des Profils. Bitte versuchen Sie es erneut.',
         ],
         'delete' => [
             'success' => 'Benutzer aktualisiert.',
-            'failure' => 'Bei dem Löschen dieses Benutzers ging etwas schief.',
+            'failure' => 'Teammitglied konnte nicht hinzugefügt werden. Bitte versuchen Sie es erneut.',
         ],
         'invite' => [
             'title'   => 'Ein neues Teammitglied einladen',
             'success' => 'Eine Einladung wurde verschickt',
-            'failure' => 'Mit der Einladung ist etwas schiefgelaufen.',
+            'failure' => 'Diese Einladung konnte nicht versendet werden. Bitte versuchen Sie es erneut.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Individualisierung',
+            'header'        => 'Benutzerdefinierter HTML Header',
+            'footer'        => 'Benutzerdefinierter HTML Footer',
+        ],
         'security' => [
             'security'   => 'Sicherheit',
             'two-factor' => 'Nutzer ohne Zwei-Faktor-Authentifizierung',
diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php
index e47199df..d0b085f2 100755
--- a/resources/lang/de/forms.php
+++ b/resources/lang/de/forms.php
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Die Gruppe standardmäßig ausblenden?',
+            'name'               => 'Name',
+            'collapsing'         => 'Wähle Sichtbarkeit der Gruppe',
+            'visible'            => 'Immer erweitert',
+            'collapsed'          => 'Die Gruppe standardmäßig ausblenden',
+            'collapsed_incident' => 'Die Gruppe standardmäßig ausblenden, aber erweitern wenn es Probleme gibt',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Graphen auf der Statusseite anzeigen?',
             'about-this-page'        => 'Über diese Seite',
             'days-of-incidents'      => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?',
-            'banner'                 => 'Banner',
-            'banner-help'            => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .',
+            'banner'                 => 'Banner Bild',
+            'banner-help'            => "Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .",
             'subscribers'            => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?',
         ],
         'analytics' => [
diff --git a/resources/lang/el/cachet.php b/resources/lang/el/cachet.php
index fd1b29f5..5b9c5e74 100755
--- a/resources/lang/el/cachet.php
+++ b/resources/lang/el/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Λειτουργικό',
             2 => 'Προβλήματα επιδόσης',
             3 => 'Μερική Διακοπή',
             4 => 'Σημαντική Διακοπή',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Εγγραφείτε για να λάβετε τις τελευταίες ενημερώσεις',
         'button'    => 'Εγγραφή',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Εγγραφή στις ενημερώσεις μέσω email.',
             'subscribed'         => 'Έχετε εγγραφεί στις ενημερώσεις μέσω email, παρακαλώ ελέγξτε το email σας για να επιβεβαιώσετε την εγγραφή σας.',
             'verified'           => 'Η εγγραφή σας έχει επιβεβαιωθεί. Ευχαριστούμε!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Διαγραφή από τις ενημερώσεις μέσω email.',
             'unsubscribed'       => 'Η εγγραφή σας έχει ακυρωθεί.',
             'failure'            => 'Προέκυψε ένα σφάλμα σχετικά με την εγγραφή.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => 'Η σελίδα κατάστασης :app τροφοδοτείται από το <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Σχετικά με αυτόν τον ιστότοπο',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/el/dashboard.php b/resources/lang/el/dashboard.php
index c19ad5f8..fe6ab1e2 100755
--- a/resources/lang/el/dashboard.php
+++ b/resources/lang/el/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Πρότυπα Περιστατικών',
         'add'                      => [
             'title'   => 'Αναφορά περιστατικού',
-            'success' => 'Το περιστατικό προστέθηκε.',
-            'failure' => 'Κάτι πήγε στραβά με την προσθήκη του περιστατικού.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Επεξεργασία περιστατικού',
             'success' => 'Επεξεργασία περιστατικού επιτυχής.',
-            'failure' => 'Κάτι πήγε στραβά με την προσθήκη του περιστατικού.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'Αυτό το περιστατικό έχει διαγραφεί και δε θα εμφανιστή στη σελίδα κατάστασης.',
-            'failure' => 'Το περιστατικό δεν ήταν δυνατό να διαγραφεί. Παρακαλώ δοκιμάστε ξανά.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Δημιουργήστε ένα πρότυπο περιστατικό',
                 'message' => 'Σας προτείνουμε να προσθέσετε ένα πρότυπο περιστατικό.',
-                'success' => 'Επιτυχής δημιουργία προτύπου.',
-                'failure' => 'Κάτι πήγε στραβά με την δημιουργία προτύπου.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Επεξεργασία προτύπου',
-                'success' => 'Επιτυχής ενημέρωση προτύπου!',
-                'failure' => 'Κάτι πήγε στραβά με την ενημέρωση του προτύπου',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'Το πρότυπο περιστατικό έχει διαγραφεί.',
-                'failure' => 'Το πρότυπο περιστατικό δεν ήταν δυνατό να διαγραφεί. Παρακαλώ δοκιμάστε ξανά.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Προγραμματισμένη στις :timestamp',
         'add'          => [
-            'title'   => 'Προσθήκη Προγραμματισμένης Συντήρησης',
-            'success' => 'Επιτυχής προσθήκη προγραμματισμού.',
-            'failure' => 'Κάτι πήγε στραβά με την προσθήκη του προγραμματισμού.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Η σελίδα κατάστασής σας είναι σχεδόν έτοιμη! Ίσως να θέλετε να κάνετε κάποιες παραμετροποιήσεις',
-        'close'   => 'Απλά πηγαίνε κατευθείαν στον πίνακα ελέγχου μου',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Δημιουργία συστατικών',
             'incident'   => 'Δημιουργία περιστατικών',
diff --git a/resources/lang/el/forms.php b/resources/lang/el/forms.php
index 071ce6eb..73e198a9 100755
--- a/resources/lang/el/forms.php
+++ b/resources/lang/el/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/en-UD/cachet.php b/resources/lang/en-UD/cachet.php
index 1963f070..6dc7c3b2 100755
--- a/resources/lang/en-UD/cachet.php
+++ b/resources/lang/en-UD/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'crwdns721:0crwdne721:0',
+        'status'       => [
             1 => 'crwdns265:0crwdne265:0',
             2 => 'crwdns293:0crwdne293:0',
             3 => 'crwdns294:0crwdne294:0',
             4 => 'crwdns295:0crwdne295:0',
         ],
+        'group' => [
+            'other' => 'crwdns659:0crwdne659:0',
+        ],
     ],
 
     // Incidents
@@ -63,26 +67,31 @@ return [
     'subscriber' => [
         'subscribe' => 'crwdns551:0crwdne551:0',
         'button'    => 'crwdns490:0crwdne490:0',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'crwdns660:0crwdne660:0',
+            'my_subscriptions' => 'crwdns661:0crwdne661:0',
+        ],
+        'email' => [
             'subscribe'          => 'crwdns491:0crwdne491:0',
             'subscribed'         => 'crwdns492:0crwdne492:0',
             'verified'           => 'crwdns493:0crwdne493:0',
+            'manage'             => 'crwdns662:0crwdne662:0',
             'unsubscribe'        => 'crwdns552:0crwdne552:0',
             'unsubscribed'       => 'crwdns495:0crwdne495:0',
             'failure'            => 'crwdns496:0crwdne496:0',
             'already-subscribed' => 'crwdns626:0crwdne626:0',
             'verify'             => [
-                'text'           => 'crwdns497:0crwdne497:0',
+                'text'           => "crwdns497:0crwdne497:0",
                 'html-preheader' => 'crwdns498:0crwdne498:0',
                 'html'           => 'crwdns520:0crwdne520:0',
             ],
             'maintenance' => [
-                'text'           => 'crwdns500:0crwdne500:0',
+                'text'           => "crwdns500:0crwdne500:0",
                 'html-preheader' => 'crwdns501:0crwdne501:0',
                 'html'           => 'crwdns521:0crwdne521:0',
             ],
             'incident' => [
-                'text'           => 'crwdns503:0crwdne503:0',
+                'text'           => "crwdns503:0crwdne503:0",
                 'html-preheader' => 'crwdns504:0crwdne504:0',
                 'html'           => 'crwdns505:0crwdne505:0',
             ],
@@ -99,7 +108,7 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text'           => 'crwdns553:0crwdne553:0',
+                'text'           => "crwdns553:0crwdne553:0",
                 'html-preheader' => 'crwdns554:0crwdne554:0',
                 'html'           => 'crwdns555:0crwdne555:0',
             ],
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'crwdns663:0crwdne663:0',
     'powered_by'      => 'crwdns562:0crwdne562:0',
     'about_this_site' => 'crwdns563:0crwdne563:0',
     'rss-feed'        => 'crwdns506:0crwdne506:0',
diff --git a/resources/lang/en-UD/dashboard.php b/resources/lang/en-UD/dashboard.php
index c262554d..7809001f 100755
--- a/resources/lang/en-UD/dashboard.php
+++ b/resources/lang/en-UD/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'crwdns307:0crwdne307:0',
         'add'                      => [
             'title'   => 'crwdns564:0crwdne564:0',
-            'success' => 'crwdns309:0crwdne309:0',
-            'failure' => 'crwdns310:0crwdne310:0',
+            'success' => 'crwdns664:0crwdne664:0',
+            'failure' => 'crwdns665:0crwdne665:0',
         ],
         'edit' => [
             'title'   => 'crwdns565:0crwdne565:0',
             'success' => 'crwdns312:0crwdne312:0',
-            'failure' => 'crwdns313:0crwdne313:0',
+            'failure' => 'crwdns666:0crwdne666:0',
         ],
         'delete' => [
             'success' => 'crwdns637:0crwdne637:0',
-            'failure' => 'crwdns638:0crwdne638:0',
+            'failure' => 'crwdns667:0crwdne667:0',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'crwdns566:0crwdne566:0',
                 'message' => 'crwdns639:0crwdne639:0',
-                'success' => 'crwdns316:0crwdne316:0',
-                'failure' => 'crwdns317:0crwdne317:0',
+                'success' => 'crwdns668:0crwdne668:0',
+                'failure' => 'crwdns669:0crwdne669:0',
             ],
             'edit' => [
                 'title'   => 'crwdns567:0crwdne567:0',
-                'success' => 'crwdns319:0crwdne319:0',
-                'failure' => 'crwdns320:0crwdne320:0',
+                'success' => 'crwdns670:0crwdne670:0',
+                'failure' => 'crwdns671:0crwdne671:0',
             ],
             'delete' => [
                 'success' => 'crwdns640:0crwdne640:0',
-                'failure' => 'crwdns641:0crwdne641:0',
+                'failure' => 'crwdns672:0crwdne672:0',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => 'crwdns642:0{0}crwdne642:0',
         'scheduled_at' => 'crwdns446:0crwdne446:0',
         'add'          => [
-            'title'   => 'crwdns447:0crwdne447:0',
-            'success' => 'crwdns448:0crwdne448:0',
-            'failure' => 'crwdns449:0crwdne449:0',
+            'title'   => 'crwdns673:0crwdne673:0',
+            'success' => 'crwdns674:0crwdne674:0',
+            'failure' => 'crwdns675:0crwdne675:0',
         ],
         'edit' => [
-            'title'   => 'crwdns450:0crwdne450:0',
-            'success' => 'crwdns451:0crwdne451:0',
-            'failure' => 'crwdns452:0crwdne452:0',
+            'title'   => 'crwdns676:0crwdne676:0',
+            'success' => 'crwdns677:0crwdne677:0',
+            'failure' => 'crwdns678:0crwdne678:0',
         ],
         'delete' => [
-            'success' => 'crwdns453:0crwdne453:0',
-            'failure' => 'crwdns454:0crwdne454:0',
+            'success' => 'crwdns679:0crwdne679:0',
+            'failure' => 'crwdns680:0crwdne680:0',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'crwdns568:0crwdne568:0',
             'message' => 'crwdns323:0crwdne323:0',
-            'success' => 'crwdns324:0crwdne324:0',
-            'failure' => 'crwdns325:0crwdne325:0',
+            'success' => 'crwdns681:0crwdne681:0',
+            'failure' => 'crwdns682:0crwdne682:0',
         ],
         'edit' => [
             'title'   => 'crwdns569:0crwdne569:0',
-            'success' => 'crwdns327:0crwdne327:0',
-            'failure' => 'crwdns328:0crwdne328:0',
+            'success' => 'crwdns683:0crwdne683:0',
+            'failure' => 'crwdns684:0crwdne684:0',
         ],
         'delete' => [
             'success' => 'crwdns643:0crwdne643:0',
-            'failure' => 'crwdns644:0crwdne644:0',
+            'failure' => 'crwdns685:0crwdne685:0',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'crwdns478:0crwdne478:0',
             'add'           => [
                 'title'   => 'crwdns570:0crwdne570:0',
-                'success' => 'crwdns331:0crwdne331:0',
-                'failure' => 'crwdns332:0crwdne332:0',
+                'success' => 'crwdns686:0crwdne686:0',
+                'failure' => 'crwdns687:0crwdne687:0',
             ],
             'edit' => [
                 'title'   => 'crwdns571:0crwdne571:0',
-                'success' => 'crwdns456:0crwdne456:0',
-                'failure' => 'crwdns457:0crwdne457:0',
+                'success' => 'crwdns688:0crwdne688:0',
+                'failure' => 'crwdns689:0crwdne689:0',
             ],
             'delete' => [
                 'success' => 'crwdns645:0crwdne645:0',
-                'failure' => 'crwdns646:0crwdne646:0',
+                'failure' => 'crwdns690:0crwdne690:0',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'crwdns572:0crwdne572:0',
             'message' => 'crwdns647:0crwdne647:0',
-            'success' => 'crwdns459:0crwdne459:0',
-            'failure' => 'crwdns460:0crwdne460:0',
+            'success' => 'crwdns691:0crwdne691:0',
+            'failure' => 'crwdns692:0crwdne692:0',
         ],
         'edit' => [
             'title'   => 'crwdns573:0crwdne573:0',
-            'success' => 'crwdns462:0crwdne462:0',
-            'failure' => 'crwdns463:0crwdne463:0',
+            'success' => 'crwdns693:0crwdne693:0',
+            'failure' => 'crwdns694:0crwdne694:0',
         ],
         'delete' => [
             'success' => 'crwdns648:0crwdne648:0',
-            'failure' => 'crwdns649:0crwdne649:0',
+            'failure' => 'crwdns695:0crwdne695:0',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'crwdns522:0crwdne522:0',
-        'description'  => 'crwdns523:0crwdne523:0',
-        'verified'     => 'crwdns524:0crwdne524:0',
-        'not_verified' => 'crwdns525:0crwdne525:0',
-        'add'          => [
+        'subscribers'      => 'crwdns522:0crwdne522:0',
+        'description'      => 'crwdns696:0crwdne696:0',
+        'verified'         => 'crwdns524:0crwdne524:0',
+        'not_verified'     => 'crwdns525:0crwdne525:0',
+        'subscriber'       => 'crwdns697:0crwdne697:0',
+        'no_subscriptions' => 'crwdns698:0crwdne698:0',
+        'add'              => [
             'title'   => 'crwdns574:0crwdne574:0',
             'success' => 'crwdns527:0crwdne527:0',
-            'failure' => 'crwdns528:0crwdne528:0',
+            'failure' => 'crwdns699:0crwdne699:0',
         ],
         'edit' => [
             'title'   => 'crwdns575:0crwdne575:0',
             'success' => 'crwdns530:0crwdne530:0',
-            'failure' => 'crwdns531:0crwdne531:0',
+            'failure' => 'crwdns700:0crwdne700:0',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'crwdns338:0crwdne338:0',
         'add'         => [
             'title'   => 'crwdns576:0crwdne576:0',
-            'success' => 'crwdns340:0crwdne340:0',
-            'failure' => 'crwdns577:0crwdne577:0',
+            'success' => 'crwdns701:0crwdne701:0',
+            'failure' => 'crwdns702:0crwdne702:0',
         ],
         'edit' => [
             'title'   => 'crwdns578:0crwdne578:0',
-            'success' => 'crwdns343:0crwdne343:0',
-            'failure' => 'crwdns344:0crwdne344:0',
+            'success' => 'crwdns703:0crwdne703:0',
+            'failure' => 'crwdns704:0crwdne704:0',
         ],
         'delete' => [
             'success' => 'crwdns579:0crwdne579:0',
-            'failure' => 'crwdns533:0crwdne533:0',
+            'failure' => 'crwdns705:0crwdne705:0',
         ],
         'invite' => [
             'title'   => 'crwdns580:0crwdne580:0',
             'success' => 'crwdns581:0crwdne581:0',
-            'failure' => 'crwdns582:0crwdne582:0',
+            'failure' => 'crwdns706:0crwdne706:0',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'crwdns584:0crwdne584:0',
         ],
+        'customization' => [
+            'customization' => 'crwdns707:0crwdne707:0',
+            'header'        => 'crwdns708:0crwdne708:0',
+            'footer'        => 'crwdns709:0crwdne709:0',
+        ],
         'security' => [
             'security'   => 'crwdns348:0crwdne348:0',
             'two-factor' => 'crwdns474:0crwdne474:0',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'crwdns650:0crwdne650:0',
         'message' => 'crwdns359:0crwdne359:0',
-        'close'   => 'crwdns360:0crwdne360:0',
+        'close'   => 'crwdns710:0crwdne710:0',
         'steps'   => [
             'component'  => 'crwdns361:0crwdne361:0',
             'incident'   => 'crwdns362:0crwdne362:0',
diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php
index 84876d78..9ddb6fce 100755
--- a/resources/lang/en-UD/forms.php
+++ b/resources/lang/en-UD/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'crwdns464:0crwdne464:0',
         'incident_time'      => 'crwdns481:0crwdne481:0',
         'notify_subscribers' => 'crwdns585:0crwdne585:0',
-        'visibility'         => 'crwdns482:0crwdne482:0',
+        'visibility'         => 'crwdns711:0crwdne711:0',
         'public'             => 'crwdns483:0crwdne483:0',
         'logged_in_only'     => 'crwdns586:0crwdne586:0',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'crwdns587:0crwdne587:0',
 
         'groups' => [
-            'name'      => 'crwdns397:0crwdne397:0',
-            'collapsed' => 'crwdns654:0crwdne654:0',
+            'name'               => 'crwdns397:0crwdne397:0',
+            'collapsing'         => 'crwdns712:0crwdne712:0',
+            'visible'            => 'crwdns713:0crwdne713:0',
+            'collapsed'          => 'crwdns714:0crwdne714:0',
+            'collapsed_incident' => 'crwdns715:0crwdne715:0',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'crwdns233:0crwdne233:0',
+            'site-name'              => 'crwdns716:0crwdne716:0',
             'site-url'               => 'crwdns398:0crwdne398:0',
             'display-graphs'         => 'crwdns472:0crwdne472:0',
             'about-this-page'        => 'crwdns402:0crwdne402:0',
             'days-of-incidents'      => 'crwdns403:0crwdne403:0',
-            'banner'                 => 'crwdns404:0crwdne404:0',
-            'banner-help'            => 'crwdns405:0crwdne405:0',
+            'banner'                 => 'crwdns717:0crwdne717:0',
+            'banner-help'            => "crwdns405:0crwdne405:0",
             'subscribers'            => 'crwdns513:0crwdne513:0',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'crwdns408:0crwdne408:0',
         ],
         'stylesheet' => [
-            'custom-css' => 'crwdns409:0crwdne409:0',
+            'custom-css' => 'crwdns718:0crwdne718:0',
         ],
         'theme' => [
-            'background-color'        => 'crwdns410:0crwdne410:0',
+            'background-color'        => 'crwdns719:0crwdne719:0',
             'background-fills'        => 'crwdns600:0crwdne600:0',
             'banner-background-color' => 'crwdns601:0crwdne601:0',
             'banner-padding'          => 'crwdns602:0crwdne602:0',
             'fullwidth-banner'        => 'crwdns603:0crwdne603:0',
-            'text-color'              => 'crwdns411:0crwdne411:0',
+            'text-color'              => 'crwdns720:0crwdne720:0',
             'dashboard-login'         => 'crwdns604:0crwdne604:0',
             'reds'                    => 'crwdns605:0crwdne605:0',
             'blues'                   => 'crwdns606:0crwdne606:0',
diff --git a/resources/lang/es/cachet.php b/resources/lang/es/cachet.php
index 4c1257f3..5f312a32 100755
--- a/resources/lang/es/cachet.php
+++ b/resources/lang/es/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Funktionsfähig',
             2 => 'Leistungsprobleme',
             3 => 'Teilweiser Ausfall',
             4 => 'Schwerer Ausfall',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonnieren Sie um die neuesten Updates zu erhalten.',
         'button'    => 'Abonnieren',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Aktualisierungen per E-Mail abonnieren.',
             'subscribed'         => 'Sie haben E-Mail-Benachrichtigungen abonniert, überprüfen Sie bitte Ihre E-Mail, um Ihr Abonnement zu bestätigen.',
             'verified'           => 'Ihre E-Mail-Abonnement ist bestätigt worden. Danke!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Von E-Mail-Updates deabonnieren.',
             'unsubscribed'       => 'Ihre E-Mail-Abonnement wurde gekündigt.',
             'failure'            => 'Etwas ist mit dem Abonnement schief gelaufen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status-Seite betrieben mit <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'Über diese Seite',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/es/dashboard.php b/resources/lang/es/dashboard.php
index 98e05548..aa6eaf07 100755
--- a/resources/lang/es/dashboard.php
+++ b/resources/lang/es/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Vorfall Vorlagen',
         'add'                      => [
             'title'   => 'Vorfall hinzufügen',
-            'success' => 'Vorfall hinzugefügt.',
-            'failure' => 'Etwas ist mit dem Vorfall schiefgelaufen.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Vorfall bearbeiten',
             'success' => 'Vorfall aktualisiert.',
-            'failure' => 'Algo salió mal con el incidente.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'El incidente se ha eliminado y no se mostrará en tu página de estado.',
-            'failure' => 'El incidente no se pudo eliminar. Por favor, inténtalo de nuevo.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Vorfallvorlage erstellen',
                 'message' => 'Deberías añadir una plantilla de incidente.',
-                'success' => 'Vorlage erstellt.',
-                'failure' => 'Etwas ist mit der Vorfallvorlage schiefgelaufen.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Vorlage bearbeiten',
-                'success' => 'Vorlage aktualisiert!',
-                'failure' => 'Etwas ist mit dem Updaten der Vorfallvorlage schiefgelaufen',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'La plantilla de incidente se ha eliminado.',
-                'failure' => 'La plantilla de incidente no se pudo eliminar. Por favor, inténtalo de nuevo.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} No hay planificaciones, buen trabajo.|Has registrado una planificación.|Has registrado <strong>:count</strong> planificaciones.',
         'scheduled_at' => 'Geplant am :timestamp',
         'add'          => [
-            'title'   => 'Planmäßige Wartung hinzufügen',
-            'success' => 'Zeitplan hinzugefügt.',
-            'failure' => 'Etwas ist mit dem hinzufügen des Zeitplanes schiefgelaufen.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Planmäßige Wartung bearbeiten',
-            'success' => 'Zeitplan wurde aktualisiert!',
-            'failure' => 'Etwas ist mit dem Bearbeiten des Zeitplanes schiefgelaufen.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Der Zeitplan wurde gelöscht und wird nicht auf Ihrer Statusseite angezeigt.',
-            'failure' => 'Der Zeitplan konnte nicht gelöscht werden. Bitte versuchen Sie es erneut.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Komponente hinzufügen',
             'message' => 'Sie sollten eine Komponente erstellen.',
-            'success' => 'Komponente erstellt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Komponente bearbeiten',
-            'success' => 'Komponente aktualisiert.',
-            'failure' => 'Algo salió mal con el componente.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'El componente se ha eliminado!',
-            'failure' => 'El componente no se pudo eliminar. Por favor, inténtalo de nuevo.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Sie sollten eine Komponentengruppe hinzufügen.',
             'add'           => [
                 'title'   => 'Eine Komponentengruppe hinzufügen',
-                'success' => 'Komponentengruppe hinzugefügt.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Komponentengruppe bearbeiten',
-                'success' => 'Komponentengruppe aktualisiert.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'El grupo de componentes se ha eliminado!',
-                'failure' => 'El grupo de componentes no se pudo eliminar. Por favor, inténtalo de nuevo.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Metrik erstellen',
             'message' => 'Deberías añadir una métrica.',
-            'success' => 'Metrik erstellt.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Metrik bearbeiten',
-            'success' => 'Metrik aktualisiert.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'La métrica se ha eliminado y no se mostrará más en tu página de estado.',
-            'failure' => 'La métrica no se pudo eliminar. Por favor, inténtalo de nuevo.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Abonnenten',
-        'description'  => 'Abonnenten erhalten E-Mail Updates wenn Vorfälle erstellt werden.',
-        'verified'     => 'Verifiziert',
-        'not_verified' => 'Nicht verifiziert',
-        'add'          => [
+        'subscribers'      => 'Abonnenten',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verifiziert',
+        'not_verified'     => 'Nicht verifiziert',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Einen neuen Abonnenten hinzufügen',
             'success' => 'Abonnent hinzugefügt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Abonnent aktualisieren',
             'success' => 'Abonnent aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Teammitglieder werden die M&ouml;glichkeit haben, Komponente sowie Vorf&auml;lle hinzuzuf&uuml;gen und zu ver&auml;ndern.',
         'add'         => [
             'title'   => 'Neues Teammitglied hinzufügen',
-            'success' => 'Teammitglied hinzugefügt.',
-            'failure' => 'Mit der Komponente ist etwas schiefgegangen.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Profil aktualisieren',
-            'success' => 'Profil aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Benutzer aktualisiert.',
-            'failure' => 'Bei dem Löschen dieses Benutzers ging etwas schief.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invitar a un nuevo miembro al equipo',
             'success' => 'Se ha enviado una invitación',
-            'failure' => 'Algo salió mal en la invitación.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Sicherheit',
             'two-factor' => 'Nutzer ohne Zwei-Faktor-Authentifizierung',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Bienvenido a tu página de estado!',
         'message' => 'Ihre Statusseite ist fast fertig! Vielleicht möchten Sie diese zusätzlichen Einstellungen konfigurieren',
-        'close'   => 'Gehe einfach direkt zu meinem Dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Komponenten erstellen',
             'incident'   => 'Vorfälle erstellen',
diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php
index 9009d9d6..5341ab11 100755
--- a/resources/lang/es/forms.php
+++ b/resources/lang/es/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Für wann ist die Wartung geplant?',
         'incident_time'      => 'Wann ist dieser Vorfall aufgetreten?',
         'notify_subscribers' => 'Abonnenten benachrichtigen',
-        'visibility'         => 'Vorfall Sichtbarkeit',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Öffentlich sichtbar',
         'logged_in_only'     => 'Nur für angemeldete Benutzer sichtbar',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Nombre',
-            'collapsed' => 'Por defecto, ¿mostrar el grupo contraído?',
+            'name'               => 'Nombre',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Seitenname',
+            'site-name'              => 'Nombre del sitio',
             'site-url'               => 'URL ihrer Seite',
             'display-graphs'         => 'Graphen auf der Statusseite anzeigen?',
             'about-this-page'        => 'Über diese Seite',
             'days-of-incidents'      => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?',
-            'banner'                 => 'Banner',
-            'banner-help'            => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .",
             'subscribers'            => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Durch Kommata trennen. Die oben genannte Domain ist standardmäßig erlaubt.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Benutzerdefiniertes Stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Hintergrundfarbe',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Relleno del fondo (componentes, incidentes, pie)',
             'banner-background-color' => 'Banner Background Color',
             'banner-padding'          => 'Banner Padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Schriftfarbe',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => '¿Mostrar el botón de Panel de Control en el pie?',
             'reds'                    => 'Rojo (usado para errores)',
             'blues'                   => 'Azul (usado para información)',
diff --git a/resources/lang/fa/cachet.php b/resources/lang/fa/cachet.php
index e5138db1..f15122a0 100755
--- a/resources/lang/fa/cachet.php
+++ b/resources/lang/fa/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operational',
             2 => 'Performance Issues',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/fa/dashboard.php b/resources/lang/fa/dashboard.php
index c41e295d..2686a17d 100755
--- a/resources/lang/fa/dashboard.php
+++ b/resources/lang/fa/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/fa/forms.php b/resources/lang/fa/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/fa/forms.php
+++ b/resources/lang/fa/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/fi/cachet.php b/resources/lang/fi/cachet.php
index 1fd2c94e..0f630f99 100755
--- a/resources/lang/fi/cachet.php
+++ b/resources/lang/fi/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Toiminnassa',
             2 => 'Suorituskykyyn liittyviä ongelmia',
             3 => 'Osittainen sähkökatkos',
             4 => 'Merkittävä katkos',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,18 +67,23 @@ return [
     'subscriber' => [
         'subscribe' => 'Tilaa uusimmat päivitykset',
         'button'    => 'Tilaa',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'Olet tällä hetkellä tilannut kaikki ilmoitukset.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Tilaa email päivitykset.',
             'subscribed'         => 'Olet tilannut sähköposti-ilmoitukset, tarkista sähköpostisi vahvistaaksesi tilauksen.',
             'verified'           => 'Sinun sähköposti tilaus on vahvistettu. Kiitos!',
+            'manage'             => 'Hallinnoi tilaustasi.',
             'unsubscribe'        => 'Poista sähköposti tilauksesi.',
             'unsubscribed'       => 'Sähköpostitilauksesi on peruuttu.',
             'failure'            => 'Jokin meni vikaan sähköpostitilauksen käsittelyssä.',
             'already-subscribed' => 'Cannot subscribe :email because they\'re already subscribed.',
             'verify'             => [
                 'text'           => "Ole hyvä ja vahvista :app_name tilasivun sähköpostitilauksille.\n:link\nKiittäen, :app_name",
-                'html-preheader' => 'Please confirm your email subscription to :app_name status updates.',
-                'html'           => '<p>Please confirm your email subscription to :app_name status updates.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+                'html-preheader' => 'Vahvista sähköposti tilaus: app_name tila-päivityksiä.',
+                'html'           => '<p>Vahvista sähköposti tilaus: app_name Status Page.</p> <p><a href=":link">: link</a></p> <p>Kiitos,: app_name</p>',
             ],
             'maintenance' => [
                 'text'           => "New maintenance has been scheduled on :app_name.\nThank you, :app_name",
@@ -112,24 +121,25 @@ return [
         'email'    => 'Sähköposti',
         'password' => 'Salasana',
         'success'  => 'Tilisi on luotu.',
-        'failure'  => 'Something went wrong with the signup.',
+        'failure'  => 'Jokin meni vikaan sähköpostitilauksen käsittelyssä.',
     ],
 
     'system' => [
-        'update' => 'There is a newer version of Cachet available. You can learn how to update <a href="https://docs.cachethq.io/docs/updating-cachet">here</a>!',
+        'update' => 'Cachetistä on saatavilla uudempi versio. Katso miten päivitetään uudempaan versioon <a href="https://docs.cachethq.io/docs/updating-cachet">täältä</a>!',
     ],
 
     // Modal
     'modal' => [
         'close'     => 'Sulje',
         'subscribe' => [
-            'title'  => 'Subscribe to component updates',
-            'body'   => 'Enter your email address to subscribe to updates for this component. If you\'re already subscribed, you\'ll already receive emails for this component.',
+            'title'  => 'Tilaa sähköpostiin ilmoituksia komponenttien tilasta',
+            'body'   => 'Anna sähköpostiosoitteesi tilataaksesi ilmoituksia tästä komponentista. Jos olet aikaisemmin jo tilannut, saat jo tästä komponentistä sähköpostiilmoituksia.',
             'button' => 'Tilaa',
         ],
     ],
 
     // Other
+    'description'     => 'Pysy ajan tasalla tilaamalla uusimmat päivitykset :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Tietoa sivustosta',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/fi/dashboard.php b/resources/lang/fi/dashboard.php
index ce5c224c..ae3c6c2d 100755
--- a/resources/lang/fi/dashboard.php
+++ b/resources/lang/fi/dashboard.php
@@ -23,16 +23,16 @@ return [
         'add'                      => [
             'title'   => 'Ilmoita tapahtuma',
             'success' => 'Tapahtuma lisätty.',
-            'failure' => 'Tapahtumaa ei voitu ilmoittaa. Yritä uudelleen.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Muokkaa tapahtumaa',
             'success' => 'Tapahtuma päivitetty.',
-            'failure' => 'Tapahtumaa ei voitu muokata. Yritä uudelleen.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'Tapaus on poistettu ja ei näytetä tila-sivulla.',
-            'failure' => 'Tapahtumaa ei voitu poistaa. Yritä uudelleen.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Mallipohja on luotu.',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Lisää komponentti',
             'message' => 'You should add a component.',
-            'success' => 'Komponentti on lisätty!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Muokkaa komponenttia',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Lisää komponentti-ryhmä',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Tilaajat',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Vahvistettu',
-        'not_verified' => 'Not verified',
-        'add'          => [
-            'title'   => 'Add a new subscriber',
+        'subscribers'      => 'Tilaajat',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Vahvistettu',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ': sähköposti, tilannut: päivämäärä',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
+            'title'   => 'Lisää uusi tilaaja',
             'success' => 'Tilaaja lisätty.',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Jotakin meni vikaan lisäessä uutta tilaajaa, ole hyvä ja yritä uudelleen.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'Tapahtui virhe päivitettäessä.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -161,25 +163,25 @@ return [
         'team'        => 'Ryhmä',
         'member'      => 'Jäsen',
         'profile'     => 'Profiili',
-        'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
+        'description' => 'Käyttäjäjä voi luoda, muokata &amp; komponentteja ja tapahtumia.',
         'add'         => [
-            'title'   => 'Add a new team member',
-            'success' => 'Ryhmän jäsen lisätty.',
-            'failure' => 'The team member could not be added. Please try again.',
+            'title'   => 'Lisää uusi käyttäjä',
+            'success' => 'Käyttäjä on lisätty.',
+            'failure' => 'Käyttäjää ei voitu luoda, ole hyvä ja yritä uudelleen.',
         ],
         'edit' => [
-            'title'   => 'Update profile',
-            'success' => 'Profiili päivitetty.',
-            'failure' => 'Tapahtui virhe päivitettäessä.',
+            'title'   => 'Päivitä profiili',
+            'success' => 'Profiili on päivitetty.',
+            'failure' => 'Jokin meni vikaan päivittäessä profiilia, ole hyvä ja yritä uudelleen.',
         ],
         'delete' => [
-            'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Käyttäjä on poistettu ja ei ole enään pääsyä hallintapaneeliin!',
+            'failure' => 'Käyttäjää ei voitu luoda, ole hyvä ja yritä uudelleen.',
         ],
         'invite' => [
-            'title'   => 'Invite a new team member',
-            'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'title'   => 'Kutsu uusi käyttäjä',
+            'success' => 'Kutsu on lähetetty',
+            'failure' => 'Kutsua ei voitu lähettää, ole hyvä ja yritä uudelleen.',
         ],
     ],
 
@@ -188,14 +190,19 @@ return [
         'settings'  => 'Asetukset',
         'app-setup' => [
             'app-setup'   => 'Sovelluksen asetukset',
-            'images-only' => 'Only images may be uploaded.',
-            'too-big'     => 'The file you uploaded is too big. Upload an image smaller than :size',
+            'images-only' => 'Vain kuvia voi lähettää.',
+            'too-big'     => 'Lähettämäsi tiedosto on liian suuri. Lähetä pienempi kuva kuin :size',
         ],
         'analytics' => [
-            'analytics' => 'Analytics',
+            'analytics' => 'Analytiikka',
         ],
         'localization' => [
-            'localization' => 'Localization',
+            'localization' => 'Sijainti',
+        ],
+        'customization' => [
+            'customization' => 'Mukauttaminen',
+            'header'        => 'Mukautettu ylätunniste HTML',
+            'footer'        => 'Mukautettu alatunniste HTML',
         ],
         'security' => [
             'security'   => 'Turvallisuus',
@@ -229,18 +236,18 @@ return [
     // Notifications
     'notifications' => [
         'notifications' => 'Ilmoitukset',
-        'awesome'       => 'Awesome.',
-        'whoops'        => 'Whoops.',
+        'awesome'       => 'Mahtavaa.',
+        'whoops'        => 'Hupsis.',
     ],
 
     // Welcome modal
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Siirry suoraan hallintapaneeliin',
         'steps'   => [
-            'component'  => 'Create components',
-            'incident'   => 'Create incidents',
+            'component'  => 'Luo uusi komponentti',
+            'incident'   => 'Luo uusi tapahtuma',
             'customize'  => 'Muokkaa',
             'team'       => 'Lisää käyttäjä',
             'api'        => 'Luo API tunnus',
diff --git a/resources/lang/fi/forms.php b/resources/lang/fi/forms.php
index 66142159..6a1e6995 100755
--- a/resources/lang/fi/forms.php
+++ b/resources/lang/fi/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'Milloin tämä tapaus tapahtui?',
         'notify_subscribers' => 'Ilmoita tilaajille?',
-        'visibility'         => 'Tapahtuman näkyvyys',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Näytetään julkisesti',
         'logged_in_only'     => 'Näytetään vain kirjautuneille käyttäjille',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Komponentti käytössä?',
 
         'groups' => [
-            'name'      => 'Nimi',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Nimi',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Näyttää kaaviot tila-sivulla?',
             'about-this-page'        => 'Tietoa tästä sivustosta',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Otsikkokuvan kuva',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Salli käyttäjien tilata sähköpostitilaukset?',
         ],
@@ -122,17 +125,17 @@ return [
             'allowed-domains-help' => 'Pilkulla erotettuna. Edellä olevat toimialueet sallitaan automaattisesti oletuksena.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Mukautettu tyylisivu',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Taustaväri',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Tekstin väri',
-            'dashboard-login'         => 'Show dashboard button in the footer?',
-            'reds'                    => 'Red (used for errors)',
+            'text-color'              => 'Text Color',
+            'dashboard-login'         => 'Näytetäänkö hallintanäkymän painike alatunnisteessa?',
+            'reds'                    => 'Punainen (virheilmoituksia varten)',
             'blues'                   => 'Blue (used for information)',
             'greens'                  => 'Green (used for success)',
             'yellows'                 => 'Yellow (used for alerts)',
diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php
index bafffaca..519038bf 100755
--- a/resources/lang/fi/validation.php
+++ b/resources/lang/fi/validation.php
@@ -49,8 +49,8 @@ return [
     'image'          => 'The :attribute must be an image.',
     'in'             => 'The selected :attribute is invalid.',
     'integer'        => 'The :attribute must be an integer.',
-    'ip'             => 'The :attribute must be a valid IP address.',
-    'json'           => 'The :attribute must be a valid JSON string.',
+    'ip'             => ':attribute on oltava kelvollinen IP-osoite.',
+    'json'           => ':attribute tulee olla kelvollinen JSON string.',
     'max'            => [
         'numeric' => 'The :attribute may not be greater than :max.',
         'file'    => 'The :attribute may not be greater than :max kilobytes.',
diff --git a/resources/lang/fr/cachet.php b/resources/lang/fr/cachet.php
index 28111332..47bf3283 100755
--- a/resources/lang/fr/cachet.php
+++ b/resources/lang/fr/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Opérationnel',
             2 => 'Problèmes de performances',
             3 => 'Panne partielle',
             4 => 'Panne majeure',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonnez-vous pour obtenir les dernières mises à jour.',
         'button'    => 'S\'abonner',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'S\'abonner aux notifications par email.',
             'subscribed'         => 'Vous êtes abonné aux notifications par email, veuillez vérifier votre messagerie pour confirmer votre adresse.',
             'verified'           => 'Votre abonnement aux notifications par email a été confirmé. Merci !',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Désinscription des mises à jour par courriel.',
             'unsubscribed'       => 'Votre abonnement aux notifications par email a été annulé.',
             'failure'            => 'Une erreur est survenue lors de l\'abonnement.',
@@ -131,6 +140,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Page de statut est propulsé par <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'À propos du site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/fr/dashboard.php b/resources/lang/fr/dashboard.php
index 3760e895..29faffd5 100755
--- a/resources/lang/fr/dashboard.php
+++ b/resources/lang/fr/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Modèles d\'incident',
         'add'                      => [
             'title'   => 'Ajouter un incident',
-            'success' => 'Incident ajouté.',
-            'failure' => 'L\'incident n\'a pas pu être signalé. Veuillez réessayer.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Modifier un incident',
             'success' => 'Incident mis à jour.',
-            'failure' => 'L\'incident n\'a pas pu être modifié. Veuillez réessayer.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'L\'incident a été supprimé et ne sera pas affiché sur votre page de statut.',
-            'failure' => 'L\'incident n\'a pas pu être supprimé. Veuillez réessayer.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Créer un modèle d\'incident',
                 'message' => 'Vous devriez ajouter un modèle d\'incident.',
-                'success' => 'Modèle créé.',
-                'failure' => 'Le modèle d\'incident n\'a pas pu être crée. Veuillez réessayer.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Éditer le modèle',
-                'success' => 'Le modèle a été mis à jour !',
-                'failure' => 'Le modèle d\'incident n\'a pas pu être modifié. Veuillez réessayer.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'Le modèle d\'incident a été supprimé.',
-                'failure' => 'Le modèle d\'incident n\'a pas pu être supprimé. Veuillez réessayer.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Aucune maintenance en cours, félicitations.|Vous avez une maintenance planifiée.|Vous avez <strong>:count</strong> maintenances planifiées.',
         'scheduled_at' => 'Planifiée à :timestamp',
         'add'          => [
-            'title'   => 'Ajouter une maintenance planifiée',
-            'success' => 'Planification ajoutée.',
-            'failure' => 'Une erreur est survenue lors de l\'ajout de la planification.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Modifier la maintenance planifiée',
-            'success' => 'La planification a été mise à jour !',
-            'failure' => 'Une erreur est survenue lors de l\'édition de la planification.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'La maintenance planifiée a été supprimée et ne sera pas affichée sur votre page de statut !',
-            'failure' => 'La maintenance planifiée n\'a pas pu être supprimée. Veuillez réessayer.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Ajouter un composant',
             'message' => 'Vous devez ajouter un composant.',
-            'success' => 'Composant créé.',
-            'failure' => 'Une erreur est survenue avec le composant.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Modifier un composant',
-            'success' => 'Composant mis à jour.',
-            'failure' => 'Le composant n\'a pas pu être mis à jour. Veuillez réessayer.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'Le composant a été supprimé !',
-            'failure' => 'Le composant n\'a pas pu être supprimé. Veuillez réessayer.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Vous devez ajouter un groupe de composants.',
             'add'           => [
                 'title'   => 'Ajouter un groupe de composants',
-                'success' => 'Le groupe de composants a été ajouté !',
-                'failure' => 'Une erreur est survenue avec le groupe de composants.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Modifier un groupe de composants',
-                'success' => 'Le groupe de composants a été mis à jour !',
-                'failure' => 'Le groupe de composants n\'a pas pu être modifié. Veuillez réessayer.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Le groupe de composants a été supprimé !',
-                'failure' => 'Le groupe de composants n\'a pas pu être supprimé. Veuillez réessayer.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Créer une métrique',
             'message' => 'Vous devez ajouter un indicateur.',
-            'success' => 'L\'indicateur a été ajouté !',
-            'failure' => 'Un problème est survenu avec cette métrique.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Modifier une métrique',
-            'success' => 'Métrique mise à jour.',
-            'failure' => 'Un problème est survenu avec cette métrique.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'La métrique a été supprimé et ne sera plus visible sur votre page de statut.',
-            'failure' => 'La métrique n\'a pas pu être supprimé. Veuillez réessayer.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Abonnés',
-        'description'  => 'Les abonnés reçoivent des notifications par e-mail lorsque des incidents sont créés.',
-        'verified'     => 'Vérifié',
-        'not_verified' => 'Non vérifié',
-        'add'          => [
+        'subscribers'      => 'Abonnés',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Vérifié',
+        'not_verified'     => 'Non vérifié',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Ajouter un abonné',
             'success' => 'L\'abonné a été ajouté !',
-            'failure' => 'L\'abonné n\'a pas pu être ajouté. Veuillez réessayer.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Mettre à jour l\'abonné',
             'success' => 'L\'abonné a été mis à jour !',
-            'failure' => 'L\'abonné n\'a pas pu être mis à jour. Veuillez réessayer.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Les membres de l\'équipe pourront ajouter &amp; modifier les composants et les incidents.',
         'add'         => [
             'title'   => 'Ajouter un nouveau membre de l\'équipe',
-            'success' => 'Un membre à été ajouté à l\'équipe !',
-            'failure' => 'Une erreur est survenue avec le composant.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Mettre le profil à jour',
-            'success' => 'Le membre de l\'équipe a été mis à jour !',
-            'failure' => 'Le membre de l\'équipe n\'a pas pu être mis à jour. Veuillez réessayer.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Le membre de l\'équipe a été supprimé et n\'aura plus l\'accès au tableau de bord !',
-            'failure' => 'Le membre de l\'équipe n\'a pas pu être supprimé. Veuillez réessayer.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Inviter un nouveau membre de l\'équipe',
             'success' => 'Nouveau membre invité.',
-            'failure' => 'L\'invitation n\'a pas pu être envoyé. Veuillez réessayer.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localisation',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Sécurité',
             'two-factor' => 'Utilisateurs sans authentification à deux facteurs',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Bienvenue sur votre page de statut !',
         'message' => 'Votre page de statut est presque prête ! Vous voudrez peut-être configurer ces paramètres supplémentaires',
-        'close'   => 'Aller directement à mon tableau de bord',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Créer des composants',
             'incident'   => 'Créer des incidents',
diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php
index 41e255f9..77b3ee37 100755
--- a/resources/lang/fr/forms.php
+++ b/resources/lang/fr/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Quand planifier la maintenance ?',
         'incident_time'      => 'Quand s\'est produit cet incident ?',
         'notify_subscribers' => 'Notifier les abonnés ?',
-        'visibility'         => 'Visibilité de l\'incident',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Visible par le public',
         'logged_in_only'     => 'Uniquement visible par les utilisateurs enregistrés',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Activer le composant ?',
 
         'groups' => [
-            'name'      => 'Nom',
-            'collapsed' => 'Réduire le groupe par défaut ?',
+            'name'               => 'Nom',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Afficher les graphiques sur la page de statut ?',
             'about-this-page'        => 'À propos de cette page',
             'days-of-incidents'      => 'Combien de jours d\'incidents à montrer ?',
-            'banner'                 => 'Image d\'en-tête',
-            'banner-help'            => 'Il est recommandé de téléchargez un fichier ne dépassant pas 930px de large .',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Il est recommandé de téléchargez un fichier ne dépassant pas 930px de large .",
             'subscribers'            => 'Permettre aux personnes de s\'inscrire aux notifications par e-mail ?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Séparés par des virgules. Le domaine défini ci-dessus est automatiquement autorisé par défaut.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Feuille de style personnalisée',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Couleur d\'arrière-plan',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Couleur de remplissage de l\'arrière-plan (composants, incidents, pied de page)',
             'banner-background-color' => 'Couleur d\'arrière-plan de l\'en-tête',
             'banner-padding'          => 'Marge de l\'en-tête',
             'fullwidth-banner'        => 'Activer l\'en-tête en pleine largeur ?',
-            'text-color'              => 'Couleur du texte',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Afficher le bouton "Tableau de bord" dans le pied de page ?',
             'reds'                    => 'Rouge (utilisé pour les erreurs)',
             'blues'                   => 'Bleu (utilisé pour les informations)',
diff --git a/resources/lang/he/cachet.php b/resources/lang/he/cachet.php
index 27db9400..93d0b3df 100755
--- a/resources/lang/he/cachet.php
+++ b/resources/lang/he/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operational',
             2 => 'בעיות ביצועים',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/he/dashboard.php b/resources/lang/he/dashboard.php
index 3f2d1415..99055147 100755
--- a/resources/lang/he/dashboard.php
+++ b/resources/lang/he/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'תבנית נוצרה.',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'רכיב נוצר.',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'מדד נוצר.',
-            'failure' => 'משהו השתבש עם המדד.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'משהו השתבש עם המדד.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'אבטחה',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/he/forms.php b/resources/lang/he/forms.php
index 2dad207a..069a79bc 100755
--- a/resources/lang/he/forms.php
+++ b/resources/lang/he/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'למתי לתזמן את התחזוקה?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'שם',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'שם',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'להציג גרפים בדף של סטטוס?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'כמה ימים של אירועים להראות?',
-            'banner'                 => 'תמונת הבאנר',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/hu/cachet.php b/resources/lang/hu/cachet.php
index eb2ac7ee..19e61d63 100755
--- a/resources/lang/hu/cachet.php
+++ b/resources/lang/hu/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Működik',
             2 => 'Teljesítmény problémák',
             3 => 'Részleges leállás',
             4 => 'Teljes leállás',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Feliratkozás',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Feliratkozás e-mail értesítésekre.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/hu/dashboard.php b/resources/lang/hu/dashboard.php
index 1708c265..083f24ce 100755
--- a/resources/lang/hu/dashboard.php
+++ b/resources/lang/hu/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incidens Sablonok',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incidens létrehozva.',
-            'failure' => 'Hiba történt az incidens létrehozása során.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incidens frissítve.',
-            'failure' => 'Hiba történt az incidens szerkesztése során.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Sablon létrehozva.',
-                'failure' => 'Hiba történt az incidens sablon létrehozása során.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Sablon frissítve!',
-                'failure' => 'Hiba történt az incidens sablon szerkesztése során',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/hu/forms.php b/resources/lang/hu/forms.php
index da19a1fe..d1fd4da3 100755
--- a/resources/lang/hu/forms.php
+++ b/resources/lang/hu/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Név',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Név',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/id/cachet.php b/resources/lang/id/cachet.php
index 61d0304e..c184a493 100755
--- a/resources/lang/id/cachet.php
+++ b/resources/lang/id/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operasional',
             2 => 'Masalah Kinerja',
             3 => 'Gagal Sebagian',
             4 => 'Kegagalan Sistem',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Ikuti newsletter untuk mendapat update terbaru.',
         'button'    => 'Daftar',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Langganan update email.',
             'subscribed'         => 'Anda berhasil terdaftar pada notifikasi email, mohon periksa email anda untuk mengkonfirmasi pendaftaran ini.',
             'verified'           => 'Pendaftaran newsletter anda berhasil dikonfirmasi. Terima kasih!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Hapus saya dari update email.',
             'unsubscribed'       => 'Langganan email anda sudah dihentikan.',
             'failure'            => 'Ada yang salah dengan sistem langganan email.',
@@ -131,6 +140,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => 'Halaman Status :app dibuat dengan <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'Tentang situs ini',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/id/dashboard.php b/resources/lang/id/dashboard.php
index 5b31b71a..bb127acb 100755
--- a/resources/lang/id/dashboard.php
+++ b/resources/lang/id/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Template Insiden',
         'add'                      => [
             'title'   => 'Tambahkan Insiden',
-            'success' => 'Insiden sudah ditambahkan.',
-            'failure' => 'Ada masalah dengan insiden ini.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit insiden',
             'success' => 'Insiden sudah diperbarui.',
-            'failure' => 'Ada masalah dengan insiden ini.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Buat template insiden',
                 'message' => 'You should add an incident template.',
-                'success' => 'Template sudah dibuat.',
-                'failure' => 'Ada masalah dengan template insiden ini.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Template sudah diperbarui!',
-                'failure' => 'Ada masalah dengan template insiden ini',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Dijadwalkan pada :timestamp',
         'add'          => [
-            'title'   => 'Tambahkan Jadwal Pemeliharaan',
-            'success' => 'Jadwal sudah ditambahkan.',
-            'failure' => 'Ada masalah saat membuat jadwal.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit Jadwal Pemeliharaan',
-            'success' => 'Jadwal sudah diperbarui!',
-            'failure' => 'Ada masalah saat mengedit jadwal.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Jadwal ini sudah dihapus dan tidak akan ditampilkan di halaman status anda.',
-            'failure' => 'Jadwal tidak bisa dihapus. Silakan coba lagi.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Tambahkan Komponen',
             'message' => 'Anda perlu menambahkan komponen.',
-            'success' => 'Komponen sudah dibuat.',
-            'failure' => 'Ada masalah dengan komponen ini.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit komponen',
-            'success' => 'Komponen sudah diperbarui.',
-            'failure' => 'Ada masalah dengan komponen ini.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Anda perlu menambahkan grup komponen.',
             'add'           => [
                 'title'   => 'Tambahkan grup komponen',
-                'success' => 'Grup komponen sudah ditambahkan.',
-                'failure' => 'Ada masalah dengan grup komponen ini.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit grup komponen',
-                'success' => 'Grup komponen sudah diperbarui.',
-                'failure' => 'Ada masalah dengan grup komponen ini.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Buat metrik',
             'message' => 'You should add a metric.',
-            'success' => 'Metrik sudah dibuat.',
-            'failure' => 'Ada masalah dengan metrik ini.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit metrik',
-            'success' => 'Metrik sudah diperbarui.',
-            'failure' => 'Ada masalah dengan metrik ini.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Berlangganan',
-        'description'  => 'Pelanggan email akan menerima update ketika insiden dibuat.',
-        'verified'     => 'Terverifikasi',
-        'not_verified' => 'Belum Diverifikasi',
-        'add'          => [
+        'subscribers'      => 'Berlangganan',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Terverifikasi',
+        'not_verified'     => 'Belum Diverifikasi',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Tambah Pelanggan Baru',
             'success' => 'Pelanggan sudah ditambahkan.',
-            'failure' => 'Ada masalah dengan komponen ini.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Perbarui Pelanggan',
             'success' => 'Pelanggan sudah diupdate.',
-            'failure' => 'Ada masalah saat memperbarui.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Anggota Tim akan bisa menambahkan, mengubah &amp; mengedit komponen dan insiden.',
         'add'         => [
             'title'   => 'Tambahkan Anggota Tim',
-            'success' => 'Anggota Tim sudah ditambahkan.',
-            'failure' => 'Ada masalah dengan komponen ini.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Perbarui profil',
-            'success' => 'Profil sudah diperbarui.',
-            'failure' => 'Ada masalah saat memperbarui.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Pengguna sudah dihapus.',
-            'failure' => 'Ada yang tidak beres saat menghapus pengguna ini.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Undang Anggota Tim Baru',
             'success' => 'Pengguna sudah diundang.',
-            'failure' => 'Ada masalah dengan sistem undangan.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Keamanan',
             'two-factor' => 'User tanpa otentikasi dua-faktor',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Halaman status anda hampir siap! Anda masih perlu mengkonfigurasi beberapa pengaturan',
-        'close'   => 'Langsung ke dashboard saja',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Buat komponen',
             'incident'   => 'Buat insiden',
diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php
index 5d9ff820..0e94c192 100755
--- a/resources/lang/id/forms.php
+++ b/resources/lang/id/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Berapa lama pemeliharaan ini dijadwalkan?',
         'incident_time'      => 'Kapan insiden ini terjadi?',
         'notify_subscribers' => 'Beritahu subscriber',
-        'visibility'         => 'Tampilan Insiden',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Bisa dilihat oleh publik',
         'logged_in_only'     => 'Hanya bisa dilihat oleh yang login',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Nama',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Nama',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Tampilkan grafik di halaman status?',
             'about-this-page'        => 'Tentang halaman ini',
             'days-of-incidents'      => 'Berapa hari insiden akan ditampilkan?',
-            'banner'                 => 'Gambar Banner',
-            'banner-help'            => 'Disarankan gambar yang anda unggah tidak lebih lebar dari 930px.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Disarankan gambar yang anda unggah tidak lebih lebar dari 930px.",
             'subscribers'            => 'Bolehkan pengunjung mendaftar notifikasi email?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Pisahkan dengan koma. Domain yang ada di atas otomatis akan dibolehkan.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Stylesheet Kustom',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Warna Latar',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Isian latar belakang (Komponen, Insiden, Footer)',
             'banner-background-color' => 'Banner Background Color',
             'banner-padding'          => 'Banner Padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Warna Teks',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Tampilkan tombol dashboard di footer?',
             'reds'                    => 'Merah (Digunakan jika ada kesalahan)',
             'blues'                   => 'Biru (Digunakan jika ada informasi)',
diff --git a/resources/lang/it/cachet.php b/resources/lang/it/cachet.php
index e59b8cbb..42455ba8 100755
--- a/resources/lang/it/cachet.php
+++ b/resources/lang/it/cachet.php
@@ -12,20 +12,24 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operativo',
             2 => 'Problemi sulle prestazioni',
             3 => 'Disservizio parziale',
             4 => 'Interruzione del servizio',
         ],
+        'group' => [
+            'other' => 'Altri Componenti',
+        ],
     ],
 
     // Incidents
     'incidents' => [
         'none'          => 'Nessun incidente segnalato',
         'past'          => 'Past Incidents',
-        'previous_week' => 'Previous Week',
-        'next_week'     => 'Next Week',
+        'previous_week' => 'Settimana Precedente',
+        'next_week'     => 'Prossima Settimana',
         'scheduled'     => 'Manutenzione programmata',
         'scheduled_at'  => ', programmata il :timestamp',
         'status'        => [
@@ -52,10 +56,10 @@ return [
     // Metrics
     'metrics' => [
         'filter' => [
-            'last_hour' => 'Last Hour',
-            'hourly'    => 'Last 12 Hours',
-            'weekly'    => 'Week',
-            'monthly'   => 'Month',
+            'last_hour' => 'Ultima Ora',
+            'hourly'    => 'Ultime 12 Ore',
+            'weekly'    => 'Settimana',
+            'monthly'   => 'Mese',
         ],
     ],
 
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Iscriviti',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Iscriviti agli aggiornamenti via email.',
             'subscribed'         => 'Ti sei appena iscritto agli aggiornamenti email, controlla la tua casella per confermare la sottoscrizione',
             'verified'           => 'La tua iscrizione &egrave; stata confermata. Grazie!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'La tua iscrizione &egrave; stata rimossa.',
             'failure'            => 'Qualcosa è andato storto con l\'iscrizione.',
@@ -107,7 +116,7 @@ return [
     ],
 
     'signup' => [
-        'title'    => 'Sign Up',
+        'title'    => 'Registrati',
         'username' => 'Nome Utente',
         'email'    => 'Email',
         'password' => 'Password',
@@ -121,7 +130,7 @@ return [
 
     // Modal
     'modal' => [
-        'close'     => 'Close',
+        'close'     => 'Chiudi',
         'subscribe' => [
             'title'  => 'Subscribe to component updates',
             'body'   => 'Enter your email address to subscribe to updates for this component. If you\'re already subscribed, you\'ll already receive emails for this component.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/it/dashboard.php b/resources/lang/it/dashboard.php
index 074d00a2..874a2543 100755
--- a/resources/lang/it/dashboard.php
+++ b/resources/lang/it/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incidente aggiunto.',
-            'failure' => 'Qualcosa è andato storto con l\'incidente.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit an incident',
+            'title'   => 'Modifica un incidente',
             'success' => 'Incidente aggiornato.',
-            'failure' => 'Qualcosa è andato storto con l\'incidente.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
-                'title'   => 'Edit Template',
-                'success' => 'Il modello è stato aggiornato!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'title'   => 'Modifica Modello',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Componente creato.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Componente aggiornato.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -123,36 +123,38 @@ return [
     'metrics' => [
         'metrics' => 'Metriche',
         'add'     => [
-            'title'   => 'Create a metric',
+            'title'   => 'Crea una metrica',
             'message' => 'You should add a metric.',
             'success' => 'Metrica creata.',
-            'failure' => 'The metric could not be added. Please try again.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metrica aggiornata.',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Non Verificato',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verificato',
+        'not_verified'     => 'Non Verificato',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php
index 1a941ffb..cf58b4d6 100755
--- a/resources/lang/it/forms.php
+++ b/resources/lang/it/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'Quando è accaduto questo incidente?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Visibilità dell\'Incidente',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Nome',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Nome',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Visualizzare i grafici nella pagina di stato?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Foglio di Stile Personalizzato',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Colore di Sfondo',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Colore del Testo',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
@@ -174,7 +177,7 @@ return [
     'cancel' => 'Cancella',
     'remove' => 'Rimuovi',
     'invite' => 'Invite',
-    'signup' => 'Sign Up',
+    'signup' => 'Registrati',
 
     // Other
     'optional' => '* Opzionale',
diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php
index b735a732..cf02f28e 100755
--- a/resources/lang/it/validation.php
+++ b/resources/lang/it/validation.php
@@ -34,7 +34,7 @@ return [
         'numeric' => 'Il campo :attribute deve essere compreso tra :min e :max.',
         'file'    => 'The :attribute must be between :min and :max kilobytes.',
         'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'array'   => 'Il campo :attributo deve avere tra :min e :max elementi.',
     ],
     'boolean'        => 'Il campo :attribuite deve essere vero o falso.',
     'confirmed'      => 'Il campo :attribute non corrisponde.',
@@ -53,15 +53,15 @@ return [
     'json'           => 'The :attribute must be a valid JSON string.',
     'max'            => [
         'numeric' => 'Il campo :attribute non può contenere un numero maggiore di :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'file'    => 'Il campo :attribute non può essere superiore a :max kilobyte.',
+        'string'  => 'Il campo :attribute non può contenere più di :max caratteri.',
+        'array'   => 'Il campo :attribute non può avere più di :max elementi.',
     ],
     'mimes' => 'Il campo :attribute deve contenere un file del tipo: :values.',
     'min'   => [
         'numeric' => 'Il campo :attribute non può contenere un numero inferiore a :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
+        'file'    => 'Il campo :attribute deve essere minimo :min kilobyte.',
+        'string'  => 'Il campo :attribute deve contenere almeno :min caratteri.',
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'not_in'               => 'Il valore del campo :attribute non è valido.',
diff --git a/resources/lang/ja/cachet.php b/resources/lang/ja/cachet.php
index 0d407530..eea12138 100755
--- a/resources/lang/ja/cachet.php
+++ b/resources/lang/ja/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => '稼働中',
             2 => 'パフォーマンスに関する問題あり',
             3 => '一部停止中',
             4 => '大規模な停止中',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => '最新のアップデート情報を購読する',
         'button'    => '購読',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'メールによるアップデート情報の購読',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'このサイトについて',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ja/dashboard.php b/resources/lang/ja/dashboard.php
index 6e0915ec..762b72e4 100755
--- a/resources/lang/ja/dashboard.php
+++ b/resources/lang/ja/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'インシデント・テンプレート',
         'add'                      => [
             'title'   => 'インシデントの報告',
-            'success' => 'インシデントが登録されました。',
-            'failure' => 'インシデントの登録ができませんでした。もう一度試してみてください。',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'インシデントの編集',
             'success' => 'インシデントが更新されました。',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'インシデントテンプレートの作成',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'テンプレートの編集',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => '計画メンテナンスの追加',
-            'success' => '計画メンテナンスが追加されました！',
-            'failure' => '計画メンテナンスの追加ができませんでした。もう一度試してみてください。',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => '計画メンテナンスの編集',
-            'success' => '計画メンテナンスが編集されました！',
-            'failure' => '計画メンテナンスの編集ができませんでした。もう一度試してみてください。',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => '計画メンテナンスが削除されました！',
-            'failure' => '計画メンテナンスの削除ができませんでした。もう一度試してみてください。',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'コンポーネントの追加',
             'message' => 'コンポーネントを追加してください。',
-            'success' => 'コンポーネントが追加されました！',
-            'failure' => 'コンポーネントの追加ができませんでした。もう一度試してみてください。',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'コンポーネントの編集',
-            'success' => 'コンポーネントが更新されました！',
-            'failure' => 'コンポーネントの更新ができませんでした。もう一度試してみてください。',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'コンポーネントが削除されました！',
-            'failure' => 'コンポーネントの削除ができませんでした。もう一度試してみてください。',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'コンポーネントグループを追加して下さい',
             'add'           => [
                 'title'   => 'コンポーネントグループの追加',
-                'success' => 'コンポーネントグループが追加されました！',
-                'failure' => 'コンポーネントグループの追加ができませんでした。もう一度試してみてください。',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'コンポーネントグループの編集',
-                'success' => 'コンポーネントグループが編集されました！',
-                'failure' => 'コンポーネントグループの編集ができませんでした。もう一度試してみてください。',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'コンポーネントグループが削除されました！',
-                'failure' => 'コンポーネントグループの削除ができませんでした。もう一度試してみてください。',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'メトリクスの作成',
             'message' => 'メトリクスを追加してください。',
-            'success' => 'メトリクスが追加されました！',
-            'failure' => 'メトリクスの追加ができませんでした。もう一度試してみてください。',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'メトリクスの編集',
-            'success' => 'メトリクスが更新されました！',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => '購読者',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => '認証済',
-        'not_verified' => '未確認',
-        'add'          => [
+        'subscribers'      => '購読者',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => '認証済',
+        'not_verified'     => '未確認',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => '購読者の追加',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => '購読者の更新',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => '新しいチームメンバーを追加する',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'プロフィールの更新',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => '新しいチームメンバーを招待する',
             'success' => '招待メールが送信されました',
-            'failure' => '招待メールが送信できませんでした。もう一度試してみてください。',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'ローカライズ',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'セキュリティ',
             'two-factor' => '二要素認証が無効になっているユーザー',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'ステータスページにようこそ！',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'コンポーネントの作成',
             'incident'   => 'インシデントの作成',
diff --git a/resources/lang/ja/forms.php b/resources/lang/ja/forms.php
index 2531073a..17c4f786 100755
--- a/resources/lang/ja/forms.php
+++ b/resources/lang/ja/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'サイト名',
+            'site-name'              => 'Site Name',
             'site-url'               => 'サイトのURL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'このページについて',
             'days-of-incidents'      => '何日間のインシデントを表示しますか？',
-            'banner'                 => 'バナー画像',
-            'banner-help'            => '横幅が930px以内の画像をアップロードしてください。',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "横幅が930px以内の画像をアップロードしてください。",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'スタイルシートのカスタマイズ',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => '背景色',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => '文字色',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'ダッシュボードページへのリンクをフッター部分に表示しますか？',
             'reds'                    => 'レッド（エラー表示に使用されます）',
             'blues'                   => 'ブルー（インフォメーション表示に使用されます）',
diff --git a/resources/lang/ko/cachet.php b/resources/lang/ko/cachet.php
index ec475a57..9515af0d 100755
--- a/resources/lang/ko/cachet.php
+++ b/resources/lang/ko/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => '정상',
             2 => '성능 이슈',
             3 => '부분 중단',
             4 => '주요 중단',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => '최신 업데이트를 받아 보기 위한 구독신청.',
         'button'    => '구독',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => '이메일 구독 신청.',
             'subscribed'         => '이메일 구독 신청이 완료되었습니다. 구독 신청 확인을 위한 이메일을 확인해주세요.',
             'verified'           => '이메일 구독이 확인 되었습니다. 감사합니다!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => '이메일 구독 취소',
             'unsubscribed'       => '이메일 구독이 취소 되었습니다.',
             'failure'            => '구독 신청 중에 문제가 발생했습니다.',
@@ -131,6 +140,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => '이 사이트에 대해',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ko/dashboard.php b/resources/lang/ko/dashboard.php
index 8b3e6446..aae6fb1a 100755
--- a/resources/lang/ko/dashboard.php
+++ b/resources/lang/ko/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => '문제 템플릿',
         'add'                      => [
             'title'   => '문제 추가',
-            'success' => '문제가 추가되었습니다.',
-            'failure' => '추가 중 문제가 발생했습니다.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => '문제 수정',
             'success' => '문제가 수정되었습니다.',
-            'failure' => '문제가 발생했습니다.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => '문제 템플릿 생성하기',
                 'message' => 'You should add an incident template.',
-                'success' => '템플릿이 생성되었습니다.',
-                'failure' => '템플릿 생성 중 문제가 발생했습니다.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => '문제 템플릿 수정',
-                'success' => '템플릿이 수정되었습니다!',
-                'failure' => '템플릿 수정 중 문제가 발생했습니다.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => ':timestamp 에 예정됨',
         'add'          => [
-            'title'   => '예정 된 유지 관리 추가',
-            'success' => '예정이 추가되었습니다.',
-            'failure' => '예정 추가 중 문제가 발생습니다.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => '예정 된 유지 관리 수정',
-            'success' => '예정이 수정되었습니다!',
-            'failure' => '예정 수정 중 문제가 발생했습니다.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => '예정이 삭제되었습니다. 상태 페이지에 표시되지 않습니다.',
-            'failure' => '일정을 삭제할 수 없습니다. 다시 시도 하십시오.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => '구성요소 추가',
             'message' => '구성요소를 추가해야 합니다.',
-            'success' => '구성요소가 추가되었습니다.',
-            'failure' => '구성요소 생성 중 문제가 발생했습니다.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => '구성요소 수정',
-            'success' => '구성요소가 수정되었습니다.',
-            'failure' => '구성요소와 관련하여 문제가 생겼습니다.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => '구성 요소 그룹을 추가 해야 합니다.',
             'add'           => [
                 'title'   => '구성요소 그룹 추가',
-                'success' => '구성요소 그룹 추가되었습니다',
-                'failure' => '구성요소 그룹 추가 중 문제가 발생했습니다.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => '구성요소 그룹 수정',
-                'success' => '구성요소 그룹이 수정되었습니다.',
-                'failure' => '구성요소 그룹과 관련하여 문제가 생겼습니다.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => '통계 추가',
             'message' => 'You should add a metric.',
-            'success' => '통계가 추가되었습니다.',
-            'failure' => '통계 추가 중 문제가 발생했습니다.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => '통계 수정',
-            'success' => '통계가 수정되었습니다.',
-            'failure' => '통계와 관련하여 문제가 생겼습니다.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => '구독자',
-        'description'  => '구독자들이 문제가 생겼을 때 이메일 업데이트를 받게 됩니다.',
-        'verified'     => '인증됨',
-        'not_verified' => '인증되지 않음',
-        'add'          => [
+        'subscribers'      => '구독자',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => '인증됨',
+        'not_verified'     => '인증되지 않음',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => '구독자 추가',
             'success' => '구독자가 추가됨.',
-            'failure' => '구성요소 생성 중 문제가 발생했습니다.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => '구독자 업데이트',
             'success' => '구독자가 업데이트됨.',
-            'failure' => '프로필 수정 중 문제가 생겼습니다.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => '팀 멤버는 구성요소와 문제를 추가하고 수정 할 수 있습니다.',
         'add'         => [
             'title'   => '새 팀 멤버 추가',
-            'success' => '팀 멤버가 추가되었습니다',
-            'failure' => '멤버 추가 중에 문제가 발생했습니다.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => '프로필 수정',
-            'success' => '프로필이 수정되었습니다.',
-            'failure' => '프로필 수정 중 문제가 생겼습니다.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => '사용자 삭제',
-            'failure' => '사용자를 삭제하던 도중 문제가 발생했습니다.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => '새 팀 멤버 초대하기',
             'success' => '사용자가 초대되었습니다.',
-            'failure' => '초대 중에 문제가 발생했습니다.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => '보안',
             'two-factor' => '2단계 인증을 사용하지 않는 사용자',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => '상태 페이지는 거의 다 준비 되었습니다! 추가 설정을 해보세요',
-        'close'   => '내 대시보드로 바로 가기',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => '구성요소 만들기',
             'incident'   => '문제 만들기',
diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php
index cfac1510..1db99be6 100755
--- a/resources/lang/ko/forms.php
+++ b/resources/lang/ko/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => '언제 작업을 예약하시겠습니까?',
         'incident_time'      => '이 문제는 언제 발생 했습니까??',
         'notify_subscribers' => '구독자에게 알림',
-        'visibility'         => '공개 설정',
+        'visibility'         => 'Incident Visibility',
         'public'             => '전체 공개',
         'logged_in_only'     => '로그인한 사용자만 볼 수 있음',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => '이름',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => '이름',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => '상태 페이지에 그래프 보이기',
             'about-this-page'        => '이 페이지에 대하여',
             'days-of-incidents'      => '몇 일 동안 사건을 표시하시겠습니까?',
-            'banner'                 => '배너 이미지',
-            'banner-help'            => '가로가 930 픽셀보다 작은 이미지를 업로드 하는 것을 권장합니다.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "가로가 930 픽셀보다 작은 이미지를 업로드 하는 것을 권장합니다.",
             'subscribers'            => '이메일 알림을 받기 위한 회원가입 허용',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => '쉼표로 구분. 위에 설정된 도메인은 기본적으로 자동 허용 됩니다.',
         ],
         'stylesheet' => [
-            'custom-css' => '사용자 정의 스타일시트',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => '배경색',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner Background Color',
             'banner-padding'          => 'Banner Padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => '글자색',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => '빨강 (에러에 사용됨)',
             'blues'                   => '파랑 (정보에 사용됨)',
diff --git a/resources/lang/nl/cachet.php b/resources/lang/nl/cachet.php
index 1b81315c..dc0c8d51 100755
--- a/resources/lang/nl/cachet.php
+++ b/resources/lang/nl/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operationeel',
             2 => 'Prestatieproblemen',
             3 => 'Gedeeltelijke Storing',
             4 => 'Grote Storing',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonneer voor de meest recente updates',
         'button'    => 'Abonneren',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Abonneren op e-mail updates.',
             'subscribed'         => 'U bent geabonneerd op e-mail notificaties, controleer uw e-mail om uw abonnement te bevestigen.',
             'verified'           => 'Uw e-mail abonnement is bevestigd. Bedankt!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Afmelden voor e-mail updates.',
             'unsubscribed'       => 'Uw e-mail abonnement is opgezegd.',
             'failure'            => 'Er ging iets fout tijdens het aanmelden.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status pagina word mogelijk gemaakt door <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Over deze website',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/nl/dashboard.php b/resources/lang/nl/dashboard.php
index 43c0b7f4..12fad3ef 100755
--- a/resources/lang/nl/dashboard.php
+++ b/resources/lang/nl/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Sjablonen',
         'add'                      => [
             'title'   => 'Meld een incident',
-            'success' => 'Incident toegevoegd.',
-            'failure' => 'Er ging iets mis met het incident.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Wijzig een incident',
             'success' => 'Incident bijgewerkt.',
-            'failure' => 'Er ging iets mis met het incident.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'Het incident is verwijderd en zal niet meer worden weergegeven op de statuspagina.',
-            'failure' => 'Het incident kon niet worden verwijderd. Probeer het opnieuw.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Creëer een incident template',
                 'message' => 'Voeg een incident template toe.',
-                'success' => 'Sjabloon aangemaakt.',
-                'failure' => 'Er ging iets mis met het incident sjabloon.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Wijzig template',
-                'success' => 'Sjabloon is bijgewerkt!',
-                'failure' => 'Er ging iets mis bij het bijwerken van het sjabloon',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'De incident template is verwijderd.',
-                'failure' => 'De incident template kon niet worden verwijderd. Probeer het opnieuw.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Er zijn geen schema\'s, goed werk.|Je hebt één schema aangemaakt.|Je hebt <strong>:count</strong> schema\'s aangegeven.',
         'scheduled_at' => 'Gepland op :timestamp',
         'add'          => [
-            'title'   => 'Gepland onderhoud toevoegen',
-            'success' => 'Planning toegevoegd.',
-            'failure' => 'Er ging iets mis bij het toevoegen van de planning.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Gepland onderhoud bewerken',
-            'success' => 'Planning is bijgewerkt!',
-            'failure' => 'Er ging iets mis bij het bewerken van de planning.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'De planning is verwijderd en zal niet worden getoond op je statuspagina.',
-            'failure' => 'De planning kon niet worden verwijderd. Probeer het nogmaals.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Voeg een component toe',
             'message' => 'Gelieve een onderdeel toe te voegen.',
-            'success' => 'Onderdeel aangemaakt.',
-            'failure' => 'Er ging iets mis met het onderdeel.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Wijzig een component',
-            'success' => 'Onderdeel bijgewerkt.',
-            'failure' => 'Er ging iets mis met het onderdeel.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'Het component is verwijderd!',
-            'failure' => 'Het component kon niet worden verwijderd. Probeer het opnieuw.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'U moet een componentgroep toevoegen.',
             'add'           => [
                 'title'   => 'Componentgroep toevoegen',
-                'success' => 'Onderdeel groep toegevoegd.',
-                'failure' => 'Er ging iets mis met de onderdeel groep.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Componentgroep bewerken',
-                'success' => 'Componentgroep bijgewerkt.',
-                'failure' => 'Er ging iets mis met de componentgroep.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'De component groep is verwijderd!',
-                'failure' => 'De component groep kon niet worden verwijderd. Probeer het opnieuw.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Meting aanmaken',
             'message' => 'Voeg een meting toe.',
-            'success' => 'Meting aangemaakt.',
-            'failure' => 'Er ging iets mis met de meting.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Meting bewerken',
-            'success' => 'Meting bijgewerkt.',
-            'failure' => 'Er ging iets mis met de meting.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'De meting is verwijderd en zal niet meer worden weergegeven op de statuspagina.',
-            'failure' => 'De meting kon niet verwijderd worden. Probeer het opnieuw.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Abonnees',
-        'description'  => 'Abonnees ontvangen email updates wanneer incidenten worden aangemaakt.',
-        'verified'     => 'Geverifiëerd',
-        'not_verified' => 'Niet geverifiëerd',
-        'add'          => [
+        'subscribers'      => 'Abonnees',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Geverifiëerd',
+        'not_verified'     => 'Niet geverifiëerd',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Voeg een nieuwe abonnee toe',
             'success' => 'Abonnee is toegevoegd!',
-            'failure' => 'Er ging iets mis met het onderdeel.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Abonnee bijwerken',
             'success' => 'Abonnee is gewijzigd!',
-            'failure' => 'Er ging iets mis tijdens het bijwerken.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Teamleden zullen onderdelen en incidenten kunnen aanpassen &amp; toevoegen.',
         'add'         => [
             'title'   => 'Voeg een nieuw teamlid toe',
-            'success' => 'Teamlid toegevoegd.',
-            'failure' => 'Het teamlid kon niet worden toegevoegd. Probeer het opnieuw.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Profiel bijwerken',
-            'success' => 'Profiel bijgewerkt.',
-            'failure' => 'Er ging iets mis tijdens het bijwerken.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Het teamlid is verwijderd en heeft geen toegang meer tot het dashboard!',
-            'failure' => 'Het teamlid kon niet worden toegevoegd. Probeer het opnieuw.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Nodig een nieuw teamlid uit',
             'success' => 'De uitnodiging is verzonden',
-            'failure' => 'De uitnodiging kon niet verzonden worden. Probeer het opnieuw.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Lokalisatie',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Beveiliging',
             'two-factor' => 'Gebruikers zonder authenticatie in twee stappen',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welkom op je statuspagina!',
         'message' => 'Uw statuspagina is bijna klaar! U kunt deze extra instellingen configureren',
-        'close'   => 'Ga direct naar mijn dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Onderdelen maken',
             'incident'   => 'Incidenten aanmaken',
diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php
index 428b01db..bb60c6d1 100755
--- a/resources/lang/nl/forms.php
+++ b/resources/lang/nl/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Voor wanneer is het onderhoud gepland?',
         'incident_time'      => 'Wanneer heeft dit incident plaatsgevonden?',
         'notify_subscribers' => 'Houd abonnees op de hoogte?',
-        'visibility'         => 'Incident Zichtbaarheid',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Zichtbaar voor publiek',
         'logged_in_only'     => 'Alleen zichtbaar voor ingelogde gebruikers',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component ingeschakeld?',
 
         'groups' => [
-            'name'      => 'Naam',
-            'collapsed' => 'Klap de groep standaard uit?',
+            'name'               => 'Naam',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site Naam',
+            'site-name'              => 'Site naam',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Grafieken tonen op statuspagina?',
             'about-this-page'        => 'Over deze pagina',
             'days-of-incidents'      => 'Hoeveel dagen moeten incidenten getoond worden?',
-            'banner'                 => 'Banner afbeelding',
-            'banner-help'            => 'Het wordt aanbevolen dat u geen bestanden upload die breeder zijn dan 930px.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Het wordt aanbevolen dat u geen bestanden upload die breeder zijn dan 930px.",
             'subscribers'            => 'Bezoekers toestaan om te abonneren op e-mail notificaties?',
         ],
         'analytics' => [
@@ -125,12 +128,12 @@ return [
             'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Achtergrondkleur',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Achtergrond opvulling (components, incidents, footer)',
             'banner-background-color' => 'Banner achtergrond kleur',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Volledige breedte van de banner aanzetten?',
-            'text-color'              => 'Tekstkleur',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Laat dashboard knop zien in de footer?',
             'reds'                    => 'Rood (voor errors)',
             'blues'                   => 'Blauw (voor informatie)',
diff --git a/resources/lang/no/cachet.php b/resources/lang/no/cachet.php
index 59274c30..62b85810 100755
--- a/resources/lang/no/cachet.php
+++ b/resources/lang/no/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Ingen problemer',
             2 => 'Ytelsesproblemer',
             3 => 'Delvis brudd',
             4 => 'Større brudd',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Abonner',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Abonner for å motta varslinger på e-post.',
             'subscribed'         => 'Du har abbonerer nå på epostvarslinger, sjekk din e-post for å bekrefte abboneringen.',
             'verified'           => 'Ditt epost abonnement er bekreftet!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Din epostvarsling har blitt kansellert.',
             'failure'            => 'Noe gikk galt med abonneringen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/no/dashboard.php b/resources/lang/no/dashboard.php
index a1d2b421..79bf3b6e 100755
--- a/resources/lang/no/dashboard.php
+++ b/resources/lang/no/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Hendelsesmaler',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Hendelse lagt til.',
-            'failure' => 'Noe gikk galt med hendelsen.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Hendelse oppdatert.',
-            'failure' => 'Noe gikk halt med hendelsen.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Mal opprettet.',
-                'failure' => 'Noe gikk galt med hendelsesmalen.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Mal har blitt oppdatert!',
-                'failure' => 'Noe gikk galt under oppdatering av hendelsesmal',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Planlagt til :timestamp',
         'add'          => [
-            'title'   => 'Legg til planlagt vedlikehold',
-            'success' => 'Plan lagt til.',
-            'failure' => 'Noe gikk galt ved opprettelse av plan.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Endre planlagt vedlikehold',
-            'success' => 'Plan har blitt oppdatert!',
-            'failure' => 'Noe gikk galt ved redigering av plan.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'PLanen har blitt slettet og vil ikke vises på din statusside.',
-            'failure' => 'Planen kunne ikke slettes. Vennligst forsøk igjen.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'Du burde legge til en komponent.',
-            'success' => 'Komponent lagt til.',
-            'failure' => 'Noe gikk galt med komponenten.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Komponent oppdatert.',
-            'failure' => 'Noe gikk galt med komponenten.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Du burde legge til en komponentgruppe.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Komponentgruppe lagt til.',
-                'failure' => 'Noe gikk galt med komponentgruppen.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Komponentgruppe oppdatert.',
-                'failure' => 'Noe gikk galt med komponentgruppen.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Beregning opprettet.',
-            'failure' => 'Noe gikk galt med beregningen.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Beregning oppdatert.',
-            'failure' => 'Noe gikk galt med beregningen.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'Noe gikk galt med komponenten.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Sikkerhet',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/no/forms.php b/resources/lang/no/forms.php
index 4ba69e60..a154c23f 100755
--- a/resources/lang/no/forms.php
+++ b/resources/lang/no/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Når ønsker du å planlegge vedlikeholdet?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Navn',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Navn',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Sidenavn',
+            'site-name'              => 'Nettstedsnavn',
             'site-url'               => 'Nettsteds-URL',
             'display-graphs'         => 'Vis grafer på statussiden?',
             'about-this-page'        => 'Om denne siden',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
-            'banner-help'            => 'Det anbefales at du ikke laster opp bilder bredere enn 930 piksler.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Det anbefales at du ikke laster opp bilder bredere enn 930 piksler.",
             'subscribers'            => 'Tillatt brukere å melde seg inn for epostvarslinger?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/pl/cachet.php b/resources/lang/pl/cachet.php
index 216fd316..2d0a771e 100755
--- a/resources/lang/pl/cachet.php
+++ b/resources/lang/pl/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Funktionsfähig',
             2 => 'Leistungsprobleme',
             3 => 'Teilweiser Ausfall',
             4 => 'Schwerer Ausfall',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonnieren Sie um die neuesten Updates zu erhalten.',
         'button'    => 'Abonnieren',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Aktualisierungen per E-Mail abonnieren.',
             'subscribed'         => 'Sie haben E-Mail-Benachrichtigungen abonniert, überprüfen Sie bitte Ihre E-Mail, um Ihr Abonnement zu bestätigen.',
             'verified'           => 'Ihre E-Mail-Abonnement ist bestätigt worden. Danke!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Von E-Mail-Updates deabonnieren.',
             'unsubscribed'       => 'Ihre E-Mail-Abonnement wurde gekündigt.',
             'failure'            => 'Etwas ist mit dem Abonnement schief gelaufen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status-Seite betrieben mit <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'Über diese Seite',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/pl/dashboard.php b/resources/lang/pl/dashboard.php
index 75191144..5b0f7680 100755
--- a/resources/lang/pl/dashboard.php
+++ b/resources/lang/pl/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Vorfall Vorlagen',
         'add'                      => [
             'title'   => 'Vorfall hinzufügen',
-            'success' => 'Vorfall hinzugefügt.',
-            'failure' => 'Etwas ist mit dem Vorfall schiefgelaufen.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Vorfall bearbeiten',
             'success' => 'Vorfall aktualisiert.',
-            'failure' => 'Etwas ist mit dem Vorfall schiefgelaufen.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Vorfallvorlage erstellen',
                 'message' => 'You should add an incident template.',
-                'success' => 'Vorlage erstellt.',
-                'failure' => 'Etwas ist mit der Vorfallvorlage schiefgelaufen.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Vorlage bearbeiten',
-                'success' => 'Vorlage aktualisiert!',
-                'failure' => 'Etwas ist mit dem Updaten der Vorfallvorlage schiefgelaufen',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Geplant am :timestamp',
         'add'          => [
-            'title'   => 'Planmäßige Wartung hinzufügen',
-            'success' => 'Zeitplan hinzugefügt.',
-            'failure' => 'Etwas ist mit dem hinzufügen des Zeitplanes schiefgelaufen.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Planmäßige Wartung bearbeiten',
-            'success' => 'Zeitplan wurde aktualisiert!',
-            'failure' => 'Etwas ist mit dem Bearbeiten des Zeitplanes schiefgelaufen.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Der Zeitplan wurde gelöscht und wird nicht auf Ihrer Statusseite angezeigt.',
-            'failure' => 'Der Zeitplan konnte nicht gelöscht werden. Bitte versuchen Sie es erneut.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Komponente hinzufügen',
             'message' => 'Sie sollten eine Komponente erstellen.',
-            'success' => 'Komponente erstellt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Komponente bearbeiten',
-            'success' => 'Komponente aktualisiert.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Sie sollten eine Komponentengruppe hinzufügen.',
             'add'           => [
                 'title'   => 'Eine Komponentengruppe hinzufügen',
-                'success' => 'Komponentengruppe hinzugefügt.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Komponentengruppe bearbeiten',
-                'success' => 'Komponentengruppe aktualisiert.',
-                'failure' => 'Mit der Komponentengruppe ist etwas schiefgegangen.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Metrik erstellen',
             'message' => 'You should add a metric.',
-            'success' => 'Metrik erstellt.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Metrik bearbeiten',
-            'success' => 'Metrik aktualisiert.',
-            'failure' => 'Mit der Metrik ist etwas schiefgegangen.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Abonnenten',
-        'description'  => 'Abonnenten erhalten E-Mail Updates wenn Vorfälle erstellt werden.',
-        'verified'     => 'Verifiziert',
-        'not_verified' => 'Nicht verifiziert',
-        'add'          => [
+        'subscribers'      => 'Abonnenten',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verifiziert',
+        'not_verified'     => 'Nicht verifiziert',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Einen neuen Abonnenten hinzufügen',
             'success' => 'Abonnent hinzugefügt.',
-            'failure' => 'Beim Erstellen der Komponente ist etwas schiefgegangen.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Abonnent aktualisieren',
             'success' => 'Abonnent aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Teammitglieder werden die M&ouml;glichkeit haben, Komponente sowie Vorf&auml;lle hinzuzuf&uuml;gen und zu ver&auml;ndern.',
         'add'         => [
             'title'   => 'Neues Teammitglied hinzufügen',
-            'success' => 'Teammitglied hinzugefügt.',
-            'failure' => 'Mit der Komponente ist etwas schiefgegangen.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Profil aktualisieren',
-            'success' => 'Profil aktualisiert.',
-            'failure' => 'Bei der Aktualisierung ging etwas schief.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Benutzer aktualisiert.',
-            'failure' => 'Bei dem Löschen dieses Benutzers ging etwas schief.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Sicherheit',
             'two-factor' => 'Nutzer ohne Zwei-Faktor-Authentifizierung',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Ihre Statusseite ist fast fertig! Vielleicht möchten Sie diese zusätzlichen Einstellungen konfigurieren',
-        'close'   => 'Gehe einfach direkt zu meinem Dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Komponenten erstellen',
             'incident'   => 'Vorfälle erstellen',
diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php
index 5c82a35c..23f5f5dd 100755
--- a/resources/lang/pl/forms.php
+++ b/resources/lang/pl/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Für wann ist die Wartung geplant?',
         'incident_time'      => 'Wann ist dieser Vorfall aufgetreten?',
         'notify_subscribers' => 'Abonnenten benachrichtigen',
-        'visibility'         => 'Vorfall Sichtbarkeit',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Öffentlich sichtbar',
         'logged_in_only'     => 'Nur für angemeldete Benutzer sichtbar',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Graphen auf der Statusseite anzeigen?',
             'about-this-page'        => 'Über diese Seite',
             'days-of-incidents'      => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?',
-            'banner'                 => 'Banner',
-            'banner-help'            => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .",
             'subscribers'            => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Durch Kommata trennen. Die oben genannte Domain ist standardmäßig erlaubt.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Benutzerdefiniertes Stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Hintergrundfarbe',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner Background Color',
             'banner-padding'          => 'Banner Padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Schriftfarbe',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/pt-BR/cachet.php b/resources/lang/pt-BR/cachet.php
index 0df1ad61..ee0d0ca2 100755
--- a/resources/lang/pt-BR/cachet.php
+++ b/resources/lang/pt-BR/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operacional',
             2 => 'Problemas de performance',
             3 => 'Indisponibilidade parcial',
             4 => 'Indisponibilidade total',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Inscreva-se para obter as atualizações mais recentes',
         'button'    => 'Inscreva-se',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Inscreva-se para atualizações via e-mail.',
             'subscribed'         => 'Inscrição realizada com sucesso! Por favor verifique o e-mail que enviamos à você para confirmar sua inscrição.',
             'verified'           => 'Sua inscrição foi confirmada! Obrigado!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Não desejo mais receber notificações via e-mail.',
             'unsubscribed'       => 'Sua inscrição foi cancelada.',
             'failure'            => 'Ocorreu um problema na sua inscrição.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Sobre este Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/pt-BR/dashboard.php b/resources/lang/pt-BR/dashboard.php
index 7f0794f7..fb92472f 100755
--- a/resources/lang/pt-BR/dashboard.php
+++ b/resources/lang/pt-BR/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Template de incidentes',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incidente adicionado.',
-            'failure' => 'Algo deu errado com o incidente.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incidente atualizado.',
-            'failure' => 'Algo deu errado com o incidente.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Template criado.',
-                'failure' => 'Algo deu errado com o template de incidente.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Template foi atualizado!',
-                'failure' => 'Algo deu errado atualizando o template de incidente',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Agendada em :timestamp',
         'add'          => [
-            'title'   => 'Adicionar manutenção programada',
-            'success' => 'Agenda adicionada.',
-            'failure' => 'Aconteceu algo errado ao adicionar o cronograma.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Editar manutenção programada',
-            'success' => 'Agenda foi atualizada!',
-            'failure' => 'Aconteceu algo errado ao editar o cronograma.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'O cronograma foi excluído e não aparecerá na sua página de status.',
-            'failure' => 'O cronograma não pôde ser excluído. Por favor, tente novamente.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'Você deve adicionar um componente.',
-            'success' => 'Componente criado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Componente atualizado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Você deve adicionar um componente à um grupo.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Grupo de componente adicionado.',
-                'failure' => 'Algo deu errado com o grupo de componente.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Grupo de componentes atualizado.',
-                'failure' => 'Algo deu errado com o grupo de componentes.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Métrica criada.',
-            'failure' => 'Algo deu errado com a métrica.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Métrica atualizada.',
-            'failure' => 'Algo deu errado com a métrica.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Inscritos',
-        'description'  => 'Todos os inscritos receberão atualizações quando novos incidentes forem criados.',
-        'verified'     => 'Verificado',
-        'not_verified' => 'Não verificado',
-        'add'          => [
+        'subscribers'      => 'Inscritos',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verificado',
+        'not_verified'     => 'Não verificado',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Inscrito adicionado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Inscrito atualizado.',
-            'failure' => 'Algo deu errado duante a atualização.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Membros da equipe serão capazes de adicionar, modificar &amp; editar componentes e incidentes.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Membro da equipe adicionado.',
-            'failure' => 'Ocorreu um problema ao excluir esse usuário.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Perfil atualizado.',
-            'failure' => 'Algo deu errado duante a atualização.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'Ocorreu um problema ao excluir esse usuário.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Segurança',
             'two-factor' => 'Usuários sem autenticação de dois fatores',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Sua página de status está quase pronta! Tavez vocë queira checar essas configurações extras',
-        'close'   => 'Basta ir direto para o meu painel de controle',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Criar componentes',
             'incident'   => 'Criar incidentes',
diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php
index c7935815..667aeec6 100755
--- a/resources/lang/pt-BR/forms.php
+++ b/resources/lang/pt-BR/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Agendar a manutenção para quando?',
         'incident_time'      => 'Quando esse incidente ocorreu?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'VIsibilidade do incidente',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Visível para todos',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Nome',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Nome',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Exibir gráficos na página de status?',
             'about-this-page'        => 'Sobre esta página',
             'days-of-incidents'      => 'Quantos dias de incidentes para mostrar?',
-            'banner'                 => 'Imagem do banner',
-            'banner-help'            => 'É recomendável que você faça upload de arquivos menores que 930px .',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "É recomendável que você faça upload de arquivos menores que 930px .",
             'subscribers'            => 'Permitir que outras pessoas se cadastrem para notificações via e-mail?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Separados por vírgula. O domínio definido acima é permitido automaticamente por padrão.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Folha de estilos personalizada',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Cor de fundo',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Cor do Texto',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/pt-PT/cachet.php b/resources/lang/pt-PT/cachet.php
index a2e6a2c0..9a63c97f 100755
--- a/resources/lang/pt-PT/cachet.php
+++ b/resources/lang/pt-PT/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operacional',
             2 => 'Problemas de performance',
             3 => 'Indisponibilidade parcial',
             4 => 'Indisponibilidade total',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Inscreva-se para obter as atualizações mais recentes',
         'button'    => 'Subscrever',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscrever actualizações via email.',
             'subscribed'         => 'Subscreveu as notificações por e-mail, por favor verifique o seu e-mail para confirmar a subscrição.',
             'verified'           => 'A sua subscrição por e-mail foi confirmada. Obrigado!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Remover subscrição de e-mail.',
             'unsubscribed'       => 'A sua subscrição de e-mail foi cancelada.',
             'failure'            => 'Algo correu mal com a sua subscrição.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Página Status é promovida por <a href="https://cachethq.io" class="links"> Cachet</a>.',
     'about_this_site' => 'Sobre este Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/pt-PT/dashboard.php b/resources/lang/pt-PT/dashboard.php
index 8c9a4901..ee84a80f 100755
--- a/resources/lang/pt-PT/dashboard.php
+++ b/resources/lang/pt-PT/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Template de incidentes',
         'add'                      => [
             'title'   => 'Adicionar um incidente',
-            'success' => 'Incidente adicionado.',
-            'failure' => 'Algo deu errado com o incidente.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Editar um incidente',
             'success' => 'Incidente atualizado.',
-            'failure' => 'Algo deu errado com o incidente.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'O incidente foi apagado e não será mais mostrado na sua página de estado.',
-            'failure' => 'O incidente não pode ser apagado. Por favor tente de novo.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Criar um modelo de incidente',
                 'message' => 'Adicione um esboço de incidente.',
-                'success' => 'Template criado.',
-                'failure' => 'Algo deu errado com o template de incidente.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Editar Modelo',
-                'success' => 'Template foi atualizado!',
-                'failure' => 'Algo deu errado atualizando o template de incidente',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'O esboço de incidente foi apagado.',
-                'failure' => 'O esboço de incidente não pode ser apagado. Por favor tente de novo.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Não existem agendamentos, bom trabalho.|Você introduziu um agendamento.|Você reportou <strong>:count</strong> agendamentos.',
         'scheduled_at' => 'Agendada em :timestamp',
         'add'          => [
-            'title'   => 'Adicionar Manutenção Agendada',
-            'success' => 'Agendamento adicionado.',
-            'failure' => 'Algo correu mal ao criar o agendamento.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Editar Manutenção Agendada',
-            'success' => 'Agendamento actualizado!',
-            'failure' => 'Algo correu mal ao editar o agendamento.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'O agendamento foi eliminado e não será mostrado na sua página de estado.',
-            'failure' => 'O agendamento não pôde ser eliminado. Por favor tente de novo.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Adicionar um Componente',
             'message' => 'Você deve adicionar um componente.',
-            'success' => 'Componente criado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Editar um Componente',
-            'success' => 'Componente atualizado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'O componente foi apagado!',
-            'failure' => 'O componente não pode ser apagado. Por favor tente de novo.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Deverá adicionar um grupo de componente.',
             'add'           => [
                 'title'   => 'Adicionar um grupo de componentes',
-                'success' => 'Grupo de componente adicionado.',
-                'failure' => 'Algo deu errado com o grupo de componente.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Editar um grupo de Componentes',
-                'success' => 'Grupo de componente actualizado.',
-                'failure' => 'Algo correu mal com o grupo de componente.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'O grupo de componentes foi apagado!',
-                'failure' => 'O grupo de componentes não pode ser apagado. Por favor tente de novo.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Criar uma métrica',
             'message' => 'Adicione uma métrica.',
-            'success' => 'Métrica criada.',
-            'failure' => 'Algo correu mal com a métrica.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Editar uma métrica',
-            'success' => 'Métrica actualizada.',
-            'failure' => 'Algo correu mal com a métrica.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'A métrica foi apagada e não será mais mostrada na sua página de estado.',
-            'failure' => 'A métrica não pode ser apagada. Por favor tente de novo.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Assinantes',
-        'description'  => 'Os Assinantes receberão atualizações por email quando incidentes são criados.',
-        'verified'     => 'Verificado',
-        'not_verified' => 'Não Verificado',
-        'add'          => [
+        'subscribers'      => 'Assinantes',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verificado',
+        'not_verified'     => 'Não Verificado',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Adicionar um novo assinante',
             'success' => 'Assinante adicionado.',
-            'failure' => 'Algo deu errado com o componente.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Actualizar Assinante',
             'success' => 'Assinante atualizado.',
-            'failure' => 'Algo deu errado duante a atualização.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Membros da equipe serão capazes de adicionar, modificar &amp; editar componentes e incidentes.',
         'add'         => [
             'title'   => 'Adicionar um novo membro de equipa',
-            'success' => 'Membro da equipe adicionado.',
-            'failure' => 'Houve algo de errado com o utilizador.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Atualizar Perfil',
-            'success' => 'Perfil atualizado.',
-            'failure' => 'Algo deu errado duante a atualização.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Utilizador apagado.',
-            'failure' => 'Houve algo de errado ao apagar o utilizador.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Convidar um novo membro de equipa',
             'success' => 'Os utilizadores convidados.',
-            'failure' => 'Houve algo de errado com o convite.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localização',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Segurança',
             'two-factor' => 'Utilizados sem factor de dupla autenticação',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Bem vindo à sua página de estado!',
         'message' => 'Sua página de status está quase pronta! Tavez vocë queira checar essas configurações extras',
-        'close'   => 'Basta ir direto para o meu painel de controle',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Criar componentes',
             'incident'   => 'Criar incidentes',
diff --git a/resources/lang/pt-PT/forms.php b/resources/lang/pt-PT/forms.php
index 50abceba..5952a467 100755
--- a/resources/lang/pt-PT/forms.php
+++ b/resources/lang/pt-PT/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Para quando pretende agendar a manutenção?',
         'incident_time'      => 'Quando é que este incidente ocorreu?',
         'notify_subscribers' => 'Notificar subscritores?',
-        'visibility'         => 'Visibilidade do Incidente',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Visível ao Publico',
         'logged_in_only'     => 'Apenas visível para users autenticados',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Componente activado?',
 
         'groups' => [
-            'name'      => 'Nome',
-            'collapsed' => 'Colapsar o grupo por defeito?',
+            'name'               => 'Nome',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Mostrar gráficos na página de estado?',
             'about-this-page'        => 'Sobre esta página',
             'days-of-incidents'      => 'Quantos dias de incidentes para mostrar?',
-            'banner'                 => 'Imagem do banner',
-            'banner-help'            => 'É recomendável que você faça upload de arquivos menores que 930px .',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "É recomendável que você faça upload de arquivos menores que 930px .",
             'subscribers'            => 'Permitir que as pessoas subscrevam as notificações?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Separados por vírgula. O domínio definido acima é permitido automaticamente por padrão.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Folha de estilos personalizada',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Cor de fundo',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Preenchimento de Fundo (Componentes, Incidentes, Rodapé)',
             'banner-background-color' => 'Cor de Fundo do banner',
             'banner-padding'          => 'Espaçamento do Banner',
             'fullwidth-banner'        => 'Habilitar largura completa do banner?',
-            'text-color'              => 'Cor do Texto',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Mostrar botão para painel no rodapé?',
             'reds'                    => 'Vermelho (Usado para erros)',
             'blues'                   => 'Azul (usado para informações)',
diff --git a/resources/lang/ro/cachet.php b/resources/lang/ro/cachet.php
index 630eb67e..9e73d7ad 100755
--- a/resources/lang/ro/cachet.php
+++ b/resources/lang/ro/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operaţional',
             2 => 'Probleme de performanţă',
             3 => 'Ȋntrerupere parțială',
             4 => 'Ȋntrerupere gravă',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Abonează-te pentru a primi cele mai recente actualizări',
         'button'    => 'Abonează-te',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Abonează-te la actualizări prin email.',
             'subscribed'         => 'Te-ai abonat la actualizări prin email, te rugăm să îți verifici adresa email și să confirmi abonarea.',
             'verified'           => 'Abonarea prin email a fost confirmată. Mulțumim!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Dezabonare de la actualizări prin email.',
             'unsubscribed'       => 'Actualizările prin email au fost anulate.',
             'failure'            => 'Ceva nu a funcționat în legătură cu abonarea.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ro/dashboard.php b/resources/lang/ro/dashboard.php
index 8013173d..10aa3423 100755
--- a/resources/lang/ro/dashboard.php
+++ b/resources/lang/ro/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/ro/forms.php b/resources/lang/ro/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/ro/forms.php
+++ b/resources/lang/ro/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/ru/cachet.php b/resources/lang/ru/cachet.php
index 802eebbc..597e8369 100755
--- a/resources/lang/ru/cachet.php
+++ b/resources/lang/ru/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Работает',
             2 => 'Проблемы с производительностью',
             3 => 'Перебои в работе',
             4 => 'Полное отключение',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Подпишитесь, чтобы получать информацию об изменениях',
         'button'    => 'Подписаться',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Подписка на рассылку об изменениях.',
             'subscribed'         => 'Вы подписались на рассылку email уведомлений. Проверьте вашу почту, чтобы подтвердить подписку.',
             'verified'           => 'Ваша подписка подтверждена. Спасибо!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Отписаться от рассылки.',
             'unsubscribed'       => 'Ваша подписка отменена.',
             'failure'            => 'Произошла ошибка при подписке на рассылку.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Об этом сайте',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/ru/dashboard.php b/resources/lang/ru/dashboard.php
index a18cef08..dffb462c 100755
--- a/resources/lang/ru/dashboard.php
+++ b/resources/lang/ru/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Шаблоны инцидентов',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Инцидент добавлен.',
-            'failure' => 'Что-то пошло не так при добавлении инцидента.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Инцидент обновлен.',
-            'failure' => 'Что-то пошло не так при изменении инцидента.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'Шаблон создан.',
-                'failure' => 'Что-то пошло не так при создании шаблона.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'Шаблон был обновлен!',
-                'failure' => 'Что-то пошло не так при изменении шаблона',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Ни одного планового обслуживания не зарегистрировано.|У вас зарегистрировано <strong>:count</strong> плановое обслуживание.|У вас зарегистрировано <strong>:count</strong> плановых обслуживания.|У вас зарегистрировано <strong>:count</strong> плановых обслуживаний.',
         'scheduled_at' => 'запланировано на :timestamp',
         'add'          => [
-            'title'   => 'Добавить плановое техническое обслуживание',
-            'success' => 'Плановые работы добавлены.',
-            'failure' => 'Что-то пошло не так при добавлении плановых работ.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Изменить плановое техническое обслуживание',
-            'success' => 'Плановые работы обновлены!',
-            'failure' => 'Что-то пошло не так при изменении плановых работ.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Плановые работы удалены и не будут отображаться на вашей статусной странице.',
-            'failure' => 'Не удается удалить плановые работы. Попробуйте еще раз.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'Вам следует добавить компонент.',
-            'success' => 'Компонент создан.',
-            'failure' => 'Что-то пошло не так с компонентом.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Обновление компонента.',
-            'failure' => 'Что-то пошло не так с компонентом.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Вам следует добавить группу компонентов.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Группа компонентов добавлена.',
-                'failure' => 'Что-то пошло не так при создании группы компонентов.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Группа компонентов обновлена.',
-                'failure' => 'Что-то пошло не так при изменении группы компонентов.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Метрика создана.',
-            'failure' => 'Что-то пошло не так при создании метрики.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Метрика обновлена.',
-            'failure' => 'Что-то пошло не так при изменении метрики.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'Что-то пошло не так с компонентом.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'Что-то пошло не так при изменении профиля.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Участники команды смогут добавлять и изменять компоненты и инциденты.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Участник команды добавлен.',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Данные профиля обновлены.',
-            'failure' => 'Что-то пошло не так при изменении профиля.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Безопасность',
             'two-factor' => 'Пользователи без двухфакторной аутентификации',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Ваша статусная страница почти готова! Возможно, вы захотите настроить дополнительные параметры',
-        'close'   => 'Я хочу сразу перейти в панель управления',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Создание компонентов',
             'incident'   => 'Создание инцидентов',
diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php
index 592920a3..091ad181 100755
--- a/resources/lang/ru/forms.php
+++ b/resources/lang/ru/forms.php
@@ -18,21 +18,21 @@ return [
         'password'         => 'Пароль',
         'site_name'        => 'Название сайта',
         'site_domain'      => 'Домен сайта',
-        'site_timezone'    => 'Выберите ваш часовой пояс',
-        'site_locale'      => 'Выберите ваш язык',
-        'enable_google2fa' => 'Включить двухфакторную аутентификацию через Google',
-        'cache_driver'     => 'Драйвер кеша',
-        'session_driver'   => 'Драйвер сессий',
+        'site_timezone'    => 'Часовой пояс',
+        'site_locale'      => 'Язык интерфейса',
+        'enable_google2fa' => 'Включить двухфакторную аутентификацию Google',
+        'cache_driver'     => 'Хранилище кеша',
+        'session_driver'   => 'Хранилище сессий',
     ],
 
     // Login form fields
     'login' => [
-        'login'         => 'Username or Email',
-        'email'         => 'Эл. почта',
+        'login'         => 'Имя пользователя или Email',
+        'email'         => 'Email',
         'password'      => 'Пароль',
         '2fauth'        => 'Код аутентификации',
-        'invalid'       => 'Invalid username or password',
-        'invalid-token' => 'Неправильный токен',
+        'invalid'       => 'Неверное имя пользователя или пароль',
+        'invalid-token' => 'Неверный токен',
         'cookies'       => 'Необходимо включить cookies для входа.',
     ],
 
@@ -44,15 +44,15 @@ return [
         'message'            => 'Сообщение',
         'message-help'       => 'Вы также можете использовать Markdown.',
         'scheduled_at'       => 'Когда запланированы работы?',
-        'incident_time'      => 'Когда инцидент произошел?',
-        'notify_subscribers' => 'Уведомлять подписчиков?',
-        'visibility'         => 'Видимость инцидента',
+        'incident_time'      => 'Когда произошел инцидент?',
+        'notify_subscribers' => 'Уведомить подписчиков?',
+        'visibility'         => 'Отображение инцидента',
         'public'             => 'Доступен публично',
-        'logged_in_only'     => 'Видимый только авторизованным пользователям',
+        'logged_in_only'     => 'Показывать только авторизованным пользователям',
         'templates'          => [
             'name'     => 'Название',
             'template' => 'Шаблон',
-            'twig'     => 'Incident Templates can make use of the <a href="http://twig.sensiolabs.org/" target="_blank">Twig</a> templating language.',
+            'twig'     => 'В шаблонах инцидентов можно использовать <a href="http://twig.sensiolabs.org/" target="_blank">Twig</a>.',
         ],
     ],
 
@@ -64,12 +64,15 @@ return [
         'description' => 'Описание',
         'link'        => 'Ссылка',
         'tags'        => 'Теги',
-        'tags-help'   => 'Разделитель - запятые.',
-        'enabled'     => 'Component enabled?',
+        'tags-help'   => 'Разделяйте запятыми.',
+        'enabled'     => 'Компонент включен?',
 
         'groups' => [
-            'name'      => 'Название',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Название',
+            'collapsing'         => 'Отображение группы',
+            'visible'            => 'Всегда развернута',
+            'collapsed'          => 'Свернута по умолчанию',
+            'collapsed_incident' => 'Свернута, но разворачивать, если есть проблема',
         ],
     ],
 
@@ -84,8 +87,8 @@ return [
         'calc_type'        => 'Расчет метрики',
         'type_sum'         => 'Сумма',
         'type_avg'         => 'Среднее значение',
-        'places'           => 'Разрядность',
-        'default_view'     => 'Default view',
+        'places'           => 'Количество цифр после точки',
+        'default_view'     => 'Представление по умолчанию',
 
         'points' => [
             'value' => 'Значение',
@@ -100,9 +103,9 @@ return [
             'site-url'               => 'URL сайта',
             'display-graphs'         => 'Отображать графики на статусной странице?',
             'about-this-page'        => 'Об этой странице',
-            'days-of-incidents'      => 'Сколько дней показывать инциденты?',
+            'days-of-incidents'      => 'За сколько дней показывать инциденты?',
             'banner'                 => 'Картинка-баннер',
-            'banner-help'            => 'Рекомендуется загружать картинки не больше 930 пикс. в ширину.',
+            'banner-help'            => "Рекомендуется загружать картинки не больше 930 пикс. в ширину.",
             'subscribers'            => 'Разрешить посетителям подписываться на email-уведомления?',
         ],
         'analytics' => [
@@ -119,46 +122,46 @@ return [
         ],
         'security' => [
             'allowed-domains'      => 'Разрешённые домены',
-            'allowed-domains-help' => 'Разделитель - запятые. Домен, установленный в настройках разрешен по-умолчанию.',
+            'allowed-domains-help' => 'Разделяйте запятыми. Домен, установленный в настройках, разрешен по умолчанию.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Пользовательские таблицы стилей',
+            'custom-css' => 'Код пользовательских стилей (CSS)',
         ],
         'theme' => [
             'background-color'        => 'Цвет фона',
-            'background-fills'        => 'Background fills (components, incidents, footer)',
+            'background-fills'        => 'Заливка фона (компоненты, инциденты, «подвал»)',
             'banner-background-color' => 'Цвет фона для баннера',
-            'banner-padding'          => 'Banner padding',
-            'fullwidth-banner'        => 'Enable fullwidth banner?',
+            'banner-padding'          => 'Отступы баннера',
+            'fullwidth-banner'        => 'Включить баннер на всю ширину?',
             'text-color'              => 'Цвет текста',
-            'dashboard-login'         => 'Show dashboard button in the footer?',
-            'reds'                    => 'Red (used for errors)',
-            'blues'                   => 'Blue (used for information)',
-            'greens'                  => 'Green (used for success)',
-            'yellows'                 => 'Yellow (used for alerts)',
-            'oranges'                 => 'Orange (used for notices)',
-            'metrics'                 => 'Metrics fill',
+            'dashboard-login'         => 'Отображать кнопку панели управления в «подвале»?',
+            'reds'                    => 'Красный (для ошибок)',
+            'blues'                   => 'Синий (для информации)',
+            'greens'                  => 'Зеленый (для сообщений о выполнении)',
+            'yellows'                 => 'Желтый (для тревожных сообщений)',
+            'oranges'                 => 'Оранжевый (для предупреждений)',
+            'metrics'                 => 'Заливка метрик',
             'links'                   => 'Ссылки',
         ],
     ],
 
     'user' => [
         'username'       => 'Имя пользователя',
-        'email'          => 'Эл. почта',
+        'email'          => 'E-mail',
         'password'       => 'Пароль',
         'api-token'      => 'API токен',
         'api-token-help' => 'Обновление вашего API токена заблокирует существующим приложениям доступ в Cachet. Вам будет необходимо прописать в них новый токен.',
-        'gravatar'       => 'Change your profile picture at Gravatar.',
-        'user_level'     => 'User Level',
+        'gravatar'       => 'Изменить своё изображение на Gravatar.',
+        'user_level'     => 'Тип пользователя',
         'levels'         => [
-            'admin' => 'Admin',
-            'user'  => 'User',
+            'admin' => 'Администратор',
+            'user'  => 'Пользователь',
         ],
         '2fa' => [
-            'help' => 'Включение двухфакторной аутентификации увеличивает безопасность вашей учетной записи. Вам понадобится скачать <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> или аналогичное приложение на свой смартфон. Когда в следующий раз вы войдете в панель управления, вам понадобится токен, выданный этим приложением.',
+            'help' => 'Включение двухфакторной аутентификации увеличивает безопасность вашей учетной записи. Вам понадобится скачать <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> или аналогичное приложение на свой смартфон. Для входа в панель управления, вам понадобится код, выданный этим приложением.',
         ],
         'team' => [
-            'description' => 'Invite your team members by entering their email addresses here.',
+            'description' => 'Пригласите своих коллег введя их адреса электронной почты.',
             'email'       => 'Email #:id',
         ],
     ],
@@ -171,11 +174,11 @@ return [
     'edit'   => 'Изменить',
     'delete' => 'Удалить',
     'submit' => 'Отправить',
-    'cancel' => 'Отмена',
+    'cancel' => 'Отменить',
     'remove' => 'Удалить',
     'invite' => 'Пригласить',
     'signup' => 'Зарегистрироваться',
 
     // Other
-    'optional' => '* не обязательное',
+    'optional' => '* Необязательно',
 ];
diff --git a/resources/lang/ru/pagination.php b/resources/lang/ru/pagination.php
index 6e82f77b..06a7e1a0 100755
--- a/resources/lang/ru/pagination.php
+++ b/resources/lang/ru/pagination.php
@@ -22,7 +22,7 @@ return [
     |
     */
 
-    'previous' => '&laquo; Предыдущая',
-    'next'     => 'Следующая &raquo;',
+    'previous' => '&laquo; Назад',
+    'next'     => 'Вперёд &raquo;',
 
 ];
diff --git a/resources/lang/ru/setup.php b/resources/lang/ru/setup.php
index 55fb3345..4a80ab49 100755
--- a/resources/lang/ru/setup.php
+++ b/resources/lang/ru/setup.php
@@ -12,12 +12,12 @@
 return [
     'setup'             => 'Установка',
     'title'             => 'Установка Cachet',
-    'service_details'   => 'Детали сервиса',
+    'service_details'   => 'Параметры сервиса',
     'env_setup'         => 'Настройка окружения',
     'status_page_setup' => 'Настройки статусной страницы',
     'show_support'      => 'Показывать, что статусная страница создана на Cachet?',
     'admin_account'     => 'Учетная запись администратора',
     'complete_setup'    => 'Завершить установку',
-    'completed'         => 'Вы успешно установили Cachet!',
+    'completed'         => 'Вы успешно настроили Cachet!',
     'finish_setup'      => 'Перейти в панель управления',
 ];
diff --git a/resources/lang/sq/cachet.php b/resources/lang/sq/cachet.php
index d2b3f39e..4d018b61 100755
--- a/resources/lang/sq/cachet.php
+++ b/resources/lang/sq/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Funksionim',
             2 => 'Çështje të performancës',
             3 => 'Ndërprerje e pjesshëm',
             4 => 'Ndërprerje Kryesore',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/sq/dashboard.php b/resources/lang/sq/dashboard.php
index ea3c1d84..8b533891 100755
--- a/resources/lang/sq/dashboard.php
+++ b/resources/lang/sq/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/sq/forms.php b/resources/lang/sq/forms.php
index 7f0932b0..1e4af537 100755
--- a/resources/lang/sq/forms.php
+++ b/resources/lang/sq/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Emri',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Emri',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'Rreth faqes',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/sr/cachet.php b/resources/lang/sr/cachet.php
index e5138db1..f15122a0 100755
--- a/resources/lang/sr/cachet.php
+++ b/resources/lang/sr/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Operational',
             2 => 'Performance Issues',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/sr/dashboard.php b/resources/lang/sr/dashboard.php
index c41e295d..2686a17d 100755
--- a/resources/lang/sr/dashboard.php
+++ b/resources/lang/sr/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/sr/forms.php b/resources/lang/sr/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/sr/forms.php
+++ b/resources/lang/sr/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/sv-SE/cachet.php b/resources/lang/sv-SE/cachet.php
index a6e2d974..c94a39d3 100755
--- a/resources/lang/sv-SE/cachet.php
+++ b/resources/lang/sv-SE/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Fungerar',
             2 => 'Prestandaproblem',
             3 => 'Mindre avbrott',
             4 => 'Större avbrott',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Prenumerera för att få de senaste uppdateringarna',
         'button'    => 'Prenumerera',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Prenumerera på epost-uppdateringar.',
             'subscribed'         => 'Du har börjat prenumerera på e-postmeddelanden, vänligen kontrollera din e-post för att bekräfta din prenumeration.',
             'verified'           => 'Din epost-prenumeration har bekräftats. Tack!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Avbeställ epost-uppdateringar.',
             'unsubscribed'       => 'Din epost-prenumeration har avbrutits.',
             'failure'            => 'Något blev fel med prenumerationen.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ': app statussida drivs av <a href="https://cachethq.io" class="links"> Cachet</a>.',
     'about_this_site' => 'Om sidan',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/sv-SE/dashboard.php b/resources/lang/sv-SE/dashboard.php
index 3c5ec13a..af8996f5 100755
--- a/resources/lang/sv-SE/dashboard.php
+++ b/resources/lang/sv-SE/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Händelsemallar',
         'add'                      => [
             'title'   => 'Lägg till händelse',
-            'success' => 'Händelse rapporterad.',
-            'failure' => 'Händelsen kunde inte sparas. Vänligen försök igen.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Redigera en händelse',
             'success' => 'Händelse uppdaterad.',
-            'failure' => 'Händelsen kunde inte uppdateras. Vänligen försök igen.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'Händelsen har tagits bort och kommer inte visas på din statussida.',
-            'failure' => 'Händelsen kunde inte tas bort. Vänligen försök igen.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Skapa en händelsemall',
                 'message' => 'Du borde lägga till en händelsemall.',
-                'success' => 'Händelsemallen har skapats!',
-                'failure' => 'Händelsemallen kunde inte skapas. Vänligen försök igen.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Redigera mall',
-                'success' => 'Händelsemallen har uppdaterats!',
-                'failure' => 'Något gick fel med uppdateringen av händelsemallen',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'Händelsen har tagits bort.',
-                'failure' => 'Händelsemallen kunde inte tas bort. Vänligen försök igen.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} Det finns inget schemalagt, bra jobbat!|Du har skapat ett schemalagt underhåll.|Du har skapat <strong>:count</strong> schemalagda underhåll.',
         'scheduled_at' => 'Schemalagd till: tidsstämpel',
         'add'          => [
-            'title'   => 'Lägg till planerat underhåll',
-            'success' => 'Schemalagt underhåll tillagt!',
-            'failure' => 'Det schemalagda underhållet kunde inte sparas. Vänligen försök igen.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Redigera schemalagt underhåll',
-            'success' => 'Schemalagt underhåll har redigerats!',
-            'failure' => 'Det schemalagda underhållet kunde inte uppdateras. Vänligen försök igen.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Schemalagt underhåll har tagits bort!',
-            'failure' => 'Det schemalagda underhållet kunde inte tas bort. Vänligen försök igen.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Lägg till en komponent',
             'message' => 'Du borde lägga till en komponent.',
-            'success' => 'Komponenten tillagd!',
-            'failure' => 'Komponenten kunde inte läggas till. Vänligen försök igen.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Redigera komponent',
-            'success' => 'Komponenten har uppdaterats!',
-            'failure' => 'Komponenten kunde inte uppdateras. Vänligen försök igen.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'Komponenten har tagits bort!',
-            'failure' => 'Komponenten kunde inte tas bort. Vänligen försök igen.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'Du borde lägga till en komponentgrupp.',
             'add'           => [
                 'title'   => 'Lägg till en komponentgrupp',
-                'success' => 'Komponentgruppen har lagts till!',
-                'failure' => 'Komponentgruppen kunde inte läggas till. Vänligen försök igen.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Redigera komponentgrupp',
-                'success' => 'Komponentgruppen har uppdaterats!',
-                'failure' => 'Komponentgruppen kunde inte uppdateras. Vänligen försök igen.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Komponentgruppen har tagits bort!',
-                'failure' => 'Komponentgruppen kunde inte tas bort. Vänligen försök igen.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Skapa ett mätetal',
             'message' => 'Du borde lägga till ett mätetal.',
-            'success' => 'Mätetal tillagt!',
-            'failure' => 'Mätetalet kunde inte läggas till. Vänligen försök igen.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Redigera ett mätetal',
-            'success' => 'Mätetal uppdaterat!',
-            'failure' => 'Mätetalet kunde inte uppdateras. Vänligen försök igen.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'Mätetalet har tagits bort och kommer inte längre visas på din statussida.',
-            'failure' => 'Mätetalet kunde inte tas bort. Vänligen försök igen.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Prenumeranter',
-        'description'  => 'Prenumeranter kommer att få uppdateringar via e-post när händelser skapas.',
-        'verified'     => 'Bekräftad',
-        'not_verified' => 'Inte bekräftad',
-        'add'          => [
+        'subscribers'      => 'Prenumeranter',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Bekräftad',
+        'not_verified'     => 'Inte bekräftad',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Lägg till en prenumerant',
             'success' => 'Prenumerant tillagd!',
-            'failure' => 'Prenumeranten kunde inte läggas till. Vänligen försök igen.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Uppdatera prenumerant',
             'success' => 'Prenumerant uppdaterad!',
-            'failure' => 'Prenumeranten kunde inte uppdateras. Vänligen försök igen.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Teammedlemmar kommer kunna lägga till, ändra &amp; redigera komponenter och händelser.',
         'add'         => [
             'title'   => 'Lägg till en ny teammedlem',
-            'success' => 'Teammedlem tillagd!',
-            'failure' => 'Teammedlemen kunde inte läggas till. Vänligen försök igen.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Uppdatera profil',
-            'success' => 'Profil uppdaterad.',
-            'failure' => 'Teammedlemen kunde inte uppdateras. Vänligen försök igen.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Teammedlemen har tagits bort och kommer inte längre ha tillgång till översiktspanelen!',
-            'failure' => 'Teammedlemen kunde inte läggas till. Vänligen försök igen.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Bjud in en ny teammedlem',
             'success' => 'Inbjudan har skickats',
-            'failure' => 'Inbjudan kunde inte skickas. Vänligen försök igen.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Platsanpassning',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Säkerhet',
             'two-factor' => 'Användare utan tvåfaktorsautentisering',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Välkommen till din statussida!',
         'message' => 'Din statussida är nästan redo. Du kan vilja konfigerara de här extra inställningarna',
-        'close'   => 'Gå bara direkt till min översiktspanel',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Skapa komponenter',
             'incident'   => 'Skapa händelser',
diff --git a/resources/lang/sv-SE/forms.php b/resources/lang/sv-SE/forms.php
index 0eb5b5b2..5dd23563 100755
--- a/resources/lang/sv-SE/forms.php
+++ b/resources/lang/sv-SE/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'När vill du schemalägga underhållet?',
         'incident_time'      => 'När inträffade händelsen?',
         'notify_subscribers' => 'Meddela prenumeranter?',
-        'visibility'         => 'Händelsens synlighet',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Kan ses av allmänheten',
         'logged_in_only'     => 'Endast synlig för inloggade användare',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Komponent aktiverad?',
 
         'groups' => [
-            'name'      => 'Namn',
-            'collapsed' => 'Vik in grupper som standard?',
+            'name'               => 'Namn',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => 'Visa grafer på statussidan?',
             'about-this-page'        => 'Om den här sidan',
             'days-of-incidents'      => 'Hur många dagar av händelser ska visas?',
-            'banner'                 => 'Bannerbild',
-            'banner-help'            => 'Vi rekommenderar att du inte laddar upp bilder som är bredare än 930 px.',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Vi rekommenderar att du inte laddar upp bilder som är bredare än 930 px.",
             'subscribers'            => 'Tillåt att registrera sig för notifikationer via e-post?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Kommaseparerad. Domänerna ovan tillåts automatiskt som standard.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Anpassad stilmall',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Bakgrundsfärg',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Bakgrundsfärg (komponenter, händelser, sidfot)',
             'banner-background-color' => 'Bakgrundsfärg för banner',
             'banner-padding'          => 'Bannerutfyllnad',
             'fullwidth-banner'        => 'Aktivera fullbreddsbanner?',
-            'text-color'              => 'Textfärg',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Visa länk till översiktspanelen i sidfoten?',
             'reds'                    => 'Röd (används för fel)',
             'blues'                   => 'Blå (används för information)',
diff --git a/resources/lang/tr/cachet.php b/resources/lang/tr/cachet.php
index 8bc0d5c2..fa8962f3 100755
--- a/resources/lang/tr/cachet.php
+++ b/resources/lang/tr/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Çalışıyor',
             2 => 'Performans Sorunları',
             3 => 'Kısmi Kesinti',
             4 => 'Ana Kesinti',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Abone Ol',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Güncellemeler için abone ol.',
             'subscribed'         => 'Bir email bildirimi almış olmalısın, lütfen aboneliğini onaylamak için kontrol et.',
             'verified'           => 'E mail aboneliğin kabul edildi. Teşekkürler!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Email aboneliğin iptal edildi.',
             'failure'            => 'Bazı şeyler yanlış gitti.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/tr/dashboard.php b/resources/lang/tr/dashboard.php
index f47d48cc..2ba73f86 100755
--- a/resources/lang/tr/dashboard.php
+++ b/resources/lang/tr/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Olay Şablonları',
         'add'                      => [
             'title'   => 'Olay Ekle',
-            'success' => 'Olay eklendi.',
-            'failure' => 'Olayla ilgili bir hata oluştu.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Olay Düzenle',
             'success' => 'Olay güncellendi.',
-            'failure' => 'Olayla ilgili bir hata oluştu.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Olay Şablonu Oluştur',
                 'message' => 'You should add an incident template.',
-                'success' => 'Şablon oluşturuldu.',
-                'failure' => 'Olay şablonuyla ilgili bir hata oluştu.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Şablonu Düzenle',
-                'success' => 'Şablon güncellendi!',
-                'failure' => 'Olay şablonunu güncellerken bir şeyler ters gitti',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => ':timestamp zamanı için kaydedildi',
         'add'          => [
-            'title'   => 'Zamanlanmış Bakım Ekle',
-            'success' => 'Zamanlama eklendi.',
-            'failure' => 'Zamanlama eklerken bir şeyler ters gitti.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/tr/forms.php b/resources/lang/tr/forms.php
index 7c2d011e..45eac91d 100755
--- a/resources/lang/tr/forms.php
+++ b/resources/lang/tr/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Bakım ne zaman?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Herkese açık',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'İsim',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'İsim',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,7 +104,7 @@ return [
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'Hakkında',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner resim',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/uk/cachet.php b/resources/lang/uk/cachet.php
index 2e36d891..e2ce37fd 100755
--- a/resources/lang/uk/cachet.php
+++ b/resources/lang/uk/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Працює',
             2 => 'Проблеми з продуктивністю',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/uk/dashboard.php b/resources/lang/uk/dashboard.php
index c41e295d..2686a17d 100755
--- a/resources/lang/uk/dashboard.php
+++ b/resources/lang/uk/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Incident Templates',
         'add'                      => [
             'title'   => 'Report an incident',
-            'success' => 'Incident reported.',
-            'failure' => 'The incident could not be reported. Please try again.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit an incident',
             'success' => 'Incident updated.',
-            'failure' => 'The incident could not be edited. Please try again.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Create an incident template',
                 'message' => 'You should add an incident template.',
-                'success' => 'The incdent template has been created!',
-                'failure' => 'The incident template could not be created. Please try again.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Edit Template',
-                'success' => 'The incdent template has been updated!',
-                'failure' => 'The incident template could not be edited. Please try again.',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
-            'title'   => 'Add scheduled maintenance',
-            'success' => 'Scheduled maintenance has been reported!',
-            'failure' => 'The scheduled maintenance could not be reported. Please try again.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Edit scheduled maintenance',
-            'success' => 'Scheduled maintenance has been edited!',
-            'failure' => 'The scheduled maintenance could not be edited. Please try again.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Scheduled maintenance has been deleted!',
-            'failure' => 'The scheduled maintenance could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Add a component',
             'message' => 'You should add a component.',
-            'success' => 'Component has been added!',
-            'failure' => 'The component could not be added. Please try again.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a component',
-            'success' => 'Component has been updated!',
-            'failure' => 'The component could not be updated. Please try again.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Component group has been added!',
-                'failure' => 'The component group could not be added. Please try again.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Component group has been edited!',
-                'failure' => 'The component group could not be edited. Please try again.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric has been added!',
-            'failure' => 'The metric could not be added. Please try again.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric has been updated!',
-            'failure' => 'The metric could not be updated. Please try again.',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Verified',
-        'not_verified' => 'Not verified',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'The subscriber could not be added. Please try again.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'The subscriber could not be updated. Please try again.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Team member has been added!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Team member has been updated!',
-            'failure' => 'The team member could not be updated. Please try again.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Localization',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Security',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => 'Just go straight to my dashboard',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Create components',
             'incident'   => 'Create incidents',
diff --git a/resources/lang/uk/forms.php b/resources/lang/uk/forms.php
index ed3d58b7..10dc1d7a 100755
--- a/resources/lang/uk/forms.php
+++ b/resources/lang/uk/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Name',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,12 +99,12 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Site name',
+            'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
-            'banner'                 => 'Banner image',
+            'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Custom stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Background color',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Text color',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/vi/cachet.php b/resources/lang/vi/cachet.php
index 4d1c94e9..b811a0d7 100755
--- a/resources/lang/vi/cachet.php
+++ b/resources/lang/vi/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => 'Hoạt động',
             2 => 'Vấn đề hiệu suất',
             3 => 'Ngưng hoạt động một phần',
             4 => 'Ngừng hoạt động toàn bộ',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => 'Subscribe to get the most recent updates',
         'button'    => 'Đăng ký',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => 'Unsubscribe from email updates.',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'about_this_site' => 'Về trang web này',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/vi/dashboard.php b/resources/lang/vi/dashboard.php
index 8bc82530..44f4f7bc 100755
--- a/resources/lang/vi/dashboard.php
+++ b/resources/lang/vi/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => 'Mẫu sự cố',
         'add'                      => [
             'title'   => 'Thêm một sự cố',
-            'success' => 'Sự cố đã được thêm.',
-            'failure' => 'Có lỗi gì đó đã xảy ra khi thêm sự cố.',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => 'Chỉnh sửa một sự cố',
             'success' => 'Sự cố đã được cập nhật.',
-            'failure' => 'Có lỗi gì đó đã xảy ra khi sửa sự cố.',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => 'Tạo ra một khuôn mẫu khi gặp sự cố',
                 'message' => 'You should add an incident template.',
-                'success' => 'Mẫu đã được tạo.',
-                'failure' => 'Có lỗi gì đó xảy ra khi thêm mẫu.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => 'Sửa mẫu',
-                'success' => 'Template đã được cập nhật thành công !',
-                'failure' => 'Có lỗi gì đó xảy ra khi sửa mẫu',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Định kỳ lúc :timestamp',
         'add'          => [
-            'title'   => 'Thêm lịch bảo trì',
-            'success' => 'Lịch đã được thêm.',
-            'failure' => 'Có lỗi xảy ra khi thêm lịch.',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => 'Sửa lịch bảo trì',
-            'success' => 'Lịch bảo trì đã được cập nhật.',
-            'failure' => 'Có lỗi xảy ra khi sửa lịch bảo trì.',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => 'Lịch bảo trì đã được xóa, nó sẽ không hiển thị trên trang status của bạn.',
-            'failure' => 'Lịch bảo trì chưa thể bị xóa, hãy thử lại.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => 'Thêm một thành phần',
             'message' => 'Bạn cần thêm một component.',
-            'success' => 'Component đã được tạo.',
-            'failure' => 'Điều gì đó không đúng đã xảy ra với các component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => 'Chỉnh sửa một thành phần',
-            'success' => 'Component đã được cập nhật.',
-            'failure' => 'Điều gì đó không đúng đã xảy ra với các component.',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => 'You should add a component group.',
             'add'           => [
                 'title'   => 'Add a component group',
-                'success' => 'Nhóm component đã được thêm.',
-                'failure' => 'Điều gì đó sai đã xảy ra với nhóm component.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => 'Edit a component group',
-                'success' => 'Nhóm thành phần đã được cập nhật.',
-                'failure' => 'Điều gì đó không đúng đã xảy ra với nhóm thành phần.',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => 'Create a metric',
             'message' => 'You should add a metric.',
-            'success' => 'Metric đã được tạo.',
-            'failure' => 'Có lỗi xảy ra khi thêm metric.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit a metric',
-            'success' => 'Metric đã được sửa.',
-            'failure' => 'Có lỗi xảy ra khi thêm metric',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => 'Subscribers',
-        'description'  => 'Subscribers will receive email updates when incidents are created.',
-        'verified'     => 'Đã xác nhận',
-        'not_verified' => 'Chưa xác nhận',
-        'add'          => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Đã xác nhận',
+        'not_verified'     => 'Chưa xác nhận',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => 'Add a new subscriber',
             'success' => 'Subscriber has been added!',
-            'failure' => 'Điều gì đó không đúng đã xảy ra với các component.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => 'Update subscriber',
             'success' => 'Subscriber has been updated!',
-            'failure' => 'Có lỗi sai gì đó đã xảy ra khi cập nhật.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => 'Thành viên trong đội sẽ có thể để thêm, sửa đổi và chỉnh sửa các thành phần và sự cố.',
         'add'         => [
             'title'   => 'Add a new team member',
-            'success' => 'Thành viên đã được add.',
-            'failure' => 'The team member could not be added. Please try again.',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => 'Update profile',
-            'success' => 'Hồ Sơ đã được cập nhật.',
-            'failure' => 'Có lỗi sai gì đó đã xảy ra khi cập nhật.',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
-            'failure' => 'The team member could not be added. Please try again.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => 'Invite a new team member',
             'success' => 'An invite has been sent',
-            'failure' => 'The invite could not be sent. Please try again.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => 'Bản địa hoá',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => 'Bảo mật',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => 'Trang trái thái cảu bạn gần như đã sẵn sàng. Bạn có thể muốn cấu hình mình vài thiết lập phụ',
-        'close'   => 'Chỉ cần đi thẳng đến bảng điều khiển của tôi',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => 'Tạo thành phần',
             'incident'   => 'Tạo sự cố',
diff --git a/resources/lang/vi/forms.php b/resources/lang/vi/forms.php
index 2cc04f63..ffe842d4 100755
--- a/resources/lang/vi/forms.php
+++ b/resources/lang/vi/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'Khi nào bảo trì định kỳ?',
         'incident_time'      => 'When did this incident occur?',
         'notify_subscribers' => 'Notify subscribers?',
-        'visibility'         => 'Incident visibility',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => 'Only visible to logged in users',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => 'Component enabled?',
 
         'groups' => [
-            'name'      => 'Tên',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => 'Tên',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,13 +99,13 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => 'Tên trang web',
+            'site-name'              => 'Tến site',
             'site-url'               => 'URL trang web',
             'display-graphs'         => 'Hiển thị các biểu đồ trên trang trạng thái?',
             'about-this-page'        => 'Về trang này',
             'days-of-incidents'      => 'Sự cố này sẽ hiển thị mấy ngày ?',
-            'banner'                 => 'Ảnh banner',
-            'banner-help'            => 'Bạn nên upload ảnh có chiều rộng lớn hơn 930px',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "Bạn nên upload ảnh có chiều rộng lớn hơn 930px",
             'subscribers'            => 'Allow people to signup to email notifications?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => 'Ngăn cách bằng dấu phẩy. Những domain dưới đây được cho phép một cách tự động.',
         ],
         'stylesheet' => [
-            'custom-css' => 'Tùy chỉnh Stylesheet',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => 'Màu nền',
+            'background-color'        => 'Background Color',
             'background-fills'        => 'Background fills (components, incidents, footer)',
             'banner-background-color' => 'Banner background color',
             'banner-padding'          => 'Banner padding',
             'fullwidth-banner'        => 'Enable fullwidth banner?',
-            'text-color'              => 'Màu chữ',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => 'Show dashboard button in the footer?',
             'reds'                    => 'Red (used for errors)',
             'blues'                   => 'Blue (used for information)',
diff --git a/resources/lang/zh-CN/cachet.php b/resources/lang/zh-CN/cachet.php
index 1bf9d429..57dd24d5 100755
--- a/resources/lang/zh-CN/cachet.php
+++ b/resources/lang/zh-CN/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => '运行正常',
             2 => '负载较高',
             3 => 'Partial Outage',
             4 => 'Major Outage',
         ],
+        'group' => [
+            'other' => '其他组件',
+        ],
     ],
 
     // Incidents
@@ -63,14 +67,19 @@ return [
     'subscriber' => [
         'subscribe' => '订阅最新的更新。',
         'button'    => 'Subscribe',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => 'Subscribe to email updates.',
             'subscribed'         => '您已经订阅电子邮件通知，请检查您的电子邮件，确认您的订阅。',
             'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => '管理您的订阅',
             'unsubscribe'        => '取消电子邮件订阅。',
             'unsubscribed'       => 'Your email subscription has been cancelled.',
             'failure'            => 'Something went wrong with the subscription.',
-            'already-subscribed' => '无法订阅：因为这个邮箱地址已经在订阅列表中了。',
+            'already-subscribed' => '无法订阅，因为这个邮箱地址 ( :email ) 已经在订阅列表中了。',
             'verify'             => [
                 'text'           => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name",
                 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app 状态页托管服务由 <a href="https://cachethq.io">Cachet</a> 提供技术支持。',
     'about_this_site' => '关于我们',
     'rss-feed'        => 'RSS',
diff --git a/resources/lang/zh-CN/dashboard.php b/resources/lang/zh-CN/dashboard.php
index d289919d..68d0e284 100755
--- a/resources/lang/zh-CN/dashboard.php
+++ b/resources/lang/zh-CN/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => '故障模板',
         'add'                      => [
             'title'   => '添加故障',
-            'success' => '故障已添加',
-            'failure' => '故障添加失败。',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => '编辑故障',
             'success' => '故障已更新。',
-            'failure' => '事件编辑失败。',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => '故障已删除并将不会出现在状态页中',
-            'failure' => '无法删除该故障，请再试一次。',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => '添加故障模板',
                 'message' => '你应该增加一个故障模板',
-                'success' => 'Template created.',
+                'success' => 'Your new incident template has been created.',
                 'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => '编辑模板',
-                'success' => 'Template has been updated!',
+                'success' => 'The incident template has been updated.',
                 'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => '模板已删除。',
-                'failure' => '无法删除该模板，请再试一次。',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -63,17 +63,17 @@ return [
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
             'title'   => 'Add Scheduled Maintenance',
-            'success' => '维护计划已添加。',
-            'failure' => '维护计划添加失败。',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
             'title'   => 'Edit Scheduled Maintenance',
-            'success' => '维护计划已更新！',
-            'failure' => '维护计划更新失败。',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => '该维护计划已被删除，它将从您的状态页上消失。',
-            'failure' => 'The schedule could not be deleted. Please try again.',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => '添加组件',
             'message' => '没有组件，马上添加一个吧',
-            'success' => '组件已添加。',
-            'failure' => 'Something went wrong with the component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => '编辑组件',
             'success' => 'Component updated.',
-            'failure' => '组件编辑失败。',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => '组件已删除。',
-            'failure' => '无法删除该组件，请再试一次。',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => '没有组件分组，马上添加一个吧',
             'add'           => [
                 'title'   => '添加组件分组',
-                'success' => '组件分组已添加。',
-                'failure' => 'Something went wrong with the component group.',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => '编辑组件分组',
                 'success' => 'Component group updated.',
-                'failure' => '分组更新失败。',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => '组建分组已删除。',
-                'failure' => '无法删除该组件分组，请再试一次。',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -126,33 +126,35 @@ return [
             'title'   => '添加图表',
             'message' => '你应该添加一个图表。',
             'success' => 'Metric created.',
-            'failure' => 'Something went wrong with the metric.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => '编辑图表',
             'success' => 'Metric updated.',
-            'failure' => '图表更新失败。',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => '图表已删除并将不会出现在状态页中',
-            'failure' => '无法删除该图表，请再试一次。',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => '通知',
-        'description'  => '当有故障发生，订阅者将收到邮件通知.',
-        'verified'     => '已认证',
-        'not_verified' => '未认证',
-        'add'          => [
+        'subscribers'      => '通知',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => '已认证',
+        'not_verified'     => '未认证',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => '添加邮件订阅',
             'success' => '邮件订阅已添加成功。',
-            'failure' => 'Something went wrong with the component.',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => '更新订阅者',
             'success' => '订阅者信息已更新.',
-            'failure' => 'Something went wrong when updating.',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -165,21 +167,21 @@ return [
         'add'         => [
             'title'   => '添加团队成员',
             'success' => 'Team member added.',
-            'failure' => '添加组件失败。',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => '更新配置文件',
             'success' => 'Profile updated.',
-            'failure' => 'Something went wrong when updating.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => '团队成员已删除.',
-            'failure' => '删除团队成员失败.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => '邀请团队成员',
             'success' => '团队成员已邀请成功.',
-            'failure' => '邀请团队成员失败.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => '本地化',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => '安全设置',
             'two-factor' => 'Users without two-factor authentication',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => '欢迎来到你的状态页！',
         'message' => 'Your status page is almost ready! You might want to configure these extra settings',
-        'close'   => '您可以直接进入控制台',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => '添加组件',
             'incident'   => '添加故障',
diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php
index 00721e5c..0554108a 100755
--- a/resources/lang/zh-CN/forms.php
+++ b/resources/lang/zh-CN/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => 'When to schedule the maintenance for?',
         'incident_time'      => '这次故障是什么时候发生的？',
         'notify_subscribers' => '通知订阅者',
-        'visibility'         => '故障的可见性',
+        'visibility'         => 'Incident Visibility',
         'public'             => 'Viewable by public',
         'logged_in_only'     => '仅登录用户可见',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => '启用',
 
         'groups' => [
-            'name'      => '组名',
-            'collapsed' => '默认折叠分组？',
+            'name'               => '组名',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -96,7 +99,7 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'              => '网站名称',
+            'site-name'              => '站点名称',
             'site-url'               => '网址',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => '关于本页',
@@ -125,7 +128,7 @@ return [
             'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => '页面背景色',
+            'background-color'        => 'Background Color',
             'background-fills'        => '区块填充色(组件, 故障, 页尾)',
             'banner-background-color' => '横幅背景色',
             'banner-padding'          => '横幅Padding值',
diff --git a/resources/lang/zh-TW/cachet.php b/resources/lang/zh-TW/cachet.php
index 44eb02c5..b37ffc65 100755
--- a/resources/lang/zh-TW/cachet.php
+++ b/resources/lang/zh-TW/cachet.php
@@ -12,12 +12,16 @@
 return [
     // Components
     'components' => [
-        'status' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
             1 => '正常',
             2 => '效能問題',
             3 => '部分停止運作',
             4 => '停止運作',
         ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
     ],
 
     // Incidents
@@ -63,10 +67,15 @@ return [
     'subscriber' => [
         'subscribe' => '訂閱最新的狀態更新。',
         'button'    => '訂閱',
-        'email'     => [
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
             'subscribe'          => '訂閱 電子郵件 系統狀態更新。',
             'subscribed'         => '您已經訂閱電子郵件通知，請檢查您的電子郵件，確認您的訂閱。',
             'verified'           => '您的電子郵件訂閱已確認。謝謝！',
+            'manage'             => 'Manage your subscription.',
             'unsubscribe'        => '取消電子郵件訂閱。',
             'unsubscribed'       => '您的電子郵件訂閱已取消。',
             'failure'            => '郵件訂閱失敗。',
@@ -130,6 +139,7 @@ return [
     ],
 
     // Other
+    'description'     => 'Stay up to date with the latest service updates from :app.',
     'powered_by'      => ':app 應用狀態頁面由 <a href="https://cachethq.io">Cachet</a>提供支持。',
     'about_this_site' => '關於此站點',
     'rss-feed'        => 'RSS 訂閱',
diff --git a/resources/lang/zh-TW/dashboard.php b/resources/lang/zh-TW/dashboard.php
index 1e6319e2..4df6583c 100755
--- a/resources/lang/zh-TW/dashboard.php
+++ b/resources/lang/zh-TW/dashboard.php
@@ -22,17 +22,17 @@ return [
         'incident-templates'       => '事件模板',
         'add'                      => [
             'title'   => '添加事件',
-            'success' => '事件新增成功。',
-            'failure' => '新增事件時遇到一些問題。',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
         ],
         'edit' => [
             'title'   => '編輯事件',
             'success' => '事件更新成功。',
-            'failure' => '更新事件時遇到一些問題。',
+            'failure' => 'There was an error editing the incident, please try again.',
         ],
         'delete' => [
             'success' => 'The incident has been deleted and will not show on your status page.',
-            'failure' => 'The incident could not be deleted. Please try again.',
+            'failure' => 'The incident could not be deleted, please try again.',
         ],
 
         // Incident templates
@@ -41,17 +41,17 @@ return [
             'add'   => [
                 'title'   => '添加事件模板',
                 'message' => 'You should add an incident template.',
-                'success' => '事件模板新增成功。',
-                'failure' => '新增事件模板時遇到一些問題。',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
             ],
             'edit' => [
                 'title'   => '編輯模板',
-                'success' => '事件模板更新成功！',
-                'failure' => '更新事件模板時遇到一些問題。',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
             ],
             'delete' => [
                 'success' => 'The incident template has been deleted.',
-                'failure' => 'The incident template could not be deleted. Please try again.',
+                'failure' => 'The incident template could not be deleted, please try again.',
             ],
         ],
     ],
@@ -62,18 +62,18 @@ return [
         'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => '排程於 :timestamp',
         'add'          => [
-            'title'   => '新增排程維護',
-            'success' => '排程維護新增成功。',
-            'failure' => '新增排程維護時遇到一些問題。',
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
         ],
         'edit' => [
-            'title'   => '修改排程維護',
-            'success' => '排程維護修改成功！',
-            'failure' => '修改排程維護時遇到一些問題。',
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
         ],
         'delete' => [
-            'success' => '成功删除了排程維護！該排程維護將不會出現在狀態頁上。',
-            'failure' => '無法刪除該排程維護。請稍後再試。',
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
         ],
     ],
 
@@ -85,17 +85,17 @@ return [
         'add'                => [
             'title'   => '添加組件',
             'message' => '你應該先新增一個組件。',
-            'success' => '組件新增成功。',
-            'failure' => '新增組件時遇到一些問題。',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'edit' => [
             'title'   => '編輯組件',
-            'success' => '組件修改成功。',
-            'failure' => '修改組件時遇到一些問題。',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component, please try again.',
         ],
         'delete' => [
             'success' => 'The component has been deleted!',
-            'failure' => 'The component could not be deleted. Please try again.',
+            'failure' => 'The component could not be deleted, please try again.',
         ],
 
         // Component groups
@@ -104,17 +104,17 @@ return [
             'no_components' => '您應添加壹個組件分組。',
             'add'           => [
                 'title'   => '添加組件分組',
-                'success' => '組件組新增成功。',
-                'failure' => '新增組件組時遇到一些問題。',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'edit' => [
                 'title'   => '編輯組件分組',
-                'success' => '組件組修改成功。',
-                'failure' => '修改組件組時遇到一些問題。',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
             ],
             'delete' => [
                 'success' => 'Component group has been deleted!',
-                'failure' => 'The component group could not be deleted. Please try again.',
+                'failure' => 'The component group could not be deleted, please try again.',
             ],
         ],
     ],
@@ -125,34 +125,36 @@ return [
         'add'     => [
             'title'   => '添加圖表',
             'message' => 'You should add a metric.',
-            'success' => '指標新增成功。',
-            'failure' => '新增指標時遇到一些問題。',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'edit' => [
             'title'   => '編輯圖表',
-            'success' => '指標修改成功。',
-            'failure' => '修改指標時遇到一些問題。',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
         ],
         'delete' => [
             'success' => 'The metric has been deleted and will no longer display on your status page.',
-            'failure' => 'The metric could not be deleted. Please try again.',
+            'failure' => 'The metric could not be deleted, please try again.',
         ],
     ],
     // Subscribers
     'subscribers' => [
-        'subscribers'  => '訂閱者',
-        'description'  => '當有新的事件被創建時訂閱者將收到郵件通知.',
-        'verified'     => '已認證',
-        'not_verified' => '未認證',
-        'add'          => [
+        'subscribers'      => '訂閱者',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => '已認證',
+        'not_verified'     => '未認證',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
             'title'   => '添加訂閱者',
             'success' => '訂閱者已添加成功.',
-            'failure' => '新增組件時遇到一些問題。',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
         ],
         'edit' => [
             'title'   => '更新訂閱者',
             'success' => '訂閱者信息已更新.',
-            'failure' => '更新時遇到一些問題。',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
         ],
     ],
 
@@ -164,22 +166,22 @@ return [
         'description' => '團隊成員可以新增、修改、或更新組件和事件。',
         'add'         => [
             'title'   => '添加團隊成員',
-            'success' => '成功新增團隊成員。',
-            'failure' => '添加組件失敗。',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'edit' => [
             'title'   => '更新配置文件',
-            'success' => '成功修改個人檔案。',
-            'failure' => '更新時遇到一些問題。',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
         ],
         'delete' => [
             'success' => '團隊成員已刪除.',
-            'failure' => '刪除團隊成員失敗.',
+            'failure' => 'The team member could not be added, please try again.',
         ],
         'invite' => [
             'title'   => '邀請團隊成員',
             'success' => '團隊成員已邀請成功.',
-            'failure' => '邀請團隊成員失敗.',
+            'failure' => 'The invite could not be sent, please try again.',
         ],
     ],
 
@@ -197,6 +199,11 @@ return [
         'localization' => [
             'localization' => '國際化',
         ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
         'security' => [
             'security'   => '安全',
             'two-factor' => '下列用戶未使用雙重認證',
@@ -237,7 +244,7 @@ return [
     'welcome' => [
         'welcome' => 'Welcome to your status page!',
         'message' => '你的狀態頁快準備好了！不過你也許先想調整一下以下設定。',
-        'close'   => '直接前往儀表板',
+        'close'   => 'Take me straight to my dashboard',
         'steps'   => [
             'component'  => '新增組件',
             'incident'   => '新增事件',
diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php
index 520967f5..9a885dbf 100755
--- a/resources/lang/zh-TW/forms.php
+++ b/resources/lang/zh-TW/forms.php
@@ -46,7 +46,7 @@ return [
         'scheduled_at'       => '排期在什麼時候進行維護？',
         'incident_time'      => '這次事件是什麽時候發生的？',
         'notify_subscribers' => '通知訂閱者',
-        'visibility'         => '事件的可見性',
+        'visibility'         => 'Incident Visibility',
         'public'             => '公共可見',
         'logged_in_only'     => '僅登錄用戶可見',
         'templates'          => [
@@ -68,8 +68,11 @@ return [
         'enabled'     => '啟用',
 
         'groups' => [
-            'name'      => '名稱',
-            'collapsed' => 'Collapse the group by default?',
+            'name'               => '名稱',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
         ],
     ],
 
@@ -101,8 +104,8 @@ return [
             'display-graphs'         => '在狀態頁上顯示圖片？',
             'about-this-page'        => '關於本站',
             'days-of-incidents'      => '顯示多少天前的事件？',
-            'banner'                 => '圖片橫幅',
-            'banner-help'            => '橫幅寬度建議少於 930px 。',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "橫幅寬度建議少於 930px 。",
             'subscribers'            => '允許用戶訂閱郵件通知嗎?',
         ],
         'analytics' => [
@@ -122,15 +125,15 @@ return [
             'allowed-domains-help' => '請以半角逗號分隔。以上域名將會自動允許訪問。',
         ],
         'stylesheet' => [
-            'custom-css' => '自定義樣式表',
+            'custom-css' => 'Custom Stylesheet',
         ],
         'theme' => [
-            'background-color'        => '背景顏色',
+            'background-color'        => 'Background Color',
             'background-fills'        => '區塊填充色(組件, 事件, 頁尾)',
             'banner-background-color' => '横幅背景色',
             'banner-padding'          => '横幅Padding值',
             'fullwidth-banner'        => '横幅全寬？',
-            'text-color'              => '文字顏色',
+            'text-color'              => 'Text Color',
             'dashboard-login'         => '在頁尾顯示 管理後臺 的入口？',
             'reds'                    => '紅（用於錯誤類提示)',
             'blues'                   => '藍 (用於信息類提示)',