diff --git a/MockupEngineer/templates/__init__.py b/MockupEngineer/templates/__init__.py
index a956565..f28c4d7 100644
--- a/MockupEngineer/templates/__init__.py
+++ b/MockupEngineer/templates/__init__.py
@@ -1,4 +1,3 @@
-import datetime
 import hashlib
 import os
 
@@ -43,15 +42,23 @@ class DeviceImage:
 class About:
     author: str
     url: str
-    created: str
 
 
 @dataclass(frozen=False)
 class Device:
     def __init__(self, path: str):
+        self.__path__ = path
+
         config = ConfigParser()
         config.read(os.path.join(templates_path, path, 'config.ini'))
 
+        if int(config.get('info', 'width')) < int(config.get('info', 'height')):
+            height = config.get('info', 'width')
+            width = config.get('info', 'height')
+            config['info']['width'] = width
+            config['info']['height'] = height
+            self.__write_config__(config)
+
         self.id = hashlib.md5(str({s: dict(config.items(s)) for s in config.sections()}).encode()).hexdigest()
         self.manufacturer: str = str(config.get('info', 'manufacturer'))
         self.name: str = str(config.get('info', 'name'))
@@ -76,12 +83,9 @@ class Device:
             mask_path=os.path.join(templates_path, path, 'mask.png') if config.get('image', 'mask') == 'true' else None,
             rotate=config.get('image', 'rotate') == 'true')
 
-        self.__path__ = path
-
         self.about = About(
             author=self.__get_author__(config),
-            url=self.__get_url__(config),
-            created=self.__get_creation_date__(config)
+            url=self.__get_url__(config)
         )
 
     def __str__(self):
@@ -111,10 +115,3 @@ class Device:
                 config.add_section('about')
             config['about']['url'] = author_url()
             self.__write_config__(config)
-
-    def __get_creation_date__(self, config: ConfigParser) -> str:
-        dates = [os.path.getmtime(str(os.path.join(templates_path, self.__path__, item))) for _, item in config['colors'].items()]
-        date = datetime.datetime.utcfromtimestamp(max(dates)) if dates else datetime.datetime.utcnow()
-        config['about']['created'] = date.strftime('%d.%m.%Y')
-        self.__write_config__(config)
-        return config.get('about', 'created')
diff --git a/MockupEngineer/templates/galaxys20/config.ini b/MockupEngineer/templates/galaxys20/config.ini
index ff0cdc3..a2dc5c6 100644
--- a/MockupEngineer/templates/galaxys20/config.ini
+++ b/MockupEngineer/templates/galaxys20/config.ini
@@ -3,8 +3,8 @@ manufacturer = Samsung
 name = Galaxy S20
 type = phone
 year = 2020
-width = 1440
-height = 3200
+width = 3200
+height = 1440
 
 [colors]
 cloud blue = blue.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/galaxys20/preview.png b/MockupEngineer/templates/galaxys20/preview.png
index 2b479a0..85d0822 100644
Binary files a/MockupEngineer/templates/galaxys20/preview.png and b/MockupEngineer/templates/galaxys20/preview.png differ
diff --git a/MockupEngineer/templates/galaxys20ultra/config.ini b/MockupEngineer/templates/galaxys20ultra/config.ini
index 58a75ab..3ebadcc 100644
--- a/MockupEngineer/templates/galaxys20ultra/config.ini
+++ b/MockupEngineer/templates/galaxys20ultra/config.ini
@@ -3,8 +3,8 @@ manufacturer = Samsung
 name = Galaxy S20 Ultra
 type = phone
 year = 2020
-width = 1440
-height = 3200
+width = 3200
+height = 1440
 
 [colors]
 cosmic black = black.png
@@ -21,5 +21,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/galaxys20ultra/preview.png b/MockupEngineer/templates/galaxys20ultra/preview.png
index 7e8a687..8dd01c5 100644
Binary files a/MockupEngineer/templates/galaxys20ultra/preview.png and b/MockupEngineer/templates/galaxys20ultra/preview.png differ
diff --git a/MockupEngineer/templates/imac212015/config.ini b/MockupEngineer/templates/imac212015/config.ini
index a9e1c2f..a104b59 100644
--- a/MockupEngineer/templates/imac212015/config.ini
+++ b/MockupEngineer/templates/imac212015/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/imac212015/preview.png b/MockupEngineer/templates/imac212015/preview.png
index 74fcab7..f5126d2 100644
Binary files a/MockupEngineer/templates/imac212015/preview.png and b/MockupEngineer/templates/imac212015/preview.png differ
diff --git a/MockupEngineer/templates/imac242021/config.ini b/MockupEngineer/templates/imac242021/config.ini
index 8e56243..d2b5906 100644
--- a/MockupEngineer/templates/imac242021/config.ini
+++ b/MockupEngineer/templates/imac242021/config.ini
@@ -26,5 +26,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 03.02.2022
 
diff --git a/MockupEngineer/templates/imac242021/preview.png b/MockupEngineer/templates/imac242021/preview.png
index 702c5cd..67f2e9e 100644
Binary files a/MockupEngineer/templates/imac242021/preview.png and b/MockupEngineer/templates/imac242021/preview.png differ
diff --git a/MockupEngineer/templates/ipad9/config.ini b/MockupEngineer/templates/ipad9/config.ini
index fd656a8..ce3488b 100644
--- a/MockupEngineer/templates/ipad9/config.ini
+++ b/MockupEngineer/templates/ipad9/config.ini
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/ipad9/preview.png b/MockupEngineer/templates/ipad9/preview.png
index dda9c72..cc50c1b 100644
Binary files a/MockupEngineer/templates/ipad9/preview.png and b/MockupEngineer/templates/ipad9/preview.png differ
diff --git a/MockupEngineer/templates/ipadair4/config.ini b/MockupEngineer/templates/ipadair4/config.ini
index 09817e5..26b79f3 100644
--- a/MockupEngineer/templates/ipadair4/config.ini
+++ b/MockupEngineer/templates/ipadair4/config.ini
@@ -24,5 +24,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/ipadair4/preview.png b/MockupEngineer/templates/ipadair4/preview.png
index 82992b2..a9f17dc 100644
Binary files a/MockupEngineer/templates/ipadair4/preview.png and b/MockupEngineer/templates/ipadair4/preview.png differ
diff --git a/MockupEngineer/templates/ipadmini5/config.ini b/MockupEngineer/templates/ipadmini5/config.ini
index a58835d..4ff82d1 100644
--- a/MockupEngineer/templates/ipadmini5/config.ini
+++ b/MockupEngineer/templates/ipadmini5/config.ini
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/ipadmini5/preview.png b/MockupEngineer/templates/ipadmini5/preview.png
index 2734fc4..7aa457a 100644
Binary files a/MockupEngineer/templates/ipadmini5/preview.png and b/MockupEngineer/templates/ipadmini5/preview.png differ
diff --git a/MockupEngineer/templates/ipadpro114/config.ini b/MockupEngineer/templates/ipadpro114/config.ini
index 376580e..f1cd787 100644
--- a/MockupEngineer/templates/ipadpro114/config.ini
+++ b/MockupEngineer/templates/ipadpro114/config.ini
@@ -21,5 +21,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/ipadpro114/preview.png b/MockupEngineer/templates/ipadpro114/preview.png
index a776888..67609b5 100644
Binary files a/MockupEngineer/templates/ipadpro114/preview.png and b/MockupEngineer/templates/ipadpro114/preview.png differ
diff --git a/MockupEngineer/templates/ipadpro134/config.ini b/MockupEngineer/templates/ipadpro134/config.ini
index 09e94a6..8c9b22b 100644
--- a/MockupEngineer/templates/ipadpro134/config.ini
+++ b/MockupEngineer/templates/ipadpro134/config.ini
@@ -21,5 +21,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/ipadpro134/preview.png b/MockupEngineer/templates/ipadpro134/preview.png
index d2f1775..becdd6c 100644
Binary files a/MockupEngineer/templates/ipadpro134/preview.png and b/MockupEngineer/templates/ipadpro134/preview.png differ
diff --git a/MockupEngineer/templates/iphone12/config.ini b/MockupEngineer/templates/iphone12/config.ini
index c2f2d37..4012b3d 100644
--- a/MockupEngineer/templates/iphone12/config.ini
+++ b/MockupEngineer/templates/iphone12/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 12
 type = phone
 year = 2020
-width = 1170
-height = 2532
+width = 2532
+height = 1170
 
 [colors]
 black = black.png
@@ -24,5 +24,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/iphone12/preview.png b/MockupEngineer/templates/iphone12/preview.png
index 27b3f15..fec4e8a 100644
Binary files a/MockupEngineer/templates/iphone12/preview.png and b/MockupEngineer/templates/iphone12/preview.png differ
diff --git a/MockupEngineer/templates/iphone12mini/config.ini b/MockupEngineer/templates/iphone12mini/config.ini
index 4a204b7..37056c6 100644
--- a/MockupEngineer/templates/iphone12mini/config.ini
+++ b/MockupEngineer/templates/iphone12mini/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 12 Mini
 type = phone
 year = 2020
-width = 1080
-height = 2340
+width = 2340
+height = 1080
 
 [colors]
 black = black.png
@@ -24,5 +24,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/iphone12mini/preview.png b/MockupEngineer/templates/iphone12mini/preview.png
index edd6b9d..101af75 100644
Binary files a/MockupEngineer/templates/iphone12mini/preview.png and b/MockupEngineer/templates/iphone12mini/preview.png differ
diff --git a/MockupEngineer/templates/iphone12pro/config.ini b/MockupEngineer/templates/iphone12pro/config.ini
index eeee33e..d510eff 100644
--- a/MockupEngineer/templates/iphone12pro/config.ini
+++ b/MockupEngineer/templates/iphone12pro/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 12 Pro
 type = phone
 year = 2020
-width = 1170
-height = 2532
+width = 2532
+height = 1170
 
 [colors]
 gold = gold.png
@@ -23,5 +23,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/iphone12pro/preview.png b/MockupEngineer/templates/iphone12pro/preview.png
index 94bac9e..2368add 100644
Binary files a/MockupEngineer/templates/iphone12pro/preview.png and b/MockupEngineer/templates/iphone12pro/preview.png differ
diff --git a/MockupEngineer/templates/iphone12promax/config.ini b/MockupEngineer/templates/iphone12promax/config.ini
index a890c9a..9eb6b61 100644
--- a/MockupEngineer/templates/iphone12promax/config.ini
+++ b/MockupEngineer/templates/iphone12promax/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 12 Pro Max
 type = phone
 year = 2020
-width = 1284
-height = 2778
+width = 2778
+height = 1284
 
 [colors]
 gold = gold.png
@@ -23,5 +23,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/iphone12promax/preview.png b/MockupEngineer/templates/iphone12promax/preview.png
index 57c459c..d473242 100644
Binary files a/MockupEngineer/templates/iphone12promax/preview.png and b/MockupEngineer/templates/iphone12promax/preview.png differ
diff --git a/MockupEngineer/templates/iphone13/config.ini b/MockupEngineer/templates/iphone13/config.ini
index fc7183c..a27a15b 100644
--- a/MockupEngineer/templates/iphone13/config.ini
+++ b/MockupEngineer/templates/iphone13/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 13
 type = phone
 year = 2021
-width = 1170
-height = 2532
+width = 2532
+height = 1170
 
 [colors]
 blue = blue.png
@@ -24,5 +24,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 19.02.2022
 
diff --git a/MockupEngineer/templates/iphone13/preview.png b/MockupEngineer/templates/iphone13/preview.png
index 6452a87..71d9fca 100644
Binary files a/MockupEngineer/templates/iphone13/preview.png and b/MockupEngineer/templates/iphone13/preview.png differ
diff --git a/MockupEngineer/templates/iphone13mini/config.ini b/MockupEngineer/templates/iphone13mini/config.ini
index 154ddef..0bb4bb6 100644
--- a/MockupEngineer/templates/iphone13mini/config.ini
+++ b/MockupEngineer/templates/iphone13mini/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 13 Mini
 type = phone
 year = 2021
-width = 1080
-height = 2340
+width = 2340
+height = 1080
 
 [colors]
 blue = blue.png
@@ -24,5 +24,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 19.02.2022
 
diff --git a/MockupEngineer/templates/iphone13mini/preview.png b/MockupEngineer/templates/iphone13mini/preview.png
index d233a7e..c3c35e1 100644
Binary files a/MockupEngineer/templates/iphone13mini/preview.png and b/MockupEngineer/templates/iphone13mini/preview.png differ
diff --git a/MockupEngineer/templates/iphone13pro/config.ini b/MockupEngineer/templates/iphone13pro/config.ini
index cff767b..6db3b22 100644
--- a/MockupEngineer/templates/iphone13pro/config.ini
+++ b/MockupEngineer/templates/iphone13pro/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 13 Pro
 type = phone
 year = 2021
-width = 1170
-height = 2532
+width = 2532
+height = 1170
 
 [colors]
 gold = gold.png
@@ -23,5 +23,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 19.02.2022
 
diff --git a/MockupEngineer/templates/iphone13pro/preview.png b/MockupEngineer/templates/iphone13pro/preview.png
index 21880cb..11b2e2b 100644
Binary files a/MockupEngineer/templates/iphone13pro/preview.png and b/MockupEngineer/templates/iphone13pro/preview.png differ
diff --git a/MockupEngineer/templates/iphone13promax/config.ini b/MockupEngineer/templates/iphone13promax/config.ini
index a8317b3..50f0a6a 100644
--- a/MockupEngineer/templates/iphone13promax/config.ini
+++ b/MockupEngineer/templates/iphone13promax/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone 13 Pro Max
 type = phone
 year = 2021
-width = 1284
-height = 2778
+width = 2778
+height = 1284
 
 [colors]
 gold = gold.png
@@ -23,5 +23,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 19.02.2022
 
diff --git a/MockupEngineer/templates/iphone13promax/preview.png b/MockupEngineer/templates/iphone13promax/preview.png
index 3ce4774..314f228 100644
Binary files a/MockupEngineer/templates/iphone13promax/preview.png and b/MockupEngineer/templates/iphone13promax/preview.png differ
diff --git a/MockupEngineer/templates/iphonese2020/config.ini b/MockupEngineer/templates/iphonese2020/config.ini
index bea44c1..8a764f9 100644
--- a/MockupEngineer/templates/iphonese2020/config.ini
+++ b/MockupEngineer/templates/iphonese2020/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone SE
 type = phone
 year = 2020
-width = 750
-height = 1334
+width = 1334
+height = 750
 
 [colors]
 black = black.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 31.01.2022
 
diff --git a/MockupEngineer/templates/iphonese2020/preview.png b/MockupEngineer/templates/iphonese2020/preview.png
index dcf6528..1848961 100644
Binary files a/MockupEngineer/templates/iphonese2020/preview.png and b/MockupEngineer/templates/iphonese2020/preview.png differ
diff --git a/MockupEngineer/templates/iphonexr/config.ini b/MockupEngineer/templates/iphonexr/config.ini
index 3107572..dd43a85 100644
--- a/MockupEngineer/templates/iphonexr/config.ini
+++ b/MockupEngineer/templates/iphonexr/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone Xr
 type = phone
 year = 2018
-width = 828
-height = 1792
+width = 1792
+height = 828
 
 [colors]
 blue = blue.png
@@ -25,5 +25,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/iphonexr/preview.png b/MockupEngineer/templates/iphonexr/preview.png
index 7d1d343..ae803fc 100644
Binary files a/MockupEngineer/templates/iphonexr/preview.png and b/MockupEngineer/templates/iphonexr/preview.png differ
diff --git a/MockupEngineer/templates/iphonexs/config.ini b/MockupEngineer/templates/iphonexs/config.ini
index db7478c..b49413a 100644
--- a/MockupEngineer/templates/iphonexs/config.ini
+++ b/MockupEngineer/templates/iphonexs/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone Xs
 type = phone
 year = 2019
-width = 1125
-height = 2436
+width = 2436
+height = 1125
 
 [colors]
 gold = gold.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/iphonexs/preview.png b/MockupEngineer/templates/iphonexs/preview.png
index afb44eb..8266276 100644
Binary files a/MockupEngineer/templates/iphonexs/preview.png and b/MockupEngineer/templates/iphonexs/preview.png differ
diff --git a/MockupEngineer/templates/iphonexsmax/config.ini b/MockupEngineer/templates/iphonexsmax/config.ini
index 8994369..9c353a2 100644
--- a/MockupEngineer/templates/iphonexsmax/config.ini
+++ b/MockupEngineer/templates/iphonexsmax/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = iPhone Xs Max
 type = phone
 year = 2019
-width = 1242
-height = 2688
+width = 2688
+height = 1242
 
 [colors]
 gold = gold.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/iphonexsmax/preview.png b/MockupEngineer/templates/iphonexsmax/preview.png
index 6d904d4..6f9d5f6 100644
Binary files a/MockupEngineer/templates/iphonexsmax/preview.png and b/MockupEngineer/templates/iphonexsmax/preview.png differ
diff --git a/MockupEngineer/templates/macbook122016/config.ini b/MockupEngineer/templates/macbook122016/config.ini
index dc38831..993c6d2 100644
--- a/MockupEngineer/templates/macbook122016/config.ini
+++ b/MockupEngineer/templates/macbook122016/config.ini
@@ -21,5 +21,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/macbook122016/preview.png b/MockupEngineer/templates/macbook122016/preview.png
index 7bbff8d..2a0347e 100644
Binary files a/MockupEngineer/templates/macbook122016/preview.png and b/MockupEngineer/templates/macbook122016/preview.png differ
diff --git a/MockupEngineer/templates/macbookair2020/config.ini b/MockupEngineer/templates/macbookair2020/config.ini
index 1363335..8834edb 100644
--- a/MockupEngineer/templates/macbookair2020/config.ini
+++ b/MockupEngineer/templates/macbookair2020/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 03.02.2022
 
diff --git a/MockupEngineer/templates/macbookair2020/preview.png b/MockupEngineer/templates/macbookair2020/preview.png
index 1978472..603e089 100644
Binary files a/MockupEngineer/templates/macbookair2020/preview.png and b/MockupEngineer/templates/macbookair2020/preview.png differ
diff --git a/MockupEngineer/templates/macbookpro132015/config.ini b/MockupEngineer/templates/macbookpro132015/config.ini
index 4f39eac..360573a 100644
--- a/MockupEngineer/templates/macbookpro132015/config.ini
+++ b/MockupEngineer/templates/macbookpro132015/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/macbookpro132015/preview.png b/MockupEngineer/templates/macbookpro132015/preview.png
index 1c87303..90d8fd2 100644
Binary files a/MockupEngineer/templates/macbookpro132015/preview.png and b/MockupEngineer/templates/macbookpro132015/preview.png differ
diff --git a/MockupEngineer/templates/macbookpro152015/config.ini b/MockupEngineer/templates/macbookpro152015/config.ini
index 4247d81..eadf6a8 100644
--- a/MockupEngineer/templates/macbookpro152015/config.ini
+++ b/MockupEngineer/templates/macbookpro152015/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/macbookpro152015/preview.png b/MockupEngineer/templates/macbookpro152015/preview.png
index db1310d..7e4be3a 100644
Binary files a/MockupEngineer/templates/macbookpro152015/preview.png and b/MockupEngineer/templates/macbookpro152015/preview.png differ
diff --git a/MockupEngineer/templates/macbookpro162019/config.ini b/MockupEngineer/templates/macbookpro162019/config.ini
index d894a71..a8eb6fe 100644
--- a/MockupEngineer/templates/macbookpro162019/config.ini
+++ b/MockupEngineer/templates/macbookpro162019/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/macbookpro162019/preview.png b/MockupEngineer/templates/macbookpro162019/preview.png
index 48d5cc5..32b096d 100644
Binary files a/MockupEngineer/templates/macbookpro162019/preview.png and b/MockupEngineer/templates/macbookpro162019/preview.png differ
diff --git a/MockupEngineer/templates/macbookpro162021/config.ini b/MockupEngineer/templates/macbookpro162021/config.ini
index 5e145fa..605f7f8 100644
--- a/MockupEngineer/templates/macbookpro162021/config.ini
+++ b/MockupEngineer/templates/macbookpro162021/config.ini
@@ -21,5 +21,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/macbookpro162021/preview.png b/MockupEngineer/templates/macbookpro162021/preview.png
index d1d3df4..a249899 100644
Binary files a/MockupEngineer/templates/macbookpro162021/preview.png and b/MockupEngineer/templates/macbookpro162021/preview.png differ
diff --git a/MockupEngineer/templates/pixel/config.ini b/MockupEngineer/templates/pixel/config.ini
index bc442a9..f3aac35 100644
--- a/MockupEngineer/templates/pixel/config.ini
+++ b/MockupEngineer/templates/pixel/config.ini
@@ -3,8 +3,8 @@ manufacturer = Google
 name = Pixel
 type = phone
 year = 2016
-width = 1080
-height = 1920
+width = 1920
+height = 1080
 
 [colors]
 quite black = black.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/pixel/preview.png b/MockupEngineer/templates/pixel/preview.png
index 339b9ac..f9203db 100644
Binary files a/MockupEngineer/templates/pixel/preview.png and b/MockupEngineer/templates/pixel/preview.png differ
diff --git a/MockupEngineer/templates/pixel4/config.ini b/MockupEngineer/templates/pixel4/config.ini
index 926e2a8..de9b76b 100644
--- a/MockupEngineer/templates/pixel4/config.ini
+++ b/MockupEngineer/templates/pixel4/config.ini
@@ -3,8 +3,8 @@ manufacturer = Google
 name = Pixel 4
 type = phone
 year = 2019
-width = 1080
-height = 2280
+width = 2280
+height = 1080
 
 [colors]
 just black = black.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/pixel4/preview.png b/MockupEngineer/templates/pixel4/preview.png
index 731b68d..576c568 100644
Binary files a/MockupEngineer/templates/pixel4/preview.png and b/MockupEngineer/templates/pixel4/preview.png differ
diff --git a/MockupEngineer/templates/pixel4xl/config.ini b/MockupEngineer/templates/pixel4xl/config.ini
index bcfa2db..f593e47 100644
--- a/MockupEngineer/templates/pixel4xl/config.ini
+++ b/MockupEngineer/templates/pixel4xl/config.ini
@@ -3,8 +3,8 @@ manufacturer = Google
 name = Pixel 4 XL
 type = phone
 year = 2019
-width = 1440
-height = 3040
+width = 3040
+height = 1440
 
 [colors]
 just black = black.png
@@ -22,5 +22,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/pixel4xl/preview.png b/MockupEngineer/templates/pixel4xl/preview.png
index b3e6392..d9f01c2 100644
Binary files a/MockupEngineer/templates/pixel4xl/preview.png and b/MockupEngineer/templates/pixel4xl/preview.png differ
diff --git a/MockupEngineer/templates/pixel5/config.ini b/MockupEngineer/templates/pixel5/config.ini
index 40397dc..6f30661 100644
--- a/MockupEngineer/templates/pixel5/config.ini
+++ b/MockupEngineer/templates/pixel5/config.ini
@@ -3,8 +3,8 @@ manufacturer = Google
 name = Pixel 5
 type = phone
 year = 2020
-width = 1080
-height = 2340
+width = 2340
+height = 1080
 
 [colors]
 just black = black.png
@@ -21,5 +21,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/pixel5/preview.png b/MockupEngineer/templates/pixel5/preview.png
index e77f0d8..eb82390 100644
Binary files a/MockupEngineer/templates/pixel5/preview.png and b/MockupEngineer/templates/pixel5/preview.png differ
diff --git a/MockupEngineer/templates/pixelbookgo/config.ini b/MockupEngineer/templates/pixelbookgo/config.ini
index aa51ea0..d56f5c7 100644
--- a/MockupEngineer/templates/pixelbookgo/config.ini
+++ b/MockupEngineer/templates/pixelbookgo/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/pixelbookgo/preview.png b/MockupEngineer/templates/pixelbookgo/preview.png
index 8699c7a..0d767c2 100644
Binary files a/MockupEngineer/templates/pixelbookgo/preview.png and b/MockupEngineer/templates/pixelbookgo/preview.png differ
diff --git a/MockupEngineer/templates/prodisplayxdr/config.ini b/MockupEngineer/templates/prodisplayxdr/config.ini
index ee2ecd1..dd3a4f3 100644
--- a/MockupEngineer/templates/prodisplayxdr/config.ini
+++ b/MockupEngineer/templates/prodisplayxdr/config.ini
@@ -20,5 +20,4 @@ rotate = false
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/prodisplayxdr/preview.png b/MockupEngineer/templates/prodisplayxdr/preview.png
index 73f3cc2..ea9fc26 100644
Binary files a/MockupEngineer/templates/prodisplayxdr/preview.png and b/MockupEngineer/templates/prodisplayxdr/preview.png differ
diff --git a/MockupEngineer/templates/surfacebook/config.ini b/MockupEngineer/templates/surfacebook/config.ini
new file mode 100644
index 0000000..c03d2b4
--- /dev/null
+++ b/MockupEngineer/templates/surfacebook/config.ini
@@ -0,0 +1,23 @@
+[info]
+manufacturer = Microsoft
+name = Surface Book
+type = pc
+year = 2015
+width = 3000
+height = 2000
+
+[colors]
+platinum = platinum.png
+
+[image]
+width = 1456
+height = 973
+x = 323
+y = 119
+mask = false
+rotate = false
+
+[about]
+author = ulbwa
+url = https://ulbwa.xyz
+
diff --git a/MockupEngineer/templates/surfacebook/platinum.png b/MockupEngineer/templates/surfacebook/platinum.png
new file mode 100644
index 0000000..660e9c5
Binary files /dev/null and b/MockupEngineer/templates/surfacebook/platinum.png differ
diff --git a/MockupEngineer/templates/surfacebook/preview.png b/MockupEngineer/templates/surfacebook/preview.png
new file mode 100644
index 0000000..a26f9f4
Binary files /dev/null and b/MockupEngineer/templates/surfacebook/preview.png differ
diff --git a/MockupEngineer/templates/surfacepro3/config.ini b/MockupEngineer/templates/surfacepro3/config.ini
new file mode 100644
index 0000000..238c24a
--- /dev/null
+++ b/MockupEngineer/templates/surfacepro3/config.ini
@@ -0,0 +1,23 @@
+[info]
+manufacturer = Microsoft
+name = Surface Pro 3
+type = tablet
+year = 2014
+width = 2160
+height = 1440
+
+[colors]
+platinum = platinum.png
+
+[image]
+width = 1664
+height = 1114
+x = 168
+y = 144
+mask = false
+rotate = true
+
+[about]
+author = ulbwa
+url = https://ulbwa.xyz
+
diff --git a/MockupEngineer/templates/surfacepro3/platinum.png b/MockupEngineer/templates/surfacepro3/platinum.png
new file mode 100644
index 0000000..cbdfd03
Binary files /dev/null and b/MockupEngineer/templates/surfacepro3/platinum.png differ
diff --git a/MockupEngineer/templates/surfacepro3/preview.png b/MockupEngineer/templates/surfacepro3/preview.png
new file mode 100644
index 0000000..b1ddd1e
Binary files /dev/null and b/MockupEngineer/templates/surfacepro3/preview.png differ
diff --git a/MockupEngineer/templates/surfacepro4/config.ini b/MockupEngineer/templates/surfacepro4/config.ini
new file mode 100644
index 0000000..06e08f2
--- /dev/null
+++ b/MockupEngineer/templates/surfacepro4/config.ini
@@ -0,0 +1,22 @@
+[info]
+manufacturer = Microsoft
+name = Surface Pro 4
+type = tablet
+year = 2015
+width = 2736
+height = 1824
+
+[colors]
+platinum = platinum.png
+
+[image]
+width = 1712
+height = 1144
+x = 144
+y = 124
+mask = false
+rotate = true
+
+[about]
+author = ulbwa
+url = https://ulbwa.xyz
diff --git a/MockupEngineer/templates/surfacepro4/platinum.png b/MockupEngineer/templates/surfacepro4/platinum.png
new file mode 100644
index 0000000..e31ad1a
Binary files /dev/null and b/MockupEngineer/templates/surfacepro4/platinum.png differ
diff --git a/MockupEngineer/templates/surfacepro4/preview.png b/MockupEngineer/templates/surfacepro4/preview.png
new file mode 100644
index 0000000..1fe50f4
Binary files /dev/null and b/MockupEngineer/templates/surfacepro4/preview.png differ
diff --git a/MockupEngineer/templates/watchseries644mm/config.ini b/MockupEngineer/templates/watchseries644mm/config.ini
index 3dbe229..55c42fa 100644
--- a/MockupEngineer/templates/watchseries644mm/config.ini
+++ b/MockupEngineer/templates/watchseries644mm/config.ini
@@ -3,8 +3,8 @@ manufacturer = Apple
 name = Watch Series 6 44mm
 type = wear
 year = 2020
-width = 368
-height = 448
+width = 448
+height = 368
 
 [colors]
 aluminum case - blue = blue_aluminum.png
@@ -29,5 +29,4 @@ rotate = true
 [about]
 author = ulbwa
 url = https://ulbwa.xyz
-created = 01.02.2022
 
diff --git a/MockupEngineer/templates/watchseries644mm/preview.png b/MockupEngineer/templates/watchseries644mm/preview.png
index 340fb18..3bdd320 100644
Binary files a/MockupEngineer/templates/watchseries644mm/preview.png and b/MockupEngineer/templates/watchseries644mm/preview.png differ
diff --git a/deploy.py b/deploy.py
index b7e0405..0882313 100644
--- a/deploy.py
+++ b/deploy.py
@@ -77,6 +77,6 @@ def run_pypi():
 
 if __name__ == '__main__':
     create_readme()
-    # create_examples()
+    create_examples()
     bump_version()
     run_pypi()
diff --git a/readme-template.md b/readme-template.md
index 88ff8b1..d3f1751 100644
--- a/readme-template.md
+++ b/readme-template.md
@@ -85,11 +85,8 @@ Full list of all currently supported mockups
 {% for a, b in templates.items() %}
 ### {{b.title}}
 {% for c in b.templates %}
-* [{{c.manufacturer}} {{c.name}}](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/{{os.path.basename(os.path.dirname(c.preview))}}/preview.png) ({{c.year}}) [{{c.resolution}}]   
-  * Author: [@{{c.about.author}}]({{c.about.url}}) [{{c.about.created}}]
-  * ID: `{{c.id}}`
-  * Colors:
-{% for d in c.colors %}  * * *{{d.color}}*
+* [{{c.manufacturer}} {{c.name}}](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/{{os.path.basename(os.path.dirname(c.preview))}}/preview.png) ({{c.year}}) [{{c.resolution}}] - `{{c.id}}`
+{% for d in c.colors %}  * *{{d.color}}*
 {% endfor %}{% endfor %}{% endfor %}
 You can help the project by adding support for new mockups by contributing on [GitHub](https://github.com/ulbwazhine/MockupEngineer).
 
diff --git a/readme.md b/readme.md
index af0bec4..6a9dc28 100644
--- a/readme.md
+++ b/readme.md
@@ -85,291 +85,198 @@ Full list of all currently supported mockups
 
 ### Phones
 
-* [Samsung Galaxy S20](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/galaxys20/preview.png) (2020) [1440 x 3200]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `84b30848f1af25c9a3bff6583bbbe75a`
-  * Colors:
-  * * *Cloud Blue*
-  * * *Cosmic Grey*
-  * * *Pink*
+* [Samsung Galaxy S20](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/galaxys20/preview.png) (2020) [3200 x 1440] - `8080d01d4bdd37843088986938af2ae0`
+  * *Cloud Blue*
+  * *Cosmic Grey*
+  * *Pink*
 
-* [Samsung Galaxy S20 Ultra](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/galaxys20ultra/preview.png) (2020) [1440 x 3200]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `c4168e005483c3579bef74898a4b0384`
-  * Colors:
-  * * *Cosmic Black*
-  * * *Cosmic Grey*
+* [Samsung Galaxy S20 Ultra](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/galaxys20ultra/preview.png) (2020) [3200 x 1440] - `86fa8df7653bb8559cfc49b8670b16bc`
+  * *Cosmic Black*
+  * *Cosmic Grey*
 
-* [Apple iPhone 12](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12/preview.png) (2020) [1170 x 2532]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `1648990cfee89db1d6cb744c998e783a`
-  * Colors:
-  * * *Black*
-  * * *Blue*
-  * * *Green*
-  * * *Product Red*
-  * * *White*
+* [Apple iPhone 12](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12/preview.png) (2020) [2532 x 1170] - `3596ecc24abae25279feddb34dd72a0e`
+  * *Black*
+  * *Blue*
+  * *Green*
+  * *Product Red*
+  * *White*
 
-* [Apple iPhone 12 Mini](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12mini/preview.png) (2020) [1080 x 2340]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `aea792f252c0ba0847741c0a4a6dd3ca`
-  * Colors:
-  * * *Black*
-  * * *Blue*
-  * * *Green*
-  * * *Product Red*
-  * * *White*
+* [Apple iPhone 12 Mini](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12mini/preview.png) (2020) [2340 x 1080] - `692048fda2b0b645f705066d522c12b8`
+  * *Black*
+  * *Blue*
+  * *Green*
+  * *Product Red*
+  * *White*
 
-* [Apple iPhone 12 Pro](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12pro/preview.png) (2020) [1170 x 2532]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `b25e4e76e2083e389761d3495a347e58`
-  * Colors:
-  * * *Gold*
-  * * *Graphite*
-  * * *Pacific Blue*
-  * * *Silver*
+* [Apple iPhone 12 Pro](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12pro/preview.png) (2020) [2532 x 1170] - `753cf086117da37d8c2e44e974880a94`
+  * *Gold*
+  * *Graphite*
+  * *Pacific Blue*
+  * *Silver*
 
-* [Apple iPhone 12 Pro Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12promax/preview.png) (2020) [1284 x 2778]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `658c22b16917a70e5e1703f300ef98fe`
-  * Colors:
-  * * *Gold*
-  * * *Graphite*
-  * * *Pacific Blue*
-  * * *Silver*
+* [Apple iPhone 12 Pro Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone12promax/preview.png) (2020) [2778 x 1284] - `5509eab3ac4c47315753b2e50faeb633`
+  * *Gold*
+  * *Graphite*
+  * *Pacific Blue*
+  * *Silver*
 
-* [Apple iPhone 13](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13/preview.png) (2021) [1170 x 2532]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [19.02.2022]
-  * ID: `e03132ca8b4b0483e9d8f4a1ec1be1f5`
-  * Colors:
-  * * *Blue*
-  * * *Midnight*
-  * * *Pink*
-  * * *Product Red*
-  * * *Starlight*
+* [Apple iPhone 13](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13/preview.png) (2021) [2532 x 1170] - `33f683bda9f3beb5d0ce8ae5ef9e7fc4`
+  * *Blue*
+  * *Midnight*
+  * *Pink*
+  * *Product Red*
+  * *Starlight*
 
-* [Apple iPhone 13 Mini](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13mini/preview.png) (2021) [1080 x 2340]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [19.02.2022]
-  * ID: `d0346fb29c4c3de9ff70953a7ae3bfee`
-  * Colors:
-  * * *Blue*
-  * * *Midnight*
-  * * *Pink*
-  * * *Product Red*
-  * * *Starlight*
+* [Apple iPhone 13 Mini](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13mini/preview.png) (2021) [2340 x 1080] - `09340db4628d41418a4ed472db07c60e`
+  * *Blue*
+  * *Midnight*
+  * *Pink*
+  * *Product Red*
+  * *Starlight*
 
-* [Apple iPhone 13 Pro](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13pro/preview.png) (2021) [1170 x 2532]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [19.02.2022]
-  * ID: `1c6f40f0490c7e0cf35de1c96af5c720`
-  * Colors:
-  * * *Gold*
-  * * *Graphite*
-  * * *Sierra Blue*
-  * * *Silver*
+* [Apple iPhone 13 Pro](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13pro/preview.png) (2021) [2532 x 1170] - `f0247d613f7d390cfb3362fd7242e515`
+  * *Gold*
+  * *Graphite*
+  * *Sierra Blue*
+  * *Silver*
 
-* [Apple iPhone 13 Pro Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13promax/preview.png) (2021) [1284 x 2778]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [19.02.2022]
-  * ID: `edc57edf104fdba42fdf935986b09ab8`
-  * Colors:
-  * * *Gold*
-  * * *Graphite*
-  * * *Sierra Blue*
-  * * *Silver*
+* [Apple iPhone 13 Pro Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphone13promax/preview.png) (2021) [2778 x 1284] - `d95345535d98fcc6f4030e1d3ca62052`
+  * *Gold*
+  * *Graphite*
+  * *Sierra Blue*
+  * *Silver*
 
-* [Apple iPhone SE](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonese2020/preview.png) (2020) [750 x 1334]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `7ed0bde8cf28335afb6bf7e8fc90806b`
-  * Colors:
-  * * *Black*
-  * * *Product Red*
-  * * *White*
+* [Apple iPhone SE](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonese2020/preview.png) (2020) [1334 x 750] - `553673b4367e8ebf59067d764b45e9fd`
+  * *Black*
+  * *Product Red*
+  * *White*
 
-* [Apple iPhone Xr](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexr/preview.png) (2018) [828 x 1792]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `5213bfd57a03c81ad4dc702952810ee6`
-  * Colors:
-  * * *Blue*
-  * * *Coral*
-  * * *Product Red*
-  * * *Silver*
-  * * *Space Gray*
-  * * *Yellow*
+* [Apple iPhone Xr](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexr/preview.png) (2018) [1792 x 828] - `6ccede90e5879fd87f85cfb2039247b3`
+  * *Blue*
+  * *Coral*
+  * *Product Red*
+  * *Silver*
+  * *Space Gray*
+  * *Yellow*
 
-* [Apple iPhone Xs](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexs/preview.png) (2019) [1125 x 2436]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `4b17c9428565db596f647b448656b744`
-  * Colors:
-  * * *Gold*
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPhone Xs](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexs/preview.png) (2019) [2436 x 1125] - `f4128697b9cb1963cc4d14727872fa44`
+  * *Gold*
+  * *Silver*
+  * *Space Gray*
 
-* [Apple iPhone Xs Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexsmax/preview.png) (2019) [1242 x 2688]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `2c9c1c6b8c0b598fe1c1aca4c1f334f8`
-  * Colors:
-  * * *Gold*
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPhone Xs Max](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/iphonexsmax/preview.png) (2019) [2688 x 1242] - `16ebf01c894fb468c05a1b7c3e395d47`
+  * *Gold*
+  * *Silver*
+  * *Space Gray*
 
-* [Google Pixel](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel/preview.png) (2016) [1080 x 1920]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `ede34489f377fcc7852a326dd79c2550`
-  * Colors:
-  * * *Quite Black*
-  * * *Really Blue*
-  * * *Very Silver*
+* [Google Pixel](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel/preview.png) (2016) [1920 x 1080] - `c7076ff96733f11e2cd8179fc2d5e7a4`
+  * *Quite Black*
+  * *Really Blue*
+  * *Very Silver*
 
-* [Google Pixel 4](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel4/preview.png) (2019) [1080 x 2280]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `673398cd2adaadd60506fb0140b83ab9`
-  * Colors:
-  * * *Just Black*
-  * * *Clearly White*
-  * * *Oh So Orange*
+* [Google Pixel 4](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel4/preview.png) (2019) [2280 x 1080] - `3bfff2be23c2c354403f5a622a804f64`
+  * *Just Black*
+  * *Clearly White*
+  * *Oh So Orange*
 
-* [Google Pixel 4 XL](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel4xl/preview.png) (2019) [1440 x 3040]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `c55e7641f3ba76d7b777281b0ba4aa87`
-  * Colors:
-  * * *Just Black*
-  * * *Clearly White*
-  * * *Oh So Orange*
+* [Google Pixel 4 XL](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel4xl/preview.png) (2019) [3040 x 1440] - `7b0762b034f6c29f2c77a66bb388f59e`
+  * *Just Black*
+  * *Clearly White*
+  * *Oh So Orange*
 
-* [Google Pixel 5](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel5/preview.png) (2020) [1080 x 2340]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `870266635f047a49c2eae83f7d46e26e`
-  * Colors:
-  * * *Just Black*
-  * * *Sorta Sage*
+* [Google Pixel 5](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixel5/preview.png) (2020) [2340 x 1080] - `2707894cc5d336d0ba276e6306e9f001`
+  * *Just Black*
+  * *Sorta Sage*
 
 ### Computers
 
-* [Apple iMac 21"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac212015/preview.png) (2015) [4096 x 2304]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `385eb0911d0edb6821c18a2193bdadaf`
-  * Colors:
-  * * *Silver*
+* [Apple iMac 21"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac212015/preview.png) (2015) [4096 x 2304] - `71165ffd80a5db69ecd26e2e05ee1355`
+  * *Silver*
 
-* [Apple iMac 24"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac242021/preview.png) (2021) [4480 x 2520]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [03.02.2022]
-  * ID: `40a349f85ca132c2d6c1444db0be9561`
-  * Colors:
-  * * *Green*
-  * * *Yellow*
-  * * *Orange*
-  * * *Pink*
-  * * *Purple*
-  * * *Blue*
-  * * *Silver*
+* [Apple iMac 24"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac242021/preview.png) (2021) [4480 x 2520] - `808f7bc509565fb4bdaab7c7b5485a68`
+  * *Green*
+  * *Yellow*
+  * *Orange*
+  * *Pink*
+  * *Purple*
+  * *Blue*
+  * *Silver*
 
-* [Apple MacBook 12"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbook122016/preview.png) (2016) [2304 x 1440]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `f74ec99f02ed5fafbe1cb1767763ed91`
-  * Colors:
-  * * *Space Gray*
-  * * *Gold*
+* [Apple MacBook 12"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbook122016/preview.png) (2016) [2304 x 1440] - `4724b1349442f7fdaa60216d31cbd6a8`
+  * *Space Gray*
+  * *Gold*
 
-* [Apple MacBook Air (M1)](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookair2020/preview.png) (2020) [2560 x 1600]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [03.02.2022]
-  * ID: `1f3fe3fec5b92861b7958bc75f40fe95`
-  * Colors:
-  * * *Silver*
+* [Apple MacBook Air (M1)](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookair2020/preview.png) (2020) [2560 x 1600] - `d930de4882bee944ff19da75a4b6ee9f`
+  * *Silver*
 
-* [Apple MacBook Pro 13"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro132015/preview.png) (2015) [2560 x 1600]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `2f15fb3eb0dde3b76771f3090c6ddbb6`
-  * Colors:
-  * * *Silver*
+* [Apple MacBook Pro 13"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro132015/preview.png) (2015) [2560 x 1600] - `670487e7eaab6353af7f151f1da8622e`
+  * *Silver*
 
-* [Apple MacBook Pro 15"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro152015/preview.png) (2015) [2880 x 1800]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `ba492b242a78b7f49caa41f61b5b3418`
-  * Colors:
-  * * *Silver*
+* [Apple MacBook Pro 15"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro152015/preview.png) (2015) [2880 x 1800] - `4b33ac1e5b863a6b67f684d3e73a9796`
+  * *Silver*
 
-* [Apple MacBook Pro 16"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro162019/preview.png) (2019) [3072 x 1920]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `0bfe5c7d2a8a4e5398090c3027791ed1`
-  * Colors:
-  * * *Space Gray*
+* [Apple MacBook Pro 16"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro162019/preview.png) (2019) [3072 x 1920] - `ce29763748dd896d6db09f94c626ca4d`
+  * *Space Gray*
 
-* [Apple MacBook Pro 16"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro162021/preview.png) (2021) [3456 x 2234]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `80467845e71272f0d8d2bd13490a73f3`
-  * Colors:
-  * * *Silver*
-  * * *Space Gray*
+* [Apple MacBook Pro 16"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro162021/preview.png) (2021) [3456 x 2234] - `75da9011a54ecd48e3da2c20e2c8afd0`
+  * *Silver*
+  * *Space Gray*
 
-* [Google Pixelbook Go](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixelbookgo/preview.png) (2019) [1920 x 1080]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `6911ed9934b1c877a0b01c3750c2b79e`
-  * Colors:
-  * * *Just Black*
+* [Google Pixelbook Go](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/pixelbookgo/preview.png) (2019) [1920 x 1080] - `c6ef98219e013c1dca8480b3dba14caa`
+  * *Just Black*
 
-* [Apple Pro Display XDR](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/prodisplayxdr/preview.png) (2019) [6016 x 3384]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `8b728f1faab0389874db4bb0ae6244e5`
-  * Colors:
-  * * *Silver*
+* [Apple Pro Display XDR](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/prodisplayxdr/preview.png) (2019) [6016 x 3384] - `148a8f19517b4359cfe9db9092bb85a1`
+  * *Silver*
+
+* [Microsoft Surface Book](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/surfacebook/preview.png) (2015) [3000 x 2000] - `08816799dd7ebd63a9fe2e5a46f8b69c`
+  * *Platinum*
 
 ### Tablets
 
-* [Apple iPad 9](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipad9/preview.png) (2021) [2160 x 1620]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `9c1f043b21ef803bd467135b83105f0b`
-  * Colors:
-  * * *Gold*
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPad 9](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipad9/preview.png) (2021) [2160 x 1620] - `347347da85ed8817ecd8eefd8fe22a0e`
+  * *Gold*
+  * *Silver*
+  * *Space Gray*
 
-* [Apple iPad Air 4](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadair4/preview.png) (2020) [2360 x 1640]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `569262bc590b30cfb296471c3c8a4af8`
-  * Colors:
-  * * *Green*
-  * * *Rose Gold*
-  * * *Silver*
-  * * *Sky Blue*
-  * * *Space Gray*
+* [Apple iPad Air 4](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadair4/preview.png) (2020) [2360 x 1640] - `9a644764f99ccbe46753de8516e053fe`
+  * *Green*
+  * *Rose Gold*
+  * *Silver*
+  * *Sky Blue*
+  * *Space Gray*
 
-* [Apple iPad Mini 5](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadmini5/preview.png) (2021) [2048 x 1536]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `7a8b3c603fe34817d9233e5b6afed174`
-  * Colors:
-  * * *Gold*
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPad Mini 5](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadmini5/preview.png) (2021) [2048 x 1536] - `d8e92692708b63e444300f3b6dfacc6f`
+  * *Gold*
+  * *Silver*
+  * *Space Gray*
 
-* [Apple iPad Pro 4 11"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadpro114/preview.png) (2020) [2388 x 1668]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `e47f6e3bb880a034866f59f97f612abe`
-  * Colors:
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPad Pro 4 11"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadpro114/preview.png) (2020) [2388 x 1668] - `a80a78a3f7492bb5d460c59de173bc88`
+  * *Silver*
+  * *Space Gray*
 
-* [Apple iPad Pro 4 12.9"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadpro134/preview.png) (2020) [2732 x 2048]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [31.01.2022]
-  * ID: `9a85db6aeb1d45c896daff67af785936`
-  * Colors:
-  * * *Silver*
-  * * *Space Gray*
+* [Apple iPad Pro 4 12.9"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipadpro134/preview.png) (2020) [2732 x 2048] - `198018d62640d23de5ae4e3e6cbc5fd0`
+  * *Silver*
+  * *Space Gray*
+
+* [Microsoft Surface Pro 3](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/surfacepro3/preview.png) (2014) [2160 x 1440] - `d250f0d3f84dd0b972c152ee592fbc3a`
+  * *Platinum*
+
+* [Microsoft Surface Pro 4](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/surfacepro4/preview.png) (2015) [2736 x 1824] - `604015046fcf51f1a264bb0333269f80`
+  * *Platinum*
 
 ### Wearable devices
 
-* [Apple Watch Series 6 44mm](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/watchseries644mm/preview.png) (2020) [368 x 448]   
-  * Author: [@ulbwa](https://ulbwa.xyz) [01.02.2022]
-  * ID: `e055638cf7325a856ed0369dc8d0dcb1`
-  * Colors:
-  * * *Aluminum Case - Blue*
-  * * *Aluminum Case - Gold*
-  * * *Aluminum Case - Space Gray*
-  * * *Aluminum Case - Silver*
-  * * *Aluminum Case - Product Red*
-  * * *Titanium Case - Light*
-  * * *Titanium Case - Dark*
-  * * *Stainless Steel Case - Gold*
-  * * *Stainless Steel Case - Graphite*
-  * * *Stainless Steel Case - Silver*
+* [Apple Watch Series 6 44mm](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/watchseries644mm/preview.png) (2020) [448 x 368] - `085a3fafbdec1f728aed9882adc2c5b0`
+  * *Aluminum Case - Blue*
+  * *Aluminum Case - Gold*
+  * *Aluminum Case - Space Gray*
+  * *Aluminum Case - Silver*
+  * *Aluminum Case - Product Red*
+  * *Titanium Case - Light*
+  * *Titanium Case - Dark*
+  * *Stainless Steel Case - Gold*
+  * *Stainless Steel Case - Graphite*
+  * *Stainless Steel Case - Silver*
 
 You can help the project by adding support for new mockups by contributing on [GitHub](https://github.com/ulbwazhine/MockupEngineer).
 
diff --git a/setup.py b/setup.py
index 2777b63..c9266bf 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='MockupEngineer',
-    version='2022.02.21.8',
+    version='2022.02.24.1',
     packages=find_packages(),
     url='https://github.com/ulbwazhine/MockupEngineer',
     license='MIT',