diff --git a/DynamicTodayExtensionExample/DynamicTodayExtension/Base.lproj/MainInterface.storyboard b/DynamicTodayExtensionExample/DynamicTodayExtension/Base.lproj/MainInterface.storyboard
index 2fa3839c..107c9456 100644
--- a/DynamicTodayExtensionExample/DynamicTodayExtension/Base.lproj/MainInterface.storyboard
+++ b/DynamicTodayExtensionExample/DynamicTodayExtension/Base.lproj/MainInterface.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="UTS-8Y-Gpd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="UTS-8Y-Gpd">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Data Source-->
@@ -18,8 +19,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0jD-lp-37h" customClass="FSCalendar">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="300"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="300" id="hrs-cw-3pk"/>
                                 </constraints>
@@ -31,23 +31,23 @@
                                         <real key="value" value="0.14999999999999999"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="titleDefaultColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="headerTitleColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="weekdayTextColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="titleWeekendColor">
-                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="fakeSubtitles" value="YES"/>
                                     <userDefinedRuntimeAttribute type="color" keyPath="subtitleDefaultColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="subtitleWeekendColor">
-                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="adjustsFontSizeToFitContentSize" value="NO"/>
                                     <userDefinedRuntimeAttribute type="number" keyPath="placeholderType">
@@ -60,7 +60,6 @@
                                 </connections>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Y4-kc-5pQ">
-                                <rect key="frame" x="28" y="8" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="0AV-jS-Y8p"/>
                                     <constraint firstAttribute="width" constant="30" id="WLZ-1L-n3C"/>
@@ -72,7 +71,6 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MHj-DV-3Fn">
-                                <rect key="frame" x="262" y="8" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="bQS-zH-C80"/>
                                     <constraint firstAttribute="width" constant="30" id="sks-Nz-eo6"/>
@@ -114,4 +112,9 @@
         <image name="circle_next" width="42" height="42"/>
         <image name="circle_prev" width="42" height="42"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.h b/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.h
index bdad8ec6..28097a2f 100644
--- a/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.h
+++ b/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.h
@@ -1,5 +1,5 @@
 //
-//  TodayViewController.h
+//  DynamicTodayViewController.h
 //  DynamicTodayExtension
 //
 //  Created by dingwenchao on 9/8/16.
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.m b/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.m
index 773c26e7..9fe998d6 100644
--- a/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.m
+++ b/DynamicTodayExtensionExample/DynamicTodayExtension/DynamicTodayViewController.m
@@ -1,5 +1,5 @@
 //
-//  TodayViewController.m
+//  DynamicTodayViewController.m
 //  DynamicTodayExtension
 //
 //  Created by dingwenchao on 9/8/16.
@@ -12,7 +12,6 @@
 
 @interface DynamicTodayViewController () <NCWidgetProviding,FSCalendarDataSource,FSCalendarDelegate,FSCalendarDelegateAppearance>
 
-
 @property (weak  , nonatomic) IBOutlet FSCalendar *calendar;
 @property (weak  , nonatomic) IBOutlet NSLayoutConstraint *calendarHeight;
 
@@ -30,31 +29,36 @@ @implementation DynamicTodayViewController
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
     // Do any additional setup after loading the view from its nib.
     self.calendar.today = nil;
     self.calendar.locale = [NSLocale localeWithLocaleIdentifier:@"zh-CN"];
     self.calendar.placeholderType = FSCalendarPlaceholderTypeNone;
+    self.calendar.extensionContext = self.extensionContext;
     
     self.lunarCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierChinese];
     self.lunarCalendar.locale = [NSLocale localeWithLocaleIdentifier:@"zh-CN"];
     self.lunarChars = @[@"初一",@"初二",@"初三",@"初四",@"初五",@"初六",@"初七",@"初八",@"初九",@"初十",@"十一",@"十二",@"十三",@"十四",@"十五",@"十六",@"十七",@"十八",@"十九",@"二十",@"二一",@"二二",@"二三",@"二四",@"二五",@"二六",@"二七",@"二八",@"二九",@"三十"];
     
     self.gregorian = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];
-    self.preferredContentSize = CGSizeMake(320, 300);
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+    
+    if ([self.extensionContext respondsToSelector:@selector(setWidgetLargestAvailableDisplayMode:)]) {
+        self.extensionContext.widgetLargestAvailableDisplayMode = NCWidgetDisplayModeExpanded;
+    }
+    
 }
 
-- (void)viewDidAppear:(BOOL)animated
+- (void)widgetActiveDisplayModeDidChange:(NCWidgetDisplayMode)activeDisplayMode withMaximumSize:(CGSize)maxSize
 {
-    [super viewDidAppear:animated];
-    NSLog(@"%@",NSStringFromCGRect(self.view.frame));
+    if (activeDisplayMode == NCWidgetDisplayModeCompact) {
+        [self.calendar setScope:FSCalendarScopeWeek animated:YES];
+    } else if (activeDisplayMode == NCWidgetDisplayModeExpanded) {
+        [self.calendar setScope:FSCalendarScopeMonth animated:YES];
+    }
 }
 
-- (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))completionHandler {
+- (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))completionHandler
+{
     // Perform any setup necessary in order to update the view.
     
     // If an error is encountered, use NCUpdateResultFailed
@@ -99,14 +103,17 @@ - (void)calendar:(FSCalendar *)calendar boundingRectWillChange:(CGRect)bounds an
 
 - (IBAction)prevClicked:(id)sender
 {
-    NSDate *prevPage = [self.gregorian dateByAddingUnit:NSCalendarUnitMonth value:-1 toDate:self.calendar.currentPage options:0];
+    NSCalendarUnit unit = (self.calendar.scope==FSCalendarScopeMonth) ? NSCalendarUnitMonth : NSCalendarUnitWeekOfYear;
+    NSDate *prevPage = [self.gregorian dateByAddingUnit:unit value:-1 toDate:self.calendar.currentPage options:0];
     [self.calendar setCurrentPage:prevPage animated:YES];
+    
 }
 
 - (IBAction)nextClicked:(id)sender
 {
-    NSDate *nextPage = [self.gregorian dateByAddingUnit:NSCalendarUnitMonth value:1 toDate:self.calendar.currentPage options:0];
+    NSCalendarUnit unit = (self.calendar.scope==FSCalendarScopeMonth) ? NSCalendarUnitMonth : NSCalendarUnitWeekOfYear;
+    NSDate *nextPage = [self.gregorian dateByAddingUnit:unit value:1 toDate:self.calendar.currentPage options:0];
     [self.calendar setCurrentPage:nextPage animated:YES];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample.xcodeproj/project.pbxproj b/DynamicTodayExtensionExample/DynamicTodayExtensionExample.xcodeproj/project.pbxproj
index 01ae50a8..df091229 100644
--- a/DynamicTodayExtensionExample/DynamicTodayExtensionExample.xcodeproj/project.pbxproj
+++ b/DynamicTodayExtensionExample/DynamicTodayExtensionExample.xcodeproj/project.pbxproj
@@ -283,7 +283,7 @@
 		305233061D8170480070AAFE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = dingwenchao;
 				TargetAttributes = {
 					3052330D1D8170480070AAFE = {
@@ -423,8 +423,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -468,8 +470,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -498,6 +502,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = DynamicTodayExtensionExample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wenchao.DynamicTodayExtensionExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -509,6 +514,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = DynamicTodayExtensionExample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wenchao.DynamicTodayExtensionExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
index b376f48a..577719ec 100644
--- a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,15 +1,33 @@
 {
   "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x-1.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
@@ -24,6 +42,18 @@
       "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "60x60",
       "idiom" : "iphone",
@@ -36,6 +66,18 @@
       "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
@@ -45,7 +87,7 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x-2.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
@@ -57,7 +99,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
@@ -77,62 +119,10 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@3x.png",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
-  },
-  "properties" : {
-    "pre-rendered" : true
   }
 }
\ No newline at end of file
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 00000000..da3746c1
Binary files /dev/null and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 00000000..6d048d3a
Binary files /dev/null and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 00000000..2d043288
Binary files /dev/null and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 17306e3c..b2312ede 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 40398222..00000000
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png and /dev/null differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png
deleted file mode 100644
index 40398222..00000000
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png and /dev/null differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 40398222..68b9155c 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png
deleted file mode 100644
index 70ca9c99..00000000
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png and /dev/null differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 70ca9c99..0eeaaa7e 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 1b9d4083..6d048d3a 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
deleted file mode 100644
index 5184c879..00000000
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png and /dev/null differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 5184c879..a9042cd4 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 03278121..ede761d3 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..c14220ee
Binary files /dev/null and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..8477219a
Binary files /dev/null and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 03278121..ede761d3 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 93c0d677..c06a07c0 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 773a0694..71871636 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 43029573..1fb418b1 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index b7bdda52..277a6f20 100644
Binary files a/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/DynamicTodayExtensionExample/DynamicTodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/Example/FSCalendar.xcodeproj/project.pbxproj b/Example/FSCalendar.xcodeproj/project.pbxproj
index 1320e382..e74eea1a 100644
--- a/Example/FSCalendar.xcodeproj/project.pbxproj
+++ b/Example/FSCalendar.xcodeproj/project.pbxproj
@@ -33,6 +33,7 @@
 		3095398F1C38D66C00BD37AA /* FSCalendarFlowLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 3095398D1C38D66C00BD37AA /* FSCalendarFlowLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		309539901C38D66C00BD37AA /* FSCalendarFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 3095398E1C38D66C00BD37AA /* FSCalendarFlowLayout.m */; };
 		309539911C38D66C00BD37AA /* FSCalendarFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 3095398E1C38D66C00BD37AA /* FSCalendarFlowLayout.m */; };
+		309A42011D992C4A004E86CB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 309A42001D992C4A004E86CB /* Images.xcassets */; };
 		30B0BA9B1B8D8BC9004B9476 /* FSCalendar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EE638CE21B8A1F550006DD1A /* FSCalendar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		30B0BACF1B8D8E23004B9476 /* FSCalendar+IBExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B0BABE1B8D8E22004B9476 /* FSCalendar+IBExtension.m */; };
 		30B0BAD01B8D8E23004B9476 /* FSCalendar.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B0BAC01B8D8E22004B9476 /* FSCalendar.m */; };
@@ -71,7 +72,6 @@
 		EE638CD41B89DBE90006DD1A /* FSTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE638CD21B89DBE90006DD1A /* FSTableViewController.m */; };
 		EE638CD91B89DC0A0006DD1A /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EE638CD51B89DC090006DD1A /* Main_iPad.storyboard */; };
 		EE638CDA1B89DC0A0006DD1A /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EE638CD71B89DC090006DD1A /* Main_iPhone.storyboard */; };
-		EE638CDC1B89DC230006DD1A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EE638CDB1B89DC230006DD1A /* Images.xcassets */; };
 		EEC9C0391BDC9E7000383A07 /* FSCalendarCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = EEC9C0371BDC9E7000383A07 /* FSCalendarCollectionView.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		EEC9C03A1BDC9E7000383A07 /* FSCalendarCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9C0381BDC9E7000383A07 /* FSCalendarCollectionView.m */; };
 		EEC9C03B1BDC9E7000383A07 /* FSCalendarCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9C0381BDC9E7000383A07 /* FSCalendarCollectionView.m */; };
@@ -131,6 +131,7 @@
 		309225391B905C4300123031 /* FSCalendarConstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarConstance.m; sourceTree = "<group>"; };
 		3095398D1C38D66C00BD37AA /* FSCalendarFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarFlowLayout.h; sourceTree = "<group>"; };
 		3095398E1C38D66C00BD37AA /* FSCalendarFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarFlowLayout.m; sourceTree = "<group>"; };
+		309A42001D992C4A004E86CB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = SOURCE_ROOT; };
 		30B0BABD1B8D8E22004B9476 /* FSCalendar+IBExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FSCalendar+IBExtension.h"; sourceTree = "<group>"; };
 		30B0BABE1B8D8E22004B9476 /* FSCalendar+IBExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FSCalendar+IBExtension.m"; sourceTree = "<group>"; };
 		30B0BABF1B8D8E22004B9476 /* FSCalendar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendar.h; sourceTree = "<group>"; };
@@ -170,7 +171,6 @@
 		EE638CD21B89DBE90006DD1A /* FSTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSTableViewController.m; sourceTree = SOURCE_ROOT; };
 		EE638CD61B89DC090006DD1A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = SOURCE_ROOT; };
 		EE638CD81B89DC0A0006DD1A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = SOURCE_ROOT; };
-		EE638CDB1B89DC230006DD1A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = SOURCE_ROOT; };
 		EE638CE21B8A1F550006DD1A /* FSCalendar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FSCalendar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EE638CF41B8A1F550006DD1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EE638CF51B8A1F550006DD1A /* FSCalendarTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FSCalendarTests.m; sourceTree = "<group>"; };
@@ -337,7 +337,6 @@
 				EE52AE151B91E65D00016662 /* FSCalendarScope Example */,
 				EE0D80241B89C868003C287B /* Storyboard Example */,
 				EE0D80231B89C853003C287B /* LoadView Example */,
-				EE638CDB1B89DC230006DD1A /* Images.xcassets */,
 				EE0D7FCA1B89C5D3003C287B /* Supporting Files */,
 			);
 			path = Example;
@@ -346,6 +345,7 @@
 		EE0D7FCA1B89C5D3003C287B /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				309A42001D992C4A004E86CB /* Images.xcassets */,
 				EE0D7FCB1B89C5D3003C287B /* Info.plist */,
 				EE638CCA1B89DBAC0006DD1A /* main.m */,
 			);
@@ -498,7 +498,7 @@
 		EE0D7FBF1B89C5D3003C287B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = wenchaoios;
 				TargetAttributes = {
 					30671DC61D6D574C00BCFC4E = {
@@ -549,7 +549,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				EE638CDA1B89DC0A0006DD1A /* Main_iPhone.storyboard in Resources */,
-				EE638CDC1B89DC230006DD1A /* Images.xcassets in Resources */,
+				309A42011D992C4A004E86CB /* Images.xcassets in Resources */,
 				EE638CD91B89DC0A0006DD1A /* Main_iPad.storyboard in Resources */,
 				30B0BAD51B8D8E23004B9476 /* Info.plist in Resources */,
 			);
@@ -702,6 +702,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -711,8 +712,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -746,6 +749,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -755,8 +759,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -810,6 +816,7 @@
 		EE638CFC1B8A1F550006DD1A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -835,6 +842,7 @@
 		EE638CFD1B8A1F550006DD1A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/Example/FSCalendar.xcodeproj/xcshareddata/xcschemes/FSCalendar.xcscheme b/Example/FSCalendar.xcodeproj/xcshareddata/xcschemes/FSCalendar.xcscheme
index 02dd6ebf..75cb53b3 100644
--- a/Example/FSCalendar.xcodeproj/xcshareddata/xcschemes/FSCalendar.xcscheme
+++ b/Example/FSCalendar.xcodeproj/xcshareddata/xcschemes/FSCalendar.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Images.xcassets/AppIcon.appiconset/Contents.json
index b376f48a..577719ec 100644
--- a/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Example/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,15 +1,33 @@
 {
   "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x-1.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
@@ -24,6 +42,18 @@
       "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "60x60",
       "idiom" : "iphone",
@@ -36,6 +66,18 @@
       "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
@@ -45,7 +87,7 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x-2.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
@@ -57,7 +99,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
@@ -77,62 +119,10 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@3x.png",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
-  },
-  "properties" : {
-    "pre-rendered" : true
   }
 }
\ No newline at end of file
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 00000000..da3746c1
Binary files /dev/null and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 00000000..6d048d3a
Binary files /dev/null and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 00000000..2d043288
Binary files /dev/null and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 17306e3c..b2312ede 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 40398222..00000000
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png and /dev/null differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png
deleted file mode 100644
index 40398222..00000000
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png and /dev/null differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 40398222..68b9155c 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png
deleted file mode 100644
index 70ca9c99..00000000
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png and /dev/null differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 70ca9c99..0eeaaa7e 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 1b9d4083..6d048d3a 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
deleted file mode 100644
index 5184c879..00000000
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png and /dev/null differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 5184c879..a9042cd4 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 03278121..ede761d3 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..c14220ee
Binary files /dev/null and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..8477219a
Binary files /dev/null and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 03278121..ede761d3 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 93c0d677..c06a07c0 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 773a0694..71871636 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 43029573..1fb418b1 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index b7bdda52..277a6f20 100644
Binary files a/Example/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/Example/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/Example/LoadViewExampleViewController.m b/Example/LoadViewExampleViewController.m
index 74c4b02a..778ff22a 100644
--- a/Example/LoadViewExampleViewController.m
+++ b/Example/LoadViewExampleViewController.m
@@ -40,6 +40,7 @@ - (void)loadView
     calendar.backgroundColor = [UIColor whiteColor];
     [view addSubview:calendar];
     self.calendar = calendar;
+    
 }
 
 - (void)viewDidLayoutSubviews
@@ -56,7 +57,8 @@ - (void)viewDidLoad
     self.dateFormatter = [[NSDateFormatter alloc] init];
     self.dateFormatter.dateFormat = @"yyyy/MM/dd";
     
-    [self.calendar selectDate:[self.dateFormatter dateFromString:@"2015/02/03"]];
+    
+//    [self.calendar selectDate:[self.dateFormatter dateFromString:@"2015/02/03"]];
     /*
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self.calendar setScope:FSCalendarScopeWeek animated:YES];
diff --git a/Example/StoryboardExampleViewController.h b/Example/StoryboardExampleViewController.h
index 72521ddb..d013fd84 100644
--- a/Example/StoryboardExampleViewController.h
+++ b/Example/StoryboardExampleViewController.h
@@ -11,7 +11,8 @@
 
 @interface StoryboardExampleViewController : UIViewController<FSCalendarDataSource, FSCalendarDelegate, FSCalendarDelegateAppearance>
 
-@property (weak, nonatomic) IBOutlet FSCalendar *calendar;
+@property (weak  , nonatomic) IBOutlet FSCalendar *calendar;
+@property (weak  , nonatomic) IBOutlet NSLayoutConstraint *calendarHeightConstraint;
 
 @property (assign, nonatomic) NSInteger      theme;
 @property (assign, nonatomic) FSCalendarScrollDirection scrollDirection;
@@ -22,6 +23,4 @@
 @property (strong, nonatomic) NSArray *datesShouldNotBeSelected;
 @property (strong, nonatomic) NSArray *datesWithEvent;
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *calendarHeightConstraint;
-
 @end
diff --git a/Example/StoryboardExampleViewController.m b/Example/StoryboardExampleViewController.m
index 54efab64..8ae52ca1 100644
--- a/Example/StoryboardExampleViewController.m
+++ b/Example/StoryboardExampleViewController.m
@@ -51,11 +51,7 @@ - (void)viewDidLoad
     _scrollDirection = _calendar.scrollDirection;
     _calendar.appearance.caseOptions = FSCalendarCaseOptionsHeaderUsesUpperCase|FSCalendarCaseOptionsWeekdayUsesUpperCase;
     
-//    _calendar.today = nil;
-//    _calendar.today = [self.calendar dateByAddingDays:2 toDate:[NSDate date]];
-    
-    
-    [_calendar selectDate:[self.dateFormatter1 dateFromString:@"2015/10/05"]];
+//    [_calendar selectDate:[self.dateFormatter1 dateFromString:@"2015/10/05"]];
     
     _datesShouldNotBeSelected = @[@"2015/08/07",
                                   @"2015/09/07",
@@ -70,6 +66,7 @@ - (void)viewDidLoad
                         @"2015-10-15",
                         @"2015-10-25"];
     
+    
 //    _calendar.locale = [NSLocale currentLocale];
     
     // Uncomment this to test the month->week & week->month transition
diff --git a/FSCalendar/FSCalendar.h b/FSCalendar/FSCalendar.h
index 4809c8e5..f60b0acc 100644
--- a/FSCalendar/FSCalendar.h
+++ b/FSCalendar/FSCalendar.h
@@ -242,6 +242,8 @@ NS_ASSUME_NONNULL_BEGIN
 IB_DESIGNABLE
 @interface FSCalendar : UIView
 
+@property (weak, nonatomic) NSExtensionContext *extensionContext;
+
 /**
  * The object that acts as the delegate of the calendar.
  */
diff --git a/FSCalendar/FSCalendar.m b/FSCalendar/FSCalendar.m
index 898e7a77..95e3b0ec 100644
--- a/FSCalendar/FSCalendar.m
+++ b/FSCalendar/FSCalendar.m
@@ -274,6 +274,9 @@ - (void)initialize
     [daysContainer addSubview:collectionView];
     self.collectionView = collectionView;
     self.collectionViewLayout = collectionViewLayout;
+    if ([collectionView respondsToSelector:@selector(setPrefetchingEnabled:)]) {
+        collectionView.prefetchingEnabled = NO;
+    }
     
     if (!FSCalendarInAppExtension) {
         
@@ -491,6 +494,7 @@ - (CGSize)sizeThatFits:(CGSize)size scope:(FSCalendarScope)scope
 
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
 {
+    [self requestBoundingDatesIfNecessary];
     if (self.animator.transition == FSCalendarTransitionWeekToMonth) {
         NSInteger sections = [self.gregorian components:NSCalendarUnitMonth fromDate:[self beginingOfMonth:self.minimumDate] toDate:self.maximumDate options:0].month + 1;
         return sections;
@@ -578,8 +582,6 @@ - (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtInde
         if (_placeholderType == FSCalendarPlaceholderTypeNone) return NO;
         if ([self isDateInRange:cell.date]) {
             [self selectDate:cell.date scrollToDate:YES forPlaceholder:YES];
-        } else if (![self.gregorian isDate:cell.date equalToDate:_currentPage toUnitGranularity:NSCalendarUnitMonth]){
-            [self scrollToPageForDate:cell.date animated:YES];
         }
         return NO;
     }
@@ -843,7 +845,6 @@ - (void)setCurrentPage:(NSDate *)currentPage
 - (void)setCurrentPage:(NSDate *)currentPage animated:(BOOL)animated
 {
     [self requestBoundingDatesIfNecessary];
-    FSCalendarAssertDateInBounds(currentPage,self.gregorian,self.minimumDate,self.maximumDate);
     if (self.floatingMode || [self isDateInDifferentPage:currentPage]) {
         currentPage = [self.gregorian dateBySettingHour:0 minute:0 second:0 ofDate:currentPage options:0];
         [self scrollToPageForDate:currentPage animated:animated];
@@ -1063,6 +1064,7 @@ - (void)setShowsScopeHandle:(BOOL)showsScopeHandle
 
 - (void)reloadData
 {
+    if (!self.hasValidateVisibleLayout) return;
     NSDate *minimumDate = self.minimumDateForCalendar;
     NSDate *maximumDate = self.maximumDateForCalendar;
     if (![self.gregorian isDate:minimumDate equalToDate:_minimumDate toUnitGranularity:NSCalendarUnitMonth] || ![self.gregorian isDate:maximumDate equalToDate:_maximumDate toUnitGranularity:NSCalendarUnitMonth]) {
@@ -1245,15 +1247,15 @@ - (void)scrollToDate:(NSDate *)date animated:(BOOL)animated
     animated &= _scrollEnabled; // No animation if _scrollEnabled == NO;
     _supressEvent = !animated;
     
-    FSCalendarAssertDateInBounds(date,self.gregorian,self.minimumDate,self.maximumDate);
-    
     NSInteger scrollOffset = 0;
     switch (_scope) {
         case FSCalendarScopeMonth: {
+            FSCalendarAssertDateInBounds(date,self.gregorian,[self beginingOfMonth:self.minimumDate],[self endOfMonth:self.maximumDate]);
             scrollOffset = [self.gregorian components:NSCalendarUnitMonth fromDate:[self beginingOfMonth:self.minimumDate] toDate:date options:0].month;
             break;
         }
         case FSCalendarScopeWeek: {
+            FSCalendarAssertDateInBounds(date,self.gregorian,[self beginingOfWeek:self.minimumDate],[self endOfWeek:self.maximumDate]);
             scrollOffset = [self.gregorian components:NSCalendarUnitWeekOfYear fromDate:[self beginingOfWeek:self.minimumDate] toDate:date options:0].weekOfYear;
             break;
         }
@@ -1302,10 +1304,12 @@ - (void)scrollToPageForDate:(NSDate *)date animated:(BOOL)animated
             NSDate *lastPage = _currentPage;
             switch (_scope) {
                 case FSCalendarScopeMonth: {
+                    FSCalendarAssertDateInBounds(date, self.gregorian, [self beginingOfMonth:self.minimumDate], [self endOfMonth:self.maximumDate]);
                     _currentPage = [self beginingOfMonth:date];
                     break;
                 }
                 case FSCalendarScopeWeek: {
+                    FSCalendarAssertDateInBounds(date, self.gregorian, [self beginingOfWeek:self.minimumDate], [self endOfWeek:self.maximumDate]);
                     _currentPage = [self beginingOfWeek:date];
                     break;
                 }
@@ -1520,6 +1524,9 @@ - (void)invalidateLayout
         if (_header) {
             [_header removeFromSuperview];
         }
+        if (_deliver) {
+            [_deliver removeFromSuperview];
+        }
         if (_weekdays.count) {
             [_weekdays makeObjectsPerformSelector:@selector(removeFromSuperview)];
             [_weekdays removeAllObjects];
@@ -1603,7 +1610,7 @@ - (void)reloadDataForCell:(FSCalendarCell *)cell atIndexPath:(NSIndexPath *)inde
     cell.title = [self titleForDate:cell.date];
     cell.subtitle  = [self subtitleForDate:cell.date];
     cell.dateIsSelected = [_selectedDates containsObject:cell.date];
-    cell.dateIsToday = [self.gregorian isDate:cell.date inSameDayAsDate:self.today];
+    cell.dateIsToday = self.today?[self.gregorian isDate:cell.date inSameDayAsDate:self.today]:NO;
     switch (_scope) {
         case FSCalendarScopeMonth: {
             NSDate *firstPage = [self beginingOfMonth:_minimumDate];
diff --git a/FSCalendar/FSCalendarAnimator.m b/FSCalendar/FSCalendarAnimator.m
index 075a6483..04c9debb 100644
--- a/FSCalendar/FSCalendarAnimator.m
+++ b/FSCalendar/FSCalendarAnimator.m
@@ -569,7 +569,7 @@ - (void)performForwardTransition:(FSCalendarTransition)transition fromProgress:(
             
             self.calendar.contentView.clipsToBounds = YES;
             
-            CGFloat currentAlpha = 1 - progress;
+            CGFloat currentAlpha = MAX(1-progress*1.1,0);
             CGFloat duration = 0.3;
             [self performAlphaAnimationFrom:currentAlpha to:0 duration:0.22 exception:attr.focusedRowNumber completion:^{
                 [self performTransitionCompletionAnimated:YES];
@@ -619,7 +619,7 @@ - (void)performBackwardTransition:(FSCalendarTransition)transition fromProgress:
 {
     switch (transition) {
         case FSCalendarTransitionMonthToWeek: {
-            [self performAlphaAnimationFrom:1-progress to:1 duration:0.3 exception:self.pendingAttributes.focusedRowNumber completion:^{
+            [self performAlphaAnimationFrom:MAX(1-progress*1.1,0) to:1 duration:0.3 exception:self.pendingAttributes.focusedRowNumber completion:^{
                 [self.calendar.collectionView.visibleCells enumerateObjectsUsingBlock:^(__kindof UICollectionViewCell * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                     obj.contentView.layer.opacity = 1;
                     [obj.contentView.layer removeAnimationForKey:@"opacity"];
@@ -700,7 +700,7 @@ - (void)performAlphaAnimationFrom:(CGFloat)fromAlpha to:(CGFloat)toAlpha duratio
 
 - (void)performAlphaAnimationWithProgress:(CGFloat)progress
 {
-    CGFloat opacity = self.transition == FSCalendarTransitionMonthToWeek ? 1-progress: progress;
+    CGFloat opacity = self.transition == FSCalendarTransitionMonthToWeek ? MAX((1-progress*1.1),0) : progress;
     [self.collectionView.visibleCells enumerateObjectsUsingBlock:^(FSCalendarCell *cell, NSUInteger idx, BOOL *stop) {
         if (CGRectContainsPoint(self.collectionView.bounds, cell.center)) {
             BOOL shouldPerformAlpha = NO;
diff --git a/FSCalendar/FSCalendarCell.m b/FSCalendar/FSCalendarCell.m
index 017756f5..79be6327 100644
--- a/FSCalendar/FSCalendarCell.m
+++ b/FSCalendar/FSCalendarCell.m
@@ -95,7 +95,8 @@ - (void)setBounds:(CGRect)bounds
                                        bounds.size.width,
                                        eventSize*0.83
                                       );
-    _imageView.frame = self.contentView.bounds;
+    _imageView.frame = CGRectMake(self.preferredImageOffset.x, self.preferredImageOffset.y, self.contentView.fs_width, self.contentView.fs_height);
+    
 }
 
 - (void)layoutSubviews
diff --git a/FSCalendar/FSCalendarDynamicHeader.h b/FSCalendar/FSCalendarDynamicHeader.h
index 34b8154c..cb664a1c 100644
--- a/FSCalendar/FSCalendarDynamicHeader.h
+++ b/FSCalendar/FSCalendarDynamicHeader.h
@@ -22,6 +22,7 @@
 
 @interface FSCalendar (Dynamic)
 
+@property (readonly, nonatomic) NSExtensionContext *extensionContext;
 @property (readonly, nonatomic) FSCalendarHeader *header;
 @property (readonly, nonatomic) FSCalendarCollectionView *collectionView;
 @property (readonly, nonatomic) FSCalendarScopeHandle *scopeHandle;
diff --git a/README.md b/README.md
index fd17a60f..e0e5dad4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 # Updates
 
-[NSCalendarExtension](https://github.com/WenchaoD/NSCalendarExtension) is required to get iOS7 compatibility.
+* [NSCalendarExtension](https://github.com/WenchaoD/NSCalendarExtension) is required to get iOS7 compatibility.
 
 # [中文介绍](http://www.jianshu.com/notebooks/4276521/latest)
 [**QQ交流群: 323861692**](#qq_group)
@@ -42,11 +42,20 @@
 
 > FSCalendar doesn't change frame or the constraint by itself, see [Adjusts frame dynamicly](#adjusts_frame_dynamicly)
 
-## Today Extension
+<br>
+
+## Today Extension (iOS8/9)
 ![1](https://cloud.githubusercontent.com/assets/5186464/18406879/0d072d92-7736-11e6-90bc-2633f5ca2b54.gif)
 <br>
 ![2](https://cloud.githubusercontent.com/assets/5186464/18406887/47c4822c-7736-11e6-96f0-ccb4c9cba199.gif)
 
+## Today Extension With NSWidgetDisplayMode (iOS10)
+![1](https://cloud.githubusercontent.com/assets/5186464/18870456/40e3096e-84e3-11e6-9ba9-520a09620fa4.gif)
+<br>
+![2](https://cloud.githubusercontent.com/assets/5186464/18870531/9afa7cd4-84e3-11e6-93c6-4e8811fd71a7.gif)
+
+
+
 # <a id="installation"></a>Installation
 
 ## CocoaPods:
@@ -64,7 +73,7 @@ pod 'FSCalendar'
 pod 'FSCalendar'
 ```
 
-> To get the iOS7-compatibility, you will also need to include [NSCalendarExtension](https://github.com/WenchaoD/NSCalendarExtension) into your project.
+> [NSCalendarExtension](https://github.com/WenchaoD/NSCalendarExtension) is required to get iOS7 compatibility.
 
 * Alternatively to give it a test run, run the command:
 
@@ -159,6 +168,9 @@ self.calendar = calendar
 ![fscalendar - ibdesignable](https://cloud.githubusercontent.com/assets/5186464/9301716/2e76a2ca-4503-11e5-8450-1fa7aa93e9fd.gif)
 
 # <a id="pre-knowledge"></a>Pre-knowledge
+
+> In `Swift3`, `NSDate` and `NSDateFormatter` have been renamed to ***Date*** and ***DateFormatter*** , see `SwiftExample` for details.
+
 ## How to create NSDate object
 
 * By **NSCalendar**.
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Contents.json b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Contents.json
index 118c98f7..577719ec 100644
--- a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,34 +1,124 @@
 {
   "images" : [
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-App-20x20@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Icon-App-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 00000000..da3746c1
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 00000000..6d048d3a
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 00000000..2d043288
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 00000000..b2312ede
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 00000000..68b9155c
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 00000000..0eeaaa7e
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 00000000..6d048d3a
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 00000000..a9042cd4
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 00000000..ede761d3
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..c14220ee
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..8477219a
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 00000000..ede761d3
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 00000000..c06a07c0
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 00000000..71871636
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 00000000..1fb418b1
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 00000000..277a6f20
Binary files /dev/null and b/SwiftExample/SwiftExample/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/TodayExtensionExample/TodayExtension/Base.lproj/MainInterface.storyboard b/TodayExtensionExample/TodayExtension/Base.lproj/MainInterface.storyboard
index 242d8568..446cbe87 100644
--- a/TodayExtensionExample/TodayExtension/Base.lproj/MainInterface.storyboard
+++ b/TodayExtensionExample/TodayExtension/Base.lproj/MainInterface.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="M4Y-Lb-cyx">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="M4Y-Lb-cyx">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Data Source-->
@@ -18,8 +19,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8cI-R5-ARn" customClass="FSCalendar">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="300"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="300" id="vdS-18-fsM"/>
                                 </constraints>
@@ -28,39 +28,69 @@
                                         <real key="value" value="0.14999999999999999"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="titleDefaultColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="headerTitleColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="weekdayTextColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="titleWeekendColor">
-                                        <color key="value" red="0.90196078431372551" green="0.86274509803921573" blue="0.56862745098039214" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="value" red="0.90196078431372551" green="0.86274509803921573" blue="0.56862745098039214" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="fakeSubtitles" value="YES"/>
                                     <userDefinedRuntimeAttribute type="color" keyPath="subtitleDefaultColor">
-                                        <color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="color" keyPath="subtitleWeekendColor">
-                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="value" red="0.90196078430000004" green="0.86274509799999999" blue="0.56862745100000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="adjustsFontSizeToFitContentSize" value="NO"/>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="fakedSelectedDay">
+                                        <integer key="value" value="2"/>
+                                    </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <outlet property="dataSource" destination="M4Y-Lb-cyx" id="NBU-8C-hY8"/>
                                     <outlet property="delegate" destination="M4Y-Lb-cyx" id="fbj-GS-VOb"/>
                                 </connections>
                             </view>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQJ-NX-RmL">
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="qMi-C1-Iy1"/>
+                                    <constraint firstAttribute="width" constant="30" id="tPJ-LN-m43"/>
+                                </constraints>
+                                <inset key="contentEdgeInsets" minX="2" minY="2" maxX="2" maxY="2"/>
+                                <state key="normal" image="circle_prev"/>
+                                <connections>
+                                    <action selector="prevClicked:" destination="M4Y-Lb-cyx" eventType="touchUpInside" id="vFe-pk-Hqs"/>
+                                </connections>
+                            </button>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5xc-iY-5SS">
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="lAc-cg-RCf"/>
+                                    <constraint firstAttribute="width" constant="30" id="uS2-Ah-QIQ"/>
+                                </constraints>
+                                <inset key="contentEdgeInsets" minX="2" minY="2" maxX="2" maxY="2"/>
+                                <state key="normal" image="circle_next"/>
+                                <connections>
+                                    <action selector="nextClicked:" destination="M4Y-Lb-cyx" eventType="touchUpInside" id="dxu-Mq-cc7"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="8cI-R5-ARn" secondAttribute="trailing" id="67U-Py-Qf0"/>
+                            <constraint firstAttribute="trailing" secondItem="5xc-iY-5SS" secondAttribute="trailing" constant="28" id="CrB-Vi-bEe"/>
                             <constraint firstItem="8cI-R5-ARn" firstAttribute="top" secondItem="Ft6-oW-KC0" secondAttribute="bottom" id="D7v-9W-FZm"/>
                             <constraint firstItem="8cI-R5-ARn" firstAttribute="leading" secondItem="S3S-Oj-5AN" secondAttribute="leading" id="KI3-4a-hia"/>
+                            <constraint firstItem="cQJ-NX-RmL" firstAttribute="top" secondItem="Ft6-oW-KC0" secondAttribute="bottom" constant="8" id="Z13-du-b5B"/>
+                            <constraint firstItem="5xc-iY-5SS" firstAttribute="top" secondItem="Ft6-oW-KC0" secondAttribute="bottom" constant="8" id="av0-Lw-P2Q"/>
+                            <constraint firstItem="cQJ-NX-RmL" firstAttribute="leading" secondItem="S3S-Oj-5AN" secondAttribute="leading" constant="28" id="zM0-ra-XOS"/>
                         </constraints>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout"/>
+                    <value key="contentSizeForViewInPopover" type="size" width="320" height="300"/>
                     <nil key="simulatedStatusBarMetrics"/>
                     <nil key="simulatedTopBarMetrics"/>
                     <nil key="simulatedBottomBarMetrics"/>
@@ -69,6 +99,8 @@
                     <connections>
                         <outlet property="calendar" destination="8cI-R5-ARn" id="JDC-I6-ySm"/>
                         <outlet property="calendarHeight" destination="vdS-18-fsM" id="oF9-Rz-0pM"/>
+                        <outlet property="nextButton" destination="5xc-iY-5SS" id="qgp-YO-bFJ"/>
+                        <outlet property="prevButton" destination="cQJ-NX-RmL" id="DBr-bh-3u4"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vXp-U4-Rya" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -76,4 +108,13 @@
             <point key="canvasLocation" x="516" y="285"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="circle_next" width="42" height="42"/>
+        <image name="circle_prev" width="42" height="42"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/TodayExtensionExample/TodayExtension/Image.xcassets/Contents.json b/TodayExtensionExample/TodayExtension/Image.xcassets/Contents.json
new file mode 100644
index 00000000..da4a164c
--- /dev/null
+++ b/TodayExtensionExample/TodayExtension/Image.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/Contents.json b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/Contents.json
new file mode 100644
index 00000000..5167b8f3
--- /dev/null
+++ b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "circle_next.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/circle_next.png b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/circle_next.png
new file mode 100644
index 00000000..731181ab
Binary files /dev/null and b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_next.imageset/circle_next.png differ
diff --git a/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/Contents.json b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/Contents.json
new file mode 100644
index 00000000..9945f15e
--- /dev/null
+++ b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "circle_prev.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/circle_prev.png b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/circle_prev.png
new file mode 100644
index 00000000..07544bd2
Binary files /dev/null and b/TodayExtensionExample/TodayExtension/Image.xcassets/circle_prev.imageset/circle_prev.png differ
diff --git a/TodayExtensionExample/TodayExtension/TodayViewController.m b/TodayExtensionExample/TodayExtension/TodayViewController.m
index 2e8dee32..040836ee 100644
--- a/TodayExtensionExample/TodayExtension/TodayViewController.m
+++ b/TodayExtensionExample/TodayExtension/TodayViewController.m
@@ -13,13 +13,14 @@
 @interface TodayViewController () <NCWidgetProviding,FSCalendarDataSource,FSCalendarDelegate,FSCalendarDelegateAppearance>
 
 @property (weak  , nonatomic) IBOutlet FSCalendar *calendar;
+@property (weak  , nonatomic) IBOutlet UIButton *prevButton;
+@property (weak  , nonatomic) IBOutlet UIButton *nextButton;
 @property (weak  , nonatomic) IBOutlet NSLayoutConstraint *calendarHeight;
 
 @property (strong, nonatomic) NSCalendar *gregorian;
 @property (strong, nonatomic) NSCalendar *lunarCalendar;
 @property (strong, nonatomic) NSArray<NSString *> *lunarChars;
 
-
 @end
 
 @implementation TodayViewController
@@ -35,13 +36,37 @@ - (void)viewDidLoad
     self.lunarChars = @[@"初一",@"初二",@"初三",@"初四",@"初五",@"初六",@"初七",@"初八",@"初九",@"初十",@"十一",@"十二",@"十三",@"十四",@"十五",@"十六",@"十七",@"十八",@"十九",@"二十",@"二一",@"二二",@"二三",@"二四",@"二五",@"二六",@"二七",@"二八",@"二九",@"三十"];
     self.gregorian = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];
     
-    self.preferredContentSize = CGSizeMake(320, 300);
+    if ([self.extensionContext respondsToSelector:@selector(setWidgetLargestAvailableDisplayMode:)]) {
+        self.extensionContext.widgetLargestAvailableDisplayMode = NCWidgetDisplayModeExpanded;
+    } else {
+        self.preferredContentSize = CGSizeMake(320, self.calendarHeight.constant);
+    }
     
 }
 
+- (void)widgetActiveDisplayModeDidChange:(NCWidgetDisplayMode)activeDisplayMode withMaximumSize:(CGSize)maxSize
+{
+    if (activeDisplayMode == NCWidgetDisplayModeCompact) {
+        [self.calendar setScope:FSCalendarScopeWeek animated:YES];
+        self.calendar.appearance.headerMinimumDissolvedAlpha = 0;
+        self.prevButton.hidden = NO;
+        self.nextButton.hidden = NO;
+    } else if (activeDisplayMode == NCWidgetDisplayModeExpanded) {
+        [self.calendar setScope:FSCalendarScopeMonth animated:YES];
+        self.calendar.appearance.headerMinimumDissolvedAlpha = 0.5;
+        self.prevButton.hidden = YES;
+        self.nextButton.hidden = YES;
+    }
+}
+
 - (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))completionHandler
 {
-    [self.calendar reloadData];
+    // Perform any setup necessary in order to update the view.
+    
+    // If an error is encountered, use NCUpdateResultFailed
+    // If there's no update required, use NCUpdateResultNoData
+    // If there's an update, use NCUpdateResultNewData
+    
     completionHandler(NCUpdateResultNewData);
 }
 
@@ -50,6 +75,13 @@ - (UIEdgeInsets)widgetMarginInsetsForProposedMarginInsets:(UIEdgeInsets)defaultM
     return UIEdgeInsetsZero;
 }
 
+- (void)calendar:(FSCalendar *)calendar boundingRectWillChange:(CGRect)bounds animated:(BOOL)animated
+{
+    self.calendarHeight.constant = CGRectGetHeight(bounds);
+    self.preferredContentSize = CGSizeMake(320, self.calendarHeight.constant);
+    [self.view layoutIfNeeded];
+}
+
 - (UIColor *)calendar:(FSCalendar *)calendar appearance:(FSCalendarAppearance *)appearance borderDefaultColorForDate:(NSDate *)date
 {
     return [self.gregorian isDateInToday:date] ? appearance.todayColor : nil;
@@ -73,13 +105,16 @@ - (NSString *)calendar:(FSCalendar *)calendar subtitleForDate:(NSDate *)date
 
 - (IBAction)prevClicked:(id)sender
 {
-    NSDate *prevPage = [self.gregorian dateByAddingUnit:NSCalendarUnitMonth value:-1 toDate:self.calendar.currentPage options:0];
+    NSCalendarUnit unit = (self.calendar.scope==FSCalendarScopeMonth) ? NSCalendarUnitMonth : NSCalendarUnitWeekOfYear;
+    NSDate *prevPage = [self.gregorian dateByAddingUnit:unit value:-1 toDate:self.calendar.currentPage options:0];
     [self.calendar setCurrentPage:prevPage animated:YES];
+    
 }
 
 - (IBAction)nextClicked:(id)sender
 {
-    NSDate *nextPage = [self.gregorian dateByAddingUnit:NSCalendarUnitMonth value:1 toDate:self.calendar.currentPage options:0];
+    NSCalendarUnit unit = (self.calendar.scope==FSCalendarScopeMonth) ? NSCalendarUnitMonth : NSCalendarUnitWeekOfYear;
+    NSDate *nextPage = [self.gregorian dateByAddingUnit:unit value:1 toDate:self.calendar.currentPage options:0];
     [self.calendar setCurrentPage:nextPage animated:YES];
 }
 
diff --git a/TodayExtensionExample/TodayExtensionExample.xcodeproj/project.pbxproj b/TodayExtensionExample/TodayExtensionExample.xcodeproj/project.pbxproj
index a0b778bc..046f5567 100644
--- a/TodayExtensionExample/TodayExtensionExample.xcodeproj/project.pbxproj
+++ b/TodayExtensionExample/TodayExtensionExample.xcodeproj/project.pbxproj
@@ -34,6 +34,7 @@
 		309175AB1D7EBD6100BBEB79 /* TodayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 309175AA1D7EBD6100BBEB79 /* TodayViewController.m */; };
 		309175AE1D7EBD6100BBEB79 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 309175AC1D7EBD6100BBEB79 /* MainInterface.storyboard */; };
 		309175B21D7EBD6100BBEB79 /* TodayExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 309175A41D7EBD6100BBEB79 /* TodayExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		30EDD2961D98C93B009D6CA3 /* Image.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 30EDD2951D98C93B009D6CA3 /* Image.xcassets */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -110,6 +111,7 @@
 		309175AA1D7EBD6100BBEB79 /* TodayViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TodayViewController.m; sourceTree = "<group>"; };
 		309175AD1D7EBD6100BBEB79 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
 		309175AF1D7EBD6100BBEB79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		30EDD2951D98C93B009D6CA3 /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -134,11 +136,6 @@
 		300036CA1D9252CB00C795DE /* FSCalendar */ = {
 			isa = PBXGroup;
 			children = (
-				300036CB1D9252CB00C795DE /* CALayer+FSExtension.h */,
-				300036CC1D9252CB00C795DE /* CALayer+FSExtension.m */,
-				300036CD1D9252CB00C795DE /* FSCalendar+Deprecated.m */,
-				300036CE1D9252CB00C795DE /* FSCalendar+IBExtension.h */,
-				300036CF1D9252CB00C795DE /* FSCalendar+IBExtension.m */,
 				300036D01D9252CB00C795DE /* FSCalendar.h */,
 				300036D11D9252CB00C795DE /* FSCalendar.m */,
 				300036D21D9252CB00C795DE /* FSCalendarAnimator.h */,
@@ -162,11 +159,16 @@
 				300036E41D9252CB00C795DE /* FSCalendarScopeHandle.m */,
 				300036E51D9252CB00C795DE /* FSCalendarStickyHeader.h */,
 				300036E61D9252CB00C795DE /* FSCalendarStickyHeader.m */,
-				300036E71D9252CB00C795DE /* Info.plist */,
+				300036CD1D9252CB00C795DE /* FSCalendar+Deprecated.m */,
+				300036CE1D9252CB00C795DE /* FSCalendar+IBExtension.h */,
+				300036CF1D9252CB00C795DE /* FSCalendar+IBExtension.m */,
 				300036E81D9252CB00C795DE /* NSObject+FSExtension.h */,
 				300036E91D9252CB00C795DE /* NSObject+FSExtension.m */,
 				300036EA1D9252CB00C795DE /* UIView+FSExtension.h */,
 				300036EB1D9252CB00C795DE /* UIView+FSExtension.m */,
+				300036CB1D9252CB00C795DE /* CALayer+FSExtension.h */,
+				300036CC1D9252CB00C795DE /* CALayer+FSExtension.m */,
+				300036E71D9252CB00C795DE /* Info.plist */,
 			);
 			name = FSCalendar;
 			path = ../../FSCalendar;
@@ -229,6 +231,7 @@
 				300036CA1D9252CB00C795DE /* FSCalendar */,
 				309175A91D7EBD6100BBEB79 /* TodayViewController.h */,
 				309175AA1D7EBD6100BBEB79 /* TodayViewController.m */,
+				30EDD2951D98C93B009D6CA3 /* Image.xcassets */,
 				309175AC1D7EBD6100BBEB79 /* MainInterface.storyboard */,
 				309175AF1D7EBD6100BBEB79 /* Info.plist */,
 			);
@@ -326,6 +329,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				300036FA1D9252CB00C795DE /* Info.plist in Resources */,
+				30EDD2961D98C93B009D6CA3 /* Image.xcassets in Resources */,
 				309175AE1D7EBD6100BBEB79 /* MainInterface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
index b376f48a..577719ec 100644
--- a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,15 +1,33 @@
 {
   "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x-1.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
@@ -24,6 +42,18 @@
       "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "60x60",
       "idiom" : "iphone",
@@ -36,6 +66,18 @@
       "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
@@ -45,7 +87,7 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x-2.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
@@ -57,7 +99,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
@@ -77,62 +119,10 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-App-29x29@3x.png",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
-  },
-  "properties" : {
-    "pre-rendered" : true
   }
 }
\ No newline at end of file
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 00000000..da3746c1
Binary files /dev/null and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 00000000..6d048d3a
Binary files /dev/null and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 00000000..2d043288
Binary files /dev/null and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 17306e3c..b2312ede 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 40398222..00000000
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png and /dev/null differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png
deleted file mode 100644
index 40398222..00000000
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-2.png and /dev/null differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 40398222..68b9155c 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png
deleted file mode 100644
index 70ca9c99..00000000
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x-1.png and /dev/null differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 70ca9c99..0eeaaa7e 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 1b9d4083..6d048d3a 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
deleted file mode 100644
index 5184c879..00000000
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png and /dev/null differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 5184c879..a9042cd4 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 03278121..ede761d3 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..c14220ee
Binary files /dev/null and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..8477219a
Binary files /dev/null and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 03278121..ede761d3 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 93c0d677..c06a07c0 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 773a0694..71871636 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 43029573..1fb418b1 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index b7bdda52..277a6f20 100644
Binary files a/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/TodayExtensionExample/TodayExtensionExample/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/TodayExtensionExample/TodayExtensionExample/Base.lproj/Main.storyboard b/TodayExtensionExample/TodayExtensionExample/Base.lproj/Main.storyboard
index a76d15cb..0ccb7130 100644
--- a/TodayExtensionExample/TodayExtensionExample/Base.lproj/Main.storyboard
+++ b/TodayExtensionExample/TodayExtensionExample/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,9 +15,9 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>