diff --git a/Dangerfile b/Dangerfile
index fac3909..6476e05 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1,3 +1,13 @@
+puts "Running fastlane"
+
+require 'snapshot'
+options = {}
+Snapshot.config = FastlaneCore::Configuration.create(Snapshot::Options.available_options, options)
+Snapshot::Runner.new.work
+
+puts 'running screen_grid'
+screen_grid.run
+
 puts "Running fastlane to generate and upload an ipa file..."
 
 options = {
diff --git a/Gemfile b/Gemfile
index 61aca38..551c089 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,10 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane", git: "https://github.com/fastlane/fastlane", branch: "screen-grid"
 gem "cocoapods"
 gem "danger", git: "https://github.com/danger/danger"
-gem "danger-device_grid"
+gem "danger-device_grid", git: "https://github.com/fastlane/fastlane", branch: "screen-grid"
+gem "danger-screen_grid", git: "https://github.com/fastlane/fastlane", branch: "screen-grid"
 gem "bundler"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
diff --git a/Gemfile.lock b/Gemfile.lock
index adbca05..95d0fbc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,146 @@
 GIT
   remote: https://github.com/danger/danger
-  revision: 387a80b37c08e65371fa4d7549f0e0132bc991d0
+  revision: aca22f9c8688b0927d357017acd8f8e8faaf4687
   specs:
-    danger (0.8.5)
+    danger (0.10.0)
       claide (~> 1.0)
       claide-plugins (~> 0.9)
       colored (~> 1.2)
       cork (~> 0.1)
       faraday (~> 0)
+      faraday-http-cache (~> 1.0)
       git (~> 1)
       octokit (~> 4.2)
       redcarpet (~> 3.3)
       terminal-table (~> 1)
 
+GIT
+  remote: https://github.com/fastlane/fastlane
+  revision: 10001d8ad4e492c7bf4d5de95c39d4a100a3e1af
+  branch: screen-grid
+  specs:
+    cert (1.4.1)
+      fastlane_core (>= 0.29.1, < 1.0.0)
+      spaceship (>= 0.22.0, < 1.0.0)
+    credentials_manager (0.16.0)
+      colored
+      commander (>= 4.3.5)
+      highline (>= 1.7.1)
+      security
+    danger-device_grid (0.1.1)
+      fastlane (>= 1.94.0, < 2.0.0)
+    danger-screen_grid (0.1.0)
+      aws-sdk (>= 2.0.0)
+      fastlane (>= 1.94.0, < 2.0.0)
+    deliver (1.13.1)
+      credentials_manager (>= 0.16.0, < 1.0.0)
+      fastimage (~> 1.6)
+      fastlane_core (>= 0.46.2, < 1.0.0)
+      plist (~> 3.1.0)
+      spaceship (>= 0.26.2, < 1.0.0)
+    fastlane (1.97.2)
+      activesupport (< 5)
+      addressable (~> 2.3)
+      bundler (~> 1.12)
+      cert (>= 1.4.1, < 2.0.0)
+      credentials_manager (>= 0.16.0, < 1.0.0)
+      deliver (>= 1.13.1, < 2.0.0)
+      fastlane_core (>= 0.48.1, < 1.0.0)
+      frameit (>= 2.7.0, < 3.0.0)
+      gym (>= 1.6.3, < 2.0.0)
+      krausefx-shenzhen (>= 0.14.7)
+      match (>= 0.6.0, < 1.0.0)
+      multipart-post (~> 2.0.0)
+      pem (>= 1.3.1, < 2.0.0)
+      pilot (>= 1.9.1, < 2.0.0)
+      plist (~> 3.1.0)
+      produce (>= 1.1.2, < 2.0.0)
+      scan (>= 0.8.0, < 1.0.0)
+      screengrab (>= 0.3.2, < 1.0.0)
+      sigh (>= 1.8.0, < 2.0.0)
+      slack-notifier (~> 1.3)
+      snapshot (>= 1.12.3, < 2.0.0)
+      spaceship (>= 0.28.0, < 1.0.0)
+      supply (>= 0.7.0, < 1.0.0)
+      terminal-notifier (~> 1.6.2)
+      terminal-table (~> 1.4.5)
+      word_wrap (~> 1.0.0)
+      xcode-install (~> 2.0.0)
+      xcodeproj (>= 0.20, < 2.0.0)
+      xcpretty (>= 0.2.1)
+    fastlane_core (0.48.1)
+      babosa
+      colored
+      commander (= 4.3.5)
+      credentials_manager (>= 0.16.0, < 1.0.0)
+      excon (~> 0.45.0)
+      gh_inspector (>= 1.0.1, < 2.0.0)
+      highline (>= 1.7.2)
+      json
+      multi_json
+      plist (~> 3.1)
+      rubyzip (~> 1.1.6)
+      terminal-table (~> 1.4.5)
+    frameit (2.7.0)
+      deliver (> 0.3)
+      fastimage (~> 1.6.3)
+      fastlane_core (>= 0.36.1, < 1.0.0)
+      mini_magick (~> 4.5.1)
+    gym (1.7.0)
+      fastlane_core (>= 0.43.3, < 1.0.0)
+      plist
+      rubyzip (>= 1.1.7)
+      terminal-table
+      xcpretty (>= 0.2.1)
+    match (0.6.1)
+      cert (>= 1.2.8, < 2.0.0)
+      credentials_manager (>= 0.13.0, < 1.0.0)
+      fastlane_core (>= 0.39.0, < 1.0.0)
+      security
+      sigh (>= 1.2.2, < 2.0.0)
+      spaceship (>= 0.24.0, < 1.0.0)
+    pem (1.3.1)
+      fastlane_core (>= 0.43.1, < 1.0.0)
+      spaceship (>= 0.26.2, < 1.0.0)
+    pilot (1.9.2)
+      credentials_manager (>= 0.3.0)
+      fastlane_core (>= 0.46.2, < 1.0.0)
+      spaceship (>= 0.27.0, < 1.0.0)
+      terminal-table (~> 1.4.5)
+    produce (1.1.2)
+      fastlane_core (>= 0.30.0, < 1.0.0)
+      spaceship (>= 0.16.0, < 1.0.0)
+    scan (0.8.0)
+      fastlane_core (>= 0.43.3, < 1.0.0)
+      slack-notifier (~> 1.3)
+      terminal-table
+      xcpretty (>= 0.2.1)
+      xcpretty-travis-formatter (>= 0.0.3)
+    screengrab (0.3.2)
+      fastlane_core (>= 0.38.0, < 1.0.0)
+    sigh (1.8.0)
+      fastlane_core (>= 0.36.1, < 1.0.0)
+      plist (~> 3.1)
+      spaceship (>= 0.22.0, < 1.0.0)
+    snapshot (1.12.3)
+      fastimage (~> 1.6.3)
+      fastlane_core (>= 0.43.3, < 1.0.0)
+      plist (~> 3.1.0)
+      xcpretty (>= 0.2.1)
+    spaceship (0.28.0)
+      colored
+      credentials_manager (>= 0.9.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (~> 1.6)
+      multi_xml (~> 0.5)
+      plist (~> 3.1)
+    supply (0.7.0)
+      credentials_manager (>= 0.15.0)
+      fastlane_core (>= 0.43.4)
+      google-api-client (~> 0.9.1)
+
 PATH
   remote: ./fastlane-plugin-emoji_fetcher
   specs:
@@ -21,17 +149,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
+    aws-sdk (2.4.0)
+      aws-sdk-resources (= 2.4.0)
+    aws-sdk-core (2.4.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.4.0)
+      aws-sdk-core (= 2.4.0)
     babosa (1.0.2)
-    cert (1.4.1)
-      fastlane_core (>= 0.29.1, < 1.0.0)
-      spaceship (>= 0.22.0, < 1.0.0)
     claide (1.0.0)
     claide-plugins (0.9.0)
       cork (~> 0)
@@ -73,19 +204,6 @@ GEM
       highline (~> 1.7.2)
     cork (0.1.0)
       colored (~> 1.2)
-    credentials_manager (0.16.0)
-      colored
-      commander (>= 4.3.5)
-      highline (>= 1.7.1)
-      security
-    danger-device_grid (0.1.1)
-      fastlane (>= 1.94.0, < 2.0.0)
-    deliver (1.13.1)
-      credentials_manager (>= 0.16.0, < 1.0.0)
-      fastimage (~> 1.6)
-      fastlane_core (>= 0.46.2, < 1.0.0)
-      plist (~> 3.1.0)
-      spaceship (>= 0.26.2, < 1.0.0)
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.1.1)
@@ -96,59 +214,13 @@ GEM
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
+    faraday-http-cache (1.3.0)
+      faraday (~> 0.8)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
     fastimage (1.6.8)
       addressable (~> 2.3, >= 2.3.5)
-    fastlane (1.97.2)
-      activesupport (< 5)
-      addressable (~> 2.3)
-      bundler (~> 1.12)
-      cert (>= 1.4.1, < 2.0.0)
-      credentials_manager (>= 0.16.0, < 1.0.0)
-      deliver (>= 1.13.1, < 2.0.0)
-      fastlane_core (>= 0.48.1, < 1.0.0)
-      frameit (>= 2.7.0, < 3.0.0)
-      gym (>= 1.6.3, < 2.0.0)
-      krausefx-shenzhen (>= 0.14.7)
-      match (>= 0.6.0, < 1.0.0)
-      multipart-post (~> 2.0.0)
-      pem (>= 1.3.1, < 2.0.0)
-      pilot (>= 1.9.1, < 2.0.0)
-      plist (~> 3.1.0)
-      produce (>= 1.1.2, < 2.0.0)
-      scan (>= 0.8.0, < 1.0.0)
-      screengrab (>= 0.3.2, < 1.0.0)
-      sigh (>= 1.8.0, < 2.0.0)
-      slack-notifier (~> 1.3)
-      snapshot (>= 1.12.3, < 2.0.0)
-      spaceship (>= 0.28.0, < 1.0.0)
-      supply (>= 0.7.0, < 1.0.0)
-      terminal-notifier (~> 1.6.2)
-      terminal-table (~> 1.4.5)
-      word_wrap (~> 1.0.0)
-      xcode-install (~> 2.0.0)
-      xcodeproj (>= 0.20, < 2.0.0)
-      xcpretty (>= 0.2.1)
-    fastlane_core (0.48.1)
-      babosa
-      colored
-      commander (= 4.3.5)
-      credentials_manager (>= 0.16.0, < 1.0.0)
-      excon (~> 0.45.0)
-      gh_inspector (>= 1.0.1, < 2.0.0)
-      highline (>= 1.7.2)
-      json
-      multi_json
-      plist (~> 3.1)
-      rubyzip (~> 1.1.6)
-      terminal-table (~> 1.4.5)
     fourflusher (0.3.2)
-    frameit (2.7.0)
-      deliver (> 0.3)
-      fastimage (~> 1.6.3)
-      fastlane_core (>= 0.36.1, < 1.0.0)
-      mini_magick (~> 4.5.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.2)
     git (1.3.0)
@@ -170,18 +242,13 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    gym (1.6.3)
-      fastlane_core (>= 0.43.1, < 1.0.0)
-      plist
-      rubyzip (>= 1.1.7)
-      terminal-table
-      xcpretty (>= 0.2.1)
     highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httpclient (2.8.0)
     hurley (0.2)
     i18n (0.7.0)
+    jmespath (1.3.1)
     json (1.8.3)
     jwt (1.5.4)
     krausefx-shenzhen (0.14.9)
@@ -200,13 +267,6 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    match (0.6.1)
-      cert (>= 1.2.8, < 2.0.0)
-      credentials_manager (>= 0.13.0, < 1.0.0)
-      fastlane_core (>= 0.39.0, < 1.0.0)
-      security
-      sigh (>= 1.2.2, < 2.0.0)
-      spaceship (>= 0.24.0, < 1.0.0)
     memoist (0.14.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -226,18 +286,7 @@ GEM
       sawyer (~> 0.7.0, >= 0.5.3)
     open4 (1.3.4)
     os (0.9.6)
-    pem (1.3.1)
-      fastlane_core (>= 0.43.1, < 1.0.0)
-      spaceship (>= 0.26.2, < 1.0.0)
-    pilot (1.9.2)
-      credentials_manager (>= 0.3.0)
-      fastlane_core (>= 0.46.2, < 1.0.0)
-      spaceship (>= 0.27.0, < 1.0.0)
-      terminal-table (~> 1.4.5)
     plist (3.1.0)
-    produce (1.1.2)
-      fastlane_core (>= 0.30.0, < 1.0.0)
-      spaceship (>= 0.16.0, < 1.0.0)
     redcarpet (3.3.4)
     representable (2.3.0)
       uber (~> 0.0.7)
@@ -247,43 +296,13 @@ GEM
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    scan (0.8.0)
-      fastlane_core (>= 0.36.1, < 1.0.0)
-      slack-notifier (~> 1.3)
-      terminal-table
-      xcpretty (>= 0.2.1)
-      xcpretty-travis-formatter (>= 0.0.3)
-    screengrab (0.3.2)
-      fastlane_core (>= 0.38.0, < 1.0.0)
     security (0.1.3)
-    sigh (1.8.0)
-      fastlane_core (>= 0.36.1, < 1.0.0)
-      plist (~> 3.1)
-      spaceship (>= 0.22.0, < 1.0.0)
     signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slack-notifier (1.5.1)
-    snapshot (1.12.3)
-      fastimage (~> 1.6.3)
-      fastlane_core (>= 0.36.1, < 1.0.0)
-      plist (~> 3.1.0)
-      xcpretty (>= 0.2.1)
-    spaceship (0.28.0)
-      colored
-      credentials_manager (>= 0.9.0)
-      faraday (~> 0.9)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
-      fastimage (~> 1.6)
-      multi_xml (~> 0.5)
-      plist (~> 3.1)
-    supply (0.7.0)
-      credentials_manager (>= 0.15.0)
-      fastlane_core (>= 0.43.4)
-      google-api-client (~> 0.9.1)
     terminal-notifier (1.6.3)
     terminal-table (1.4.5)
     thor (0.19.1)
@@ -295,7 +314,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     word_wrap (1.0.0)
-    xcode-install (2.0.1)
+    xcode-install (2.0.2)
       claide (>= 0.9.1, < 1.1.0)
       spaceship (>= 0.25.1, < 1.0.0)
     xcodeproj (1.2.0)
@@ -314,8 +333,9 @@ DEPENDENCIES
   bundler
   cocoapods
   danger!
-  danger-device_grid
-  fastlane
+  danger-device_grid!
+  danger-screen_grid!
+  fastlane!
   fastlane-plugin-emoji_fetcher!
 
 BUNDLED WITH
diff --git a/fastlane/Snapfile b/fastlane/Snapfile
index d3efe3e..8039d24 100644
--- a/fastlane/Snapfile
+++ b/fastlane/Snapfile
@@ -1,5 +1,14 @@
 languages([
-  "en-US"
+  "en-US",
+  "de-DE"
 ])
 
-clear_previous_screenshots true # remove the '#' to clear all previously generated screenshots before creating new ones
+devices([
+  "iPhone 4s",
+  "iPhone 5",
+  # "iPhone 6",
+  # "iPhone 6 Plus",
+  # "iPad Retina"
+])
+
+clear_previous_screenshots false # remove the '#' to clear all previously generated screenshots before creating new ones