diff --git a/Artify/Artify.xcodeproj/project.pbxproj b/Artify/Artify.xcodeproj/project.pbxproj
index 3506942..7a57685 100644
--- a/Artify/Artify.xcodeproj/project.pbxproj
+++ b/Artify/Artify.xcodeproj/project.pbxproj
@@ -389,7 +389,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/../Pods/Target Support Files/Pods-Artify/Pods-Artify-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Artify/Pods-Artify-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Action/Action.framework",
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
@@ -422,7 +422,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Artify/Pods-Artify-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Artify/Pods-Artify-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		BAC0B76320C1894E00FF4FDF /* Fabric */ = {
@@ -538,7 +538,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -592,7 +592,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -608,7 +608,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/Action\"",
@@ -630,7 +630,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.art.Artify;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -647,7 +647,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/Action\"",
@@ -669,7 +669,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DPRODUCTION";
 				PRODUCT_BUNDLE_IDENTIFIER = com.art.Artify;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -685,6 +685,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = ArtifyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -705,6 +706,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = ArtifyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
index 6c9c9b0..7844a51 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
index 7c67995..3632533 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
index 0c67898..600b2d6 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Info/Info.plist b/Artify/Artify/Resources/Info/Info.plist
index 7efdd47..d6d0f7d 100644
--- a/Artify/Artify/Resources/Info/Info.plist
+++ b/Artify/Artify/Resources/Info/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8</string>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>900</string>
+	<string>1000</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard b/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
index 138af0a..7f856cf 100644
--- a/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
+++ b/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -688,7 +686,7 @@
             <objects>
                 <customObject id="n55-FE-Pbo" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <windowController storyboardIdentifier="AboutWindowController" id="BoU-bI-MRc" sceneMemberID="viewController">
-                    <window key="window" title="About Artify" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" showsToolbarButton="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="0j7-1n-gVt">
+                    <window key="window" title="About Artify" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="0j7-1n-gVt">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="478" y="552" width="510" height="278"/>
@@ -713,14 +711,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <box horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" boxType="custom" borderType="none" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Evb-YZ-M3L">
-                                <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
-                                <view key="contentView" id="RCt-PB-bCQ">
-                                    <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                </view>
-                                <color key="fillColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </box>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FjZ-51-4oe">
                                 <rect key="frame" x="36" y="76" width="128" height="128"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="about" id="LyL-Ff-PBV"/>
@@ -729,7 +719,7 @@
                                 <rect key="frame" x="198" y="205" width="148" height="57"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="ARTIFY" id="cn1-G1-Q2m">
                                     <font key="font" metaFont="systemThin" size="48"/>
-                                    <color key="textColor" red="0.14901960780000001" green="0.14901960780000001" blue="0.14901960780000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -737,7 +727,7 @@
                                 <rect key="frame" x="198" y="188" width="108" height="17"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Version 0.4 (500)" id="Cv4-Sk-4HJ">
                                     <font key="font" metaFont="systemLight" size="13"/>
-                                    <color key="textColor" white="0.25" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -745,7 +735,7 @@
                                 <rect key="frame" x="198" y="155" width="98" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Developed by" id="JAC-J6-aoH">
                                     <font key="font" metaFont="system" size="15"/>
-                                    <color key="textColor" white="0.14999999999999999" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -753,7 +743,7 @@
                                 <rect key="frame" x="198" y="122" width="137" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Wanna contribute ?" id="HFb-ta-86o">
                                     <font key="font" metaFont="system" size="15"/>
-                                    <color key="textColor" white="0.14999999999999999" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -762,12 +752,12 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="github" id="H5b-Ew-J2z"/>
                             </imageView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Svq-l2-not">
-                                <rect key="frame" x="382" y="67" width="114" height="43"/>
+                                <rect key="frame" x="367" y="72" width="112" height="35"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="73a-Xd-WHm"/>
-                                    <constraint firstAttribute="height" constant="38" id="LmU-a9-kZp"/>
+                                    <constraint firstAttribute="height" constant="32" id="LmU-a9-kZp"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="Artify Core" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k5Z-Kc-Td6">
+                                <buttonCell key="cell" type="squareTextured" title="Artify Core" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k5Z-Kc-Td6">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -776,12 +766,12 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bRp-wG-Ypx">
-                                <rect key="frame" x="260" y="67" width="114" height="43"/>
+                                <rect key="frame" x="261" y="72" width="96" height="35"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="Pd4-cJ-xst"/>
-                                    <constraint firstAttribute="height" constant="38" id="m8H-H8-2mS"/>
+                                    <constraint firstAttribute="width" constant="94" id="5Yy-jl-Kz7"/>
+                                    <constraint firstAttribute="height" constant="32" id="VJk-BK-wiU"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="Artify macOS" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LpC-oz-2bx">
+                                <buttonCell key="cell" type="squareTextured" title="Artify macOS" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LpC-oz-2bx">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -798,12 +788,12 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="link" id="eRh-Fz-uhp"/>
                             </imageView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3U1-Ss-zVL">
-                                <rect key="frame" x="260" y="18" width="114" height="43"/>
+                                <rect key="frame" x="261" y="22" width="96" height="35"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="38" id="GJp-J0-7GK"/>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="nal-X2-ZGg"/>
+                                    <constraint firstAttribute="height" constant="32" id="GJp-J0-7GK"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="94" id="nal-X2-ZGg"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="nghiatran.me" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G0L-aA-c0z">
+                                <buttonCell key="cell" type="squareTextured" title="nghiatran.me" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G0L-aA-c0z">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -815,7 +805,7 @@
                                 <rect key="frame" x="296" y="155" width="96" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="NGHIA TRAN" id="Vzt-rF-NdM">
                                     <font key="font" metaFont="systemMedium" size="15"/>
-                                    <color key="textColor" white="0.14628906250000001" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -825,7 +815,7 @@
                                     <constraint firstAttribute="height" constant="24" id="MdE-Jo-68F"/>
                                     <constraint firstAttribute="width" constant="24" id="bs1-cz-ri3"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="github_logo" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="tGa-BE-9iX">
+                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="github_logo" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="tGa-BE-9iX">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -837,16 +827,13 @@
                         <constraints>
                             <constraint firstItem="Tjo-6I-Wra" firstAttribute="leading" secondItem="Z6h-12-uxG" secondAttribute="trailing" constant="8" id="1et-Nm-U9m"/>
                             <constraint firstItem="klj-F7-bpM" firstAttribute="leading" secondItem="FjZ-51-4oe" secondAttribute="trailing" constant="36" id="1ua-mH-dq3"/>
-                            <constraint firstAttribute="trailing" secondItem="Evb-YZ-M3L" secondAttribute="trailing" id="2La-A5-kc5"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JU0-xk-5XQ" secondAttribute="trailing" constant="24" id="3hJ-OC-itP"/>
                             <constraint firstItem="kni-Z9-ma5" firstAttribute="leading" secondItem="klj-F7-bpM" secondAttribute="leading" id="5cI-p8-gZi"/>
                             <constraint firstItem="bRp-wG-Ypx" firstAttribute="leading" secondItem="UIX-Cq-C9l" secondAttribute="trailing" constant="12" id="BeZ-VQ-a9Y"/>
                             <constraint firstItem="JU0-xk-5XQ" firstAttribute="leading" secondItem="JMK-uR-fYw" secondAttribute="leading" id="Fv9-uR-X7E"/>
                             <constraint firstItem="tWs-Gm-mJ4" firstAttribute="top" secondItem="UIX-Cq-C9l" secondAttribute="bottom" constant="28" id="G5q-wZ-uvQ"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Svq-l2-not" secondAttribute="trailing" constant="24" id="G6X-mj-xRB"/>
-                            <constraint firstItem="Evb-YZ-M3L" firstAttribute="top" secondItem="aZ6-qO-1F8" secondAttribute="top" id="GRX-NP-coU"/>
                             <constraint firstItem="JU0-xk-5XQ" firstAttribute="top" secondItem="JMK-uR-fYw" secondAttribute="bottom" constant="14" id="HY6-jh-bzW"/>
-                            <constraint firstAttribute="bottom" secondItem="Evb-YZ-M3L" secondAttribute="bottom" id="ORb-pn-utw"/>
                             <constraint firstItem="tWs-Gm-mJ4" firstAttribute="centerX" secondItem="UIX-Cq-C9l" secondAttribute="centerX" id="Oua-1y-Ckl"/>
                             <constraint firstItem="Svq-l2-not" firstAttribute="centerY" secondItem="bRp-wG-Ypx" secondAttribute="centerY" id="RHS-99-hhG"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="3U1-Ss-zVL" secondAttribute="trailing" constant="24" id="UKE-Sh-1FX"/>
@@ -859,7 +846,6 @@
                             <constraint firstItem="klj-F7-bpM" firstAttribute="top" secondItem="aZ6-qO-1F8" secondAttribute="top" constant="18" id="bcf-Wd-69r"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z6h-12-uxG" secondAttribute="trailing" constant="24" id="d0i-SS-JM3"/>
                             <constraint firstItem="UIX-Cq-C9l" firstAttribute="top" secondItem="JU0-xk-5XQ" secondAttribute="bottom" constant="22" id="eN5-LM-325"/>
-                            <constraint firstItem="Evb-YZ-M3L" firstAttribute="leading" secondItem="aZ6-qO-1F8" secondAttribute="leading" id="evb-CF-f6Y"/>
                             <constraint firstItem="UIX-Cq-C9l" firstAttribute="leading" secondItem="JU0-xk-5XQ" secondAttribute="leading" id="fNC-xT-gkC"/>
                             <constraint firstItem="3U1-Ss-zVL" firstAttribute="centerY" secondItem="tWs-Gm-mJ4" secondAttribute="centerY" id="pYF-NG-ZEa"/>
                             <constraint firstItem="kni-Z9-ma5" firstAttribute="top" secondItem="klj-F7-bpM" secondAttribute="bottom" id="s68-aR-Sxe"/>
diff --git a/Artify/Artify/Source/Scenes/About/AboutWindowController.swift b/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
index 2df3bf6..e1530b0 100644
--- a/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
+++ b/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
@@ -9,7 +9,7 @@
 import Cocoa
 import artify_core
 
-class AboutWindowController: NSViewController {
+final class AboutWindowController: NSViewController {
 
     @IBOutlet weak var verionLbl: NSTextField!
 
diff --git a/Artify/Artify/Source/Services/FabricTracker.swift b/Artify/Artify/Source/Services/FabricTracker.swift
index 647d894..a2ea961 100644
--- a/Artify/Artify/Source/Services/FabricTracker.swift
+++ b/Artify/Artify/Source/Services/FabricTracker.swift
@@ -21,6 +21,8 @@ final class FabricTracker: Trackable {
             Answers.logCustomEvent(withName: type.methodName, customAttributes: nil)
         case .fetchFeaturePhoto(let param):
             Answers.logCustomEvent(withName: type.methodName, customAttributes: param.toAttribute())
+        case .fetchRandomPhoto(let param):
+            Answers.logCustomEvent(withName: type.methodName, customAttributes: param.toAttribute())
         case .launchOnStartup(let param):
             Answers.logCustomEvent(withName: type.methodName, customAttributes: param.toAttribute())
         case .setWallapper(let param):
diff --git a/Gemfile b/Gemfile
index eff7af6..b3902ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem 'cocoapods'
+gem 'cocoapods', '1.6.0'
 gem 'slather'
 gem 'xcpretty'
+gem "nokogiri", ">= 1.8.5"
diff --git a/Gemfile.lock b/Gemfile.lock
index ba6b726..83e841d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,66 +2,66 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.6)
-    activesupport (4.2.10)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
     clamp (0.6.5)
-    cocoapods (1.5.2)
+    cocoapods (1.6.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.2)
+      cocoapods-core (= 1.6.0)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.2)
+      ruby-macho (~> 1.3, >= 1.3.1)
+      xcodeproj (>= 1.8.0, < 2.0)
+    cocoapods-core (1.6.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-deintegrate (1.0.3)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    molinillo (0.6.5)
-    nanaimo (0.2.5)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     rouge (2.0.7)
-    ruby-macho (1.1.0)
-    slather (2.4.5)
+    ruby-macho (1.4.0)
+    slather (2.4.6)
       CFPropertyList (~> 2.2)
       activesupport (>= 4.0.2)
       clamp (~> 0.6)
@@ -70,22 +70,23 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.9)
+    xcodeproj (1.8.1)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.5)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.6.0)
+  nokogiri (>= 1.8.5)
   slather
   xcpretty
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/Podfile.lock b/Podfile.lock
index f1f1a17..f809ddf 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -67,4 +67,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9ce4a1ee1d86724f94f8bcf6f0760c78e87a8124
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0
diff --git a/README.md b/README.md
index e9f3680..ffc01b4 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ After starting the development server.
 * **Is it a original idea?**
 
 > Nowadays, Almost idea is mixing. The original idea was inspired by a guy in HN-Show I've seen in a couple months ago. It's just a tool to generate a photo after dragging manually my original picture. It has lack of capability.
-
+>
 > I'm a lazy guy, I'd something could do it automatically every time. Ultimately, I came up with this idea.
 
 * **Where is the Backend side?**
@@ -96,7 +96,7 @@ After starting the development server.
 * **Why do you choose RxSwift + MVVM?**
 
 > I have solid experience when working with RxSwift + MVVM for a couple projects on Production. I'm so happy when writing concise, elegant Observable, Driver,... rather than clumsy functions with tons of nested-callbacks.
-
+>
 > If something makes me happy, I will follow it. Simple enough 😂
 
 * **Is this app built with Swift?**
@@ -106,45 +106,44 @@ After starting the development server.
 * **Why is it an OSS?**
 
 > The source code is a trash if keep it in your inventory forever. I'd contribute back to the dev community when I have an opportunity.
-
+>
 > The best way is publishing your source code 👨‍💻.
 
 * **Why is 18th century art?**
 
 > Every time I have a short trip to an overseas country, I often spent 1 or 2 days to visit all famous art museum. I could stand for an hour to look at the detail, the scrape from those old oil photo. Individual traits could represent the history, the effort, the dream from original authors.
-
+>
 > I realize I fall in love with the 18th art somehow 🤣
-
+>
 > Then I come up with the idea, why don't we bring it to everybody, who has the same passion as me.
-
-> Let imagine, every day, when I open my laptop at 9 AM, I can see the best photo of this day, with detail information, history, and the author.
-That would be amazing 😱
-
+>
+> Let imagine, every day, when I open my laptop at 9 AM, I can see the best photo of this day, with detail information, history, and the author. That would be amazing 😱
+>
 > Without considering, I start to develop the macOS app as well as the [Artify-Core](https://github.com/NghiaTranUIT/artify-core), which is written by Golang.
-
+>
 > All of the art pictures will be hand-picked by me and my best girlfriend. Hope you enjoy it 😍
 
 * **How does Artify generate the beautify wallpaper?**
 
 > **[DR;TL]**
-
+>
 > 1. Determine the golden size, which relies on your current screen size. It makes sure every generated wallpaper is as nice as possible.
 > 2. Draw this image with the desired size in the middle
 > 3. Draw shadow
 > 4. Scale the background with "aspect to fill" mode
 > 5. Apply Gaussian algorithm
 > 6. Combine everything and cached locally.
-
+>
 > **[Detail implementation]**
-
+>
 > Here is the [algorithm](https://github.com/NghiaTranUIT/artify-macos/blob/master/artify-core/artify-core/Algorithm/Gaussian/GaussianAlgorithm.swift)
 
 * **Where does the Artify's resource come from?**
 
 > Every art pictures are hand-picked from [WikiArt](https://www.wikiart.org).
-
+>
 > If you wonder how I collect the data. Here is my partner, [Spider Man](https://github.com/NghiaTranUIT/artify-core/blob/master/scripts/spider.ruby), which is a Ruby script.
-
+>
 > The conjunction of [Nokogiri](http://www.nokogiri.org) and [Watir](http://watir.com) are perfect for this scenario. Indeed,I'm a lazy man, I don't want to collect data like a manual labor 😅.
 
 * **What are the tough problems, which you confronts when developing this project?**
@@ -156,7 +155,8 @@ That would be amazing 😱
 > Defintely, I appreciate your effort to become a contributor. Clone the project and setup your workspace. Happy coding guys 🚢
 
 * **Do you have personal blog?**
-> Yes, I often write blog at [My lab](www.nghiatran.me) 👨‍🍳
+
+> Yes, I often write blog at [My lab](https://nghiatran.me/) 👨‍🍳
 
 * **How do I contact you?**
 
diff --git a/artify-core/artify-core.xcodeproj/project.pbxproj b/artify-core/artify-core.xcodeproj/project.pbxproj
index d4ba173..012947d 100644
--- a/artify-core/artify-core.xcodeproj/project.pbxproj
+++ b/artify-core/artify-core.xcodeproj/project.pbxproj
@@ -717,7 +717,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -733,7 +733,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.art.artify-core";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -754,7 +754,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -770,7 +770,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.art.artify-core";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -786,6 +786,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = "artify-coreTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -804,6 +805,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = "artify-coreTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/artify-core/artify-core/Constants/Environment.swift b/artify-core/artify-core/Constants/Environment.swift
index 7107960..7a26445 100644
--- a/artify-core/artify-core/Constants/Environment.swift
+++ b/artify-core/artify-core/Constants/Environment.swift
@@ -22,7 +22,7 @@ public struct Environment {
         case .sandbox:
             return "http://0.0.0.0:7300"
         case .production:
-            return "https://www.megaton.xyz"
+            return "https://api.proxyman.app"
         }
     }
 }
diff --git a/artify-core/artify-core/Models/Menu.swift b/artify-core/artify-core/Models/Menu.swift
index 77f7d8c..25029c3 100644
--- a/artify-core/artify-core/Models/Menu.swift
+++ b/artify-core/artify-core/Models/Menu.swift
@@ -12,6 +12,7 @@ public struct Menu {
 
     public enum Kind {
         case getFeature
+        case random
         case separator
         case aboutThisPhoto
         case launchOnStartup
@@ -42,6 +43,8 @@ public struct Menu {
             return "About"
         case .aboutThisPhoto:
             return "About this Art"
+        case .random:
+            return "Randomize"
         }
     }
 
diff --git a/artify-core/artify-core/Services/ArtifyCoreAPI.swift b/artify-core/artify-core/Services/ArtifyCoreAPI.swift
index 4b310ee..e288725 100644
--- a/artify-core/artify-core/Services/ArtifyCoreAPI.swift
+++ b/artify-core/artify-core/Services/ArtifyCoreAPI.swift
@@ -12,6 +12,7 @@ import Alamofire
 
 enum ArtifyCoreAPI {
     case getFeature
+    case randomPhoto
     case checkUpdate(AppInfo)
 }
 
@@ -24,6 +25,8 @@ extension ArtifyCoreAPI: TargetType {
         switch self {
         case .getFeature:
             return "feature/today"
+        case .randomPhoto:
+            return "feature/random"
         case .checkUpdate:
             return "version/update"
         }
@@ -31,6 +34,8 @@ extension ArtifyCoreAPI: TargetType {
 
     var method: Moya.Method {
         switch self {
+        case .randomPhoto:
+            fallthrough
         case .checkUpdate:
             fallthrough
         case .getFeature:
diff --git a/artify-core/artify-core/Services/DownloadService.swift b/artify-core/artify-core/Services/DownloadService.swift
index 651010b..cc1b591 100644
--- a/artify-core/artify-core/Services/DownloadService.swift
+++ b/artify-core/artify-core/Services/DownloadService.swift
@@ -15,6 +15,7 @@ import Nuke
 protocol DownloadServiceType {
 
     func downloadFeaturePhoto() -> Observable<DownloadPayload>
+    func downloadRandomPhoto() -> Observable<DownloadPayload>
 }
 
 final class DownloadService: DownloadServiceType {
@@ -41,6 +42,18 @@ final class DownloadService: DownloadServiceType {
         return self
             .network
             .fetchFeaturePhoto()
+            .flatMapLatest { self.downloadAndSavePhoto($0) }
+    }
+
+    func downloadRandomPhoto() -> Observable<DownloadPayload> {
+        return self
+            .network
+            .fetchRandomPhoto()
+            .flatMapLatest { self.downloadAndSavePhoto($0) }
+    }
+
+    private func downloadAndSavePhoto(_ photo: Photo) -> Observable<DownloadPayload> {
+        return Observable.just(photo)
             .flatMapLatest {[unowned self] (photo) -> Single<FilePayload> in
                 let imageRequest = ImageRequest(url: URL(string: photo.imageURL)!)
                 return self.imagePipline
@@ -51,7 +64,6 @@ final class DownloadService: DownloadServiceType {
                 return self.fileHandler
                     .rx_saveImageIfNeed(payload)
                     .map { DownloadPayload(photo: payload.photo, fileUrl: $0) }
-            }
+        }
     }
 }
-
diff --git a/artify-core/artify-core/Services/NetworkService.swift b/artify-core/artify-core/Services/NetworkService.swift
index 8fe54e3..8458452 100644
--- a/artify-core/artify-core/Services/NetworkService.swift
+++ b/artify-core/artify-core/Services/NetworkService.swift
@@ -14,6 +14,7 @@ protocol NetworkingServiceType {
 
     var provider: MoyaProvider<ArtifyCoreAPI> { get }
     func fetchFeaturePhoto() -> Observable<Photo>
+    func fetchRandomPhoto() -> Observable<Photo>
 }
 
 
@@ -43,6 +44,19 @@ final class NetworkingService: NetworkingServiceType {
                 TrackingService.default.tracking(.fetchFeaturePhoto(FetchFeaturePhotoParam(isSuccess: false, error: error)))
             })
     }
+
+    func fetchRandomPhoto() -> Observable<Photo> {
+        return provider
+            .rx
+            .request(.randomPhoto)
+            .mapToModel(type: Photo.self)
+            .asObservable()
+            .do(onNext: { (photo) in
+                TrackingService.default.tracking(.fetchRandomPhoto(FetchFeaturePhotoParam(isSuccess: true, photo: photo)))
+            }, onError: { (error) in
+                TrackingService.default.tracking(.fetchRandomPhoto(FetchFeaturePhotoParam(isSuccess: false, error: error)))
+            })
+    }
 }
 
 // MARK: - Private
diff --git a/artify-core/artify-core/Services/TrackingService.swift b/artify-core/artify-core/Services/TrackingService.swift
index 153153d..8a7754c 100644
--- a/artify-core/artify-core/Services/TrackingService.swift
+++ b/artify-core/artify-core/Services/TrackingService.swift
@@ -24,6 +24,7 @@ public final class TrackingService: TrackingServiceType {
         case openApp
         case exitApp
         case fetchFeaturePhoto(FetchFeaturePhotoParam)
+        case fetchRandomPhoto(FetchFeaturePhotoParam)
         case launchOnStartup(LaunchOnStartupParam)
         case setWallapper(SetWallpaperParam)
         case appUpdated(AppUpdatedParam)
@@ -42,6 +43,8 @@ public final class TrackingService: TrackingServiceType {
                 return "Set wallpaper"
             case .appUpdated:
                 return "App updated"
+            case .fetchRandomPhoto:
+                return "Fetch random photo"
             }
         }
     }
diff --git a/artify-core/artify-core/Services/WallpaperService.swift b/artify-core/artify-core/Services/WallpaperService.swift
index 86d3a8c..ce650be 100644
--- a/artify-core/artify-core/Services/WallpaperService.swift
+++ b/artify-core/artify-core/Services/WallpaperService.swift
@@ -13,6 +13,7 @@ import Action
 protocol WallpaperServiceType {
 
     var setFeaturePhotoAction: Action<Void, Photo> { get }
+    var randomizePhotoAction: Action<Void, Photo> { get }
 }
 
 final class WallpaperService: WallpaperServiceType {
@@ -36,42 +37,51 @@ final class WallpaperService: WallpaperServiceType {
     // MARK: - Public
     lazy var setFeaturePhotoAction: Action<Void, Photo> = {
         return Action<Void, Photo> { (_) -> Observable<Photo> in
-            return Observable.just(())
-                .observeOn(ConcurrentDispatchQueueScheduler(qos: DispatchQoS.background))
-                .flatMapLatest({[unowned self] _ -> Observable<DownloadPayload> in
-                    return self.downloadService.downloadFeaturePhoto()
-                })
-                .flatMapLatest({[unowned self] (payload) -> Observable<WallpaperResponse> in
-                    guard let image = NSImage(contentsOfFile: payload.fileUrl.path) else {
-                        return .error(ArtfiyError.invalidFileURL(payload.fileUrl))
-                    }
-                    let processPayload = WallpaperPayload(photo: payload.photo,
-                                                          originalImage: image,
-                                                          screenSize: self.screenSize,
-                                                          effect: .gaussianBeautify)
-                    return self.processor.rx_apply(payload: processPayload)
-                })
-                .flatMapLatest({[unowned self] (payload) -> Observable<(Photo, URL)> in
-                    let filePayload = FilePayload(image: payload.wallpaperImage,
-                                                  photo: payload.photo,
-                                                  prefix: self.screenSize.toString)
-                    TrackingService.default.tracking(.setWallapper(SetWallpaperParam(photo: payload.photo, screenSize: self.screenSize)))
-                    return self.fileHandler.rx_saveImageIfNeed(filePayload)
-                        .map { return (payload.photo, $0) }
-                })
-                .observeOn(MainScheduler.instance)
-                .do(onNext: { tub in
-                    print("✅[SUCCESS] Set Wallpaper at \(tub.1)")
-                }, onError: { error in
-                    print("❌[ERROR] \(error)")
-                })
-                .flatMapLatest({[unowned self] (tub) -> Observable<Photo> in
-                    return self.setWallpaper(at: tub)
-                })
+            return self.downloadService
+                .downloadFeaturePhoto()
+                .flatMapLatest {[unowned self] in self.processDownloadPayload($0) }
+        }
+    }()
 
+    lazy var randomizePhotoAction: Action<Void, Photo> = {
+        return Action<Void, Photo> { (_) -> Observable<Photo> in
+            return self.downloadService
+                .downloadRandomPhoto()
+                .flatMapLatest {[unowned self] in self.processDownloadPayload($0) }
         }
     }()
-    
+
+    private func processDownloadPayload(_ payload: DownloadPayload) -> Observable<Photo> {
+        return Observable.just(payload)
+            .flatMapLatest({[unowned self] (payload) -> Observable<WallpaperResponse> in
+                guard let image = NSImage(contentsOfFile: payload.fileUrl.path) else {
+                    return .error(ArtfiyError.invalidFileURL(payload.fileUrl))
+                }
+                let processPayload = WallpaperPayload(photo: payload.photo,
+                                                      originalImage: image,
+                                                      screenSize: self.screenSize,
+                                                      effect: .gaussianBeautify)
+                return self.processor.rx_apply(payload: processPayload)
+            })
+            .flatMapLatest({[unowned self] (payload) -> Observable<(Photo, URL)> in
+                let filePayload = FilePayload(image: payload.wallpaperImage,
+                                              photo: payload.photo,
+                                              prefix: self.screenSize.toString)
+                TrackingService.default.tracking(.setWallapper(SetWallpaperParam(photo: payload.photo, screenSize: self.screenSize)))
+                return self.fileHandler.rx_saveImageIfNeed(filePayload)
+                    .map { return (payload.photo, $0) }
+            })
+            .observeOn(MainScheduler.instance)
+            .do(onNext: { tub in
+                print("✅[SUCCESS] Set Wallpaper at \(tub.1)")
+            }, onError: { error in
+                print("❌[ERROR] \(error)")
+            })
+            .flatMapLatest({[unowned self] (tub) -> Observable<Photo> in
+                return self.setWallpaper(at: tub)
+            })
+    }
+
     private func setWallpaper(at payload: (Photo, URL)) -> Observable<Photo> {
         var isApplied = false
 
@@ -93,3 +103,4 @@ final class WallpaperService: WallpaperServiceType {
         return Observable.just(payload.0)
     }
 }
+
diff --git a/artify-core/artify-core/ViewModels/StatusBarViewModel.swift b/artify-core/artify-core/ViewModels/StatusBarViewModel.swift
index d8cc2d4..b98f763 100644
--- a/artify-core/artify-core/ViewModels/StatusBarViewModel.swift
+++ b/artify-core/artify-core/ViewModels/StatusBarViewModel.swift
@@ -44,9 +44,10 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
     // MARK: - Variable
     private let bag = DisposeBag()
     private let getFeatureAction: Action<Void, Photo>
+    private let getRandomAction: Action<Void, Photo>
     private let updater: AppUpdatable
     private let openAboutPublisher = PublishSubject<Void>()
-    private let currentFeaturePhoto = Variable<Photo?>(nil)
+    private let currentPhoto = Variable<Photo?>(nil)
     private var aboutThisArtBtn: NSMenuItem {
         let index = menus.value.index(where: { $0.kind == Menu.Kind.aboutThisPhoto } )!
         return menuItems.value[index]
@@ -58,6 +59,7 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
     // MARK: - Output
     public let menuItems = Variable<[NSMenuItem]>([])
     public let menus = Variable([Menu(kind: .getFeature, selector: #selector(StatusBarViewModel.getFeatureOnTap(_:)), keyEquivalent: "F"),
+                                 Menu(kind: .random, selector: #selector(StatusBarViewModel.getRandomOnTap), keyEquivalent: "R"),
                                         Menu(kind: .separator, selector: nil),
                                         Menu(kind: .aboutThisPhoto, selector: #selector(StatusBarViewModel.aboutThisArt)),
                                          Menu(kind: .separator, selector: nil),
@@ -81,8 +83,11 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
         // Feauture action
         getFeatureAction = Coordinator.default.wallpaperService.setFeaturePhotoAction
 
+        // Random
+        getRandomAction = Coordinator.default.wallpaperService.randomizePhotoAction
+
         // isLoading
-        isLoading = getFeatureAction.enabled
+        isLoading = Observable.merge([getFeatureAction.enabled, getRandomAction.enabled])
             .map { !$0 }
             .distinctUntilChanged()
             .share()
@@ -133,17 +138,23 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
             .drive(onNext: {[weak self] (isLoading) in
                 guard let strongSelf = self else { return }
                 strongSelf.aboutThisArtBtn.isEnabled = !isLoading
+
             })
             .disposed(by: bag)
 
         // Hook the current feature photo
-        getFeatureAction.elements.bind(to: currentFeaturePhoto).disposed(by: bag)
+        getFeatureAction.elements.bind(to: currentPhoto).disposed(by: bag)
+        getRandomAction.elements.bind(to: currentPhoto).disposed(by: bag)
     }
 
     @objc private func getFeatureOnTap(_ menu: NSMenuItem) {
         getFeatureAction.execute(())
     }
 
+    @objc private func getRandomOnTap() {
+        getRandomAction.execute(())
+    }
+
     @objc private func launchOnStartUp(_ menu: NSMenuItem) {
         let newState = (menu.state == NSControl.StateValue.on) ? NSControl.StateValue.off : NSControl.StateValue.on
         menu.state = newState
@@ -169,7 +180,7 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
     }
 
     @objc private func aboutThisArt() {
-        guard let photo = currentFeaturePhoto.value else { return }
+        guard let photo = currentPhoto.value else { return }
         let url = URL(string: photo.originalSource)!
         NSWorkspace.shared.open(url)
     }