Recreated original context menu. Can now hide date.

OtaClock/Base.lproj/MainMenu.xib

                 </connections>
             </view>
             <connections>
+                <outlet property="alarmDatePicker" destination="A2I-e6-ur5" id="wh1-Z1-r9q"/>
                 <outlet property="changeSize1" destination="Acr-Ff-Lm2" id="qUp-XP-Ffo"/>
+                <outlet property="changeSize10" destination="eMz-8d-XLg" id="Ppm-Gu-5xS"/>
                 <outlet property="changeSize2" destination="sRn-WM-cKW" id="luN-Dk-xw4"/>
                 <outlet property="changeSize3" destination="Ynv-fd-dtQ" id="QeL-wH-eAC"/>
                 <outlet property="changeSize4" destination="rKj-Pe-N3u" id="tmN-AZ-egV"/>
                 <outlet property="changeSize5" destination="Qji-aB-KLD" id="a79-d3-RIN"/>
-                <outlet property="keepOnTopItem" destination="bk2-WG-9eq" id="vBf-vA-eXc"/>
-                <outlet property="lockPositionItem" destination="YfQ-b7-bXC" id="CYs-rk-6GP"/>
+                <outlet property="changeSize6" destination="RvN-WU-vpJ" id="hlG-6e-JmA"/>
+                <outlet property="changeSize7" destination="7sp-5h-kYL" id="ore-Fs-2W9"/>
+                <outlet property="changeSize8" destination="WnO-2m-uXI" id="jKZ-CW-zyj"/>
+                <outlet property="changeSize9" destination="NhP-qX-OsO" id="yL9-ON-q1Y"/>
+                <outlet property="keepOnTopItem" destination="LVI-ch-nme" id="lL1-Yi-zMN"/>
+                <outlet property="lockPositionItem" destination="ShL-8K-SbX" id="ppY-l8-Bda"/>
                 <outlet property="mainView" destination="EiT-Mj-1SZ" id="sQZ-BE-YrX"/>
+                <outlet property="setAlarmItem" destination="IRB-i7-bez" id="V2f-2Y-Eyh"/>
+                <outlet property="showDateItem" destination="0Cy-4I-9bF" id="T7y-ik-8nT"/>
             </connections>
-            <point key="canvasLocation" x="129.5" y="81"/>
+            <point key="canvasLocation" x="-147.5" y="74"/>
         </window>
         <menu id="v1Z-w4-vhP">
             <items>
-                <menuItem title="Change Size" id="msY-7t-C9j">
+                <menuItem title="View" id="aaw-ha-cZ9">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Change Size" id="b3j-Lp-Mui">
+                    <menu key="submenu" title="View" id="xOl-as-LSf">
                         <items>
-                            <menuItem title="1x" id="Acr-Ff-Lm2">
+                            <menuItem title="Military Time" id="Cgd-DK-xB0">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem title="Alarm Mode" id="S8W-ak-RY9">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem title="Show Date" id="0Cy-4I-9bF">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="showDate:" target="QvC-M9-y7g" id="BSR-q0-DhH"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Always on Top" id="LVI-ch-nme">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="keepOnTop:" target="QvC-M9-y7g" id="vsX-bh-Qvw"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Fix Location" id="ShL-8K-SbX">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="lockPosition:" target="QvC-M9-y7g" id="FPS-80-FZS"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Drop Shadow" id="4eS-hA-ECa">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Size" id="msY-7t-C9j">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Size" id="b3j-Lp-Mui">
+                        <items>
+                            <menuItem title="x1" id="Acr-Ff-Lm2">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="changeSize:" target="QvC-M9-y7g" id="LdY-jb-6Tw"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="2x" id="sRn-WM-cKW">
+                            <menuItem title="x2" id="sRn-WM-cKW">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="changeSize:" target="QvC-M9-y7g" id="Nvd-gD-ixJ"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="3x" id="Ynv-fd-dtQ">
+                            <menuItem title="x3" id="Ynv-fd-dtQ">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="changeSize:" target="QvC-M9-y7g" id="Nrc-zM-1sT"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="4x" id="rKj-Pe-N3u">
+                            <menuItem title="x4" id="rKj-Pe-N3u">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="changeSize:" target="QvC-M9-y7g" id="QoN-cm-k5P"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="5x" id="Qji-aB-KLD">
+                            <menuItem title="x5" id="Qji-aB-KLD">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="changeSize:" target="QvC-M9-y7g" id="Y9P-XF-cjZ"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="x6" id="RvN-WU-vpJ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeSize:" target="QvC-M9-y7g" id="ZKN-ZR-4XG"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="x7" id="7sp-5h-kYL">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeSize:" target="QvC-M9-y7g" id="0n8-RW-SYP"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="x8" id="WnO-2m-uXI">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeSize:" target="QvC-M9-y7g" id="Qpk-3l-vRh"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="x9" id="NhP-qX-OsO">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeSize:" target="QvC-M9-y7g" id="yBZ-92-wf1"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="x10" id="eMz-8d-XLg">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeSize:" target="QvC-M9-y7g" id="Rkk-RZ-7ki"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>
-                <menuItem isSeparatorItem="YES" id="reI-n6-U2e"/>
-                <menuItem title="Lock position" id="YfQ-b7-bXC">
+                <menuItem title="Alarm" id="nsi-HU-yLS">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="lockPosition:" target="QvC-M9-y7g" id="l9S-pc-JSb"/>
-                    </connections>
+                    <menu key="submenu" title="Alarm" id="9Ra-Fc-lVu">
+                        <items>
+                            <menuItem title="&quot;LAUGH&quot;" id="62g-Ai-pTm">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem title="&quot;OK&quot;" id="Nn9-Q1-6Xe">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="cE8-kx-VzJ"/>
+                            <menuItem title="WAVE File" id="gKE-dz-bZ5">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem title="WAVE File (LOOP)" id="4Hq-h0-hMx">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="AKe-eD-qSj"/>
+                            <menuItem title="Alarm Buzzer Duration" id="sgQ-pO-ctj">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Alarm Buzzer Duration" id="d9P-wR-AG3">
+                                    <items>
+                                        <menuItem title="5 sec" id="vDE-9f-4z8">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem title="10 sec" id="lT0-pq-3Z3">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem title="30 sec" id="qaN-tN-4mB">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem title="60 sec" id="Wqq-BO-KhH">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
                 </menuItem>
-                <menuItem title="Keep on top" id="bk2-WG-9eq">
+                <menuItem isSeparatorItem="YES" id="reI-n6-U2e"/>
+                <menuItem title="Set Alarm" id="Xnn-ra-5vW">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="keepOnTop:" target="QvC-M9-y7g" id="b6a-ad-4oz"/>
-                    </connections>
+                    <menu key="submenu" title="Set Alarm" id="wYe-EL-D4t">
+                        <items>
+                            <menuItem title="Item" id="IRB-i7-bez">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
+                        </items>
+                    </menu>
                 </menuItem>
-                <menuItem isSeparatorItem="YES" id="aVS-e6-OtM"/>
+                <menuItem isSeparatorItem="YES" id="MRz-da-sGL"/>
                 <menuItem title="About OtaClock" id="Tlq-91-8IJ">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
                         <action selector="orderFrontStandardAboutPanel:" target="-1" id="VRw-6e-aO6"/>
                     </connections>
                 </menuItem>
+                <menuItem isSeparatorItem="YES" id="aST-Bj-tTS"/>
                 <menuItem title="Quit OtaClock" keyEquivalent="q" id="BNj-pS-CpH">
                     <connections>
                         <action selector="terminate:" target="-1" id="19f-sZ-hYK"/>
                     </connections>
                 </menuItem>
             </items>
-            <point key="canvasLocation" x="376" y="304.5"/>
+            <point key="canvasLocation" x="292.5" y="80.5"/>
         </menu>
+        <datePicker verticalHuggingPriority="750" id="A2I-e6-ur5">
+            <rect key="frame" x="0.0" y="0.0" width="278" height="148"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <datePickerCell key="cell" borderStyle="bezel" alignment="left" datePickerStyle="clockAndCalendar" id="aSU-YP-y5q">
+                <font key="font" metaFont="system"/>
+                <calendarDate key="date" timeIntervalSinceReferenceDate="-595929600" calendarFormat="%Y-%m-%d %H:%M:%S %z">
+                    <!--1982-02-12 16:00:00 +0000-->
+                    <timeZone key="timeZone" name="US/Pacific"/>
+                </calendarDate>
+                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                <datePickerElements key="datePickerElements" year="YES" month="YES" day="YES" hour="YES" minute="YES" second="YES"/>
+            </datePickerCell>
+            <connections>
+                <action selector="alarmDateSelected:" target="QvC-M9-y7g" id="ghc-DM-FuW"/>
+            </connections>
+            <point key="canvasLocation" x="121.5" y="377"/>
+        </datePicker>
     </objects>
 </document>

OtaClock/Images.xcassets/blank.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "blank.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

OtaClock/Info.plist

 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>259</string>
+	<string>291</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

OtaClock/MainWindow.m

 #import "MainWindow.h"
 
 #define RESIZE_START 1
-#define RESIZE_END 5
+#define RESIZE_END 10
 #define RESIZE_STEP 1
 
 #define CONFIG_START_SCALE @"window_scale"
 #define CONFIG_KEEP_POSITION @"keep_position"
 #define CONFIG_KEEP_ON_TOP @"keep_on_top"
+#define CONFIG_MILITARY_TIME @"military_time"
+#define CONFIG_SHOW_DATE @"show_date"
+#define CONFIG_ALARM_TIME @"alarm_time"
 
 #define MOUSE_CENTER_X 67
 #define MOUSE_CENTER_Y 47
 @property (assign) NSSize defaultSize;
 @property (assign) NSInteger startScale;
 @property (assign) NSInteger lastEyeState;
-@property (assign) BOOL currentlyBlinking;
+@property (assign) BOOL currentlyBlinking, showDate;
 
 @property (weak) IBOutlet MainView *mainView;
+@property (weak) IBOutlet NSDatePicker *alarmDatePicker;
 
 @property (weak) IBOutlet NSMenuItem *lockPositionItem;
 @property (weak) IBOutlet NSMenuItem *keepOnTopItem;
+@property (weak) IBOutlet NSMenuItem *setAlarmItem;
+@property (weak) IBOutlet NSMenuItem *showDateItem;
 
 @property (weak) IBOutlet NSMenuItem *changeSize1;
 @property (weak) IBOutlet NSMenuItem *changeSize2;
 @property (weak) IBOutlet NSMenuItem *changeSize3;
 @property (weak) IBOutlet NSMenuItem *changeSize4;
 @property (weak) IBOutlet NSMenuItem *changeSize5;
+@property (weak) IBOutlet NSMenuItem *changeSize6;
+@property (weak) IBOutlet NSMenuItem *changeSize7;
+@property (weak) IBOutlet NSMenuItem *changeSize8;
+@property (weak) IBOutlet NSMenuItem *changeSize9;
+@property (weak) IBOutlet NSMenuItem *changeSize10;
 
 @end
 
 @synthesize defaultSize;
 @synthesize startScale;
 @synthesize lastEyeState;
-@synthesize currentlyBlinking;
+@synthesize currentlyBlinking, showDate;
 
 - (id)initWithContentRect:(NSRect)contentRect
                styleMask:(NSUInteger)aStyle
     if (startScale == 3) [self.changeSize3 setState:NSOnState];
     if (startScale == 4) [self.changeSize4 setState:NSOnState];
     if (startScale == 5) [self.changeSize5 setState:NSOnState];
+    if (startScale == 6) [self.changeSize6 setState:NSOnState];
+    if (startScale == 7) [self.changeSize7 setState:NSOnState];
+    if (startScale == 8) [self.changeSize8 setState:NSOnState];
+    if (startScale == 9) [self.changeSize9 setState:NSOnState];
+    if (startScale == 10) [self.changeSize10 setState:NSOnState];
     
     [[self.mainView render] drawWithEye:lastEyeState]; // Initialize render image
     [self unblink]; // Schedule next blinking
     [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
     [self updateTime:nil];
     
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    // load alarm date
+    if ([defaults objectForKey:CONFIG_ALARM_TIME] == nil) {
+        self.alarmDatePicker.dateValue = [NSDate date];
+    } else {
+        self.alarmDatePicker.dateValue = [defaults objectForKey:CONFIG_ALARM_TIME];
+    }
+    self.setAlarmItem.view = self.alarmDatePicker;
+    
+    // load show date state
+    if ([defaults objectForKey:CONFIG_SHOW_DATE] == nil) {
+        showDate = YES;
+    } else {
+        showDate = [defaults boolForKey:CONFIG_SHOW_DATE];
+    }
+    if (showDate == YES) {
+        self.showDateItem.state = NSOnState;
+    } else {
+        self.showDateItem.state = NSOffState;
+    }
+    
+    [[self.mainView render] drawDate:showDate];
+    
     [self setFrame:frame display:YES];
 }
 
     [self performSelector:@selector(blink) withObject:nil afterDelay:(((float)rand() / RAND_MAX) * MAX_BLINK_DELAY)];
 }
 
+- (IBAction)alarmDateSelected:(id)sender {
+    // TODO do something with this alarm time...
+    
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:self.alarmDatePicker.dateValue forKey:CONFIG_ALARM_TIME];
+    [defaults synchronize];
+}
+
+- (IBAction)showDate:(id)sender {
+    if (showDate == YES) {
+        showDate = NO;
+        self.showDateItem.state = NSOffState;
+    } else {
+        showDate = YES;
+        self.showDateItem.state = NSOnState;
+    }
+    [[self.mainView render] drawDate:showDate];
+    
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setBool:showDate forKey:CONFIG_SHOW_DATE];
+    [defaults synchronize];
+}
+
 - (IBAction)changeSize:(NSMenuItem *)sender {
     NSRect frame = [self frame];
     
     [self.changeSize3 setState:NSOffState];
     [self.changeSize4 setState:NSOffState];
     [self.changeSize5 setState:NSOffState];
+    [self.changeSize6 setState:NSOffState];
+    [self.changeSize7 setState:NSOffState];
+    [self.changeSize8 setState:NSOffState];
+    [self.changeSize9 setState:NSOffState];
+    [self.changeSize10 setState:NSOffState];
     
     BOOL found = NO;
     for (int i = RESIZE_START; i <= RESIZE_END; i += RESIZE_STEP) {
-        NSString *title = [NSString stringWithFormat:@"%dx", i];
+        NSString *title = [NSString stringWithFormat:@"x%d", i];
         if ([[sender title] isEqualToString:title]) {
             [sender setState:NSOnState];
             NSSize newSize = defaultSize;

OtaClock/Render.h

 - (id)initWithParent:(MainView *)par;
 - (NSSize)baseSize;
 
+- (void)drawDate:(BOOL)draw;
 - (void)drawWithDate:(NSDate *)date;
 - (void)drawWithEye:(NSInteger)eyeIndex;
 - (void)drawInto:(NSView *)view;

OtaClock/Render.m

 #define DOTS_ALARM_X_OFFSET 38
 #define DOTS_ALARM_Y_OFFSET 57
 
+#define BLANK_OFFSET_X 13
+#define BLANK_OFFSET_Y 71
+
 @interface Render ()
 
-@property (assign) CGImageRef otaconGraphic, bubbleGraphic, alarmGraphic;
+@property (assign) CGImageRef otaconGraphic, bubbleGraphic, alarmGraphic, blankGraphic;
 @property (assign) CGImageRef eye0, eye1, eye2, eye3, eye4, dotSmallGraphic, dotLargeGraphic;
 @property (assign) CGImageRef fontMonday, fontTuesday, fontWednesday, fontThursday, fontFriday, fontSaturday, fontSunday;
 @property (assign) CGImageRef fontSmall1, fontSmall2, fontSmall3, fontSmall4, fontSmall5, fontSmall6, fontSmall7, fontSmall8, fontSmall9, fontSmall0;
 @property (assign) NSInteger dateDigit0, dateDigit1, dateDigit2, dateDigit3;
 @property (assign) NSInteger alarmDigit0, alarmDigit1, alarmDigit2, alarmDigit3;
 @property (assign) NSInteger timeDigit0, timeDigit1, timeDigit2, timeDigit3, timeDigit4, timeDigit5;
-@property (assign) BOOL alarmSign, alarmDots, timeDots;
+@property (assign) BOOL alarmSign, alarmDots, timeDots, drawDate;
 
 @property (assign) NSSize fullSize;
 @property (assign) CGContextRef drawContext;
 
 @implementation Render
 
-@synthesize otaconGraphic, bubbleGraphic, alarmGraphic;
+@synthesize otaconGraphic, bubbleGraphic, alarmGraphic, blankGraphic;
 @synthesize eye0, eye1, eye2, eye3, eye4, dotSmallGraphic, dotLargeGraphic;
 @synthesize fontMonday, fontTuesday, fontWednesday, fontThursday, fontFriday, fontSaturday, fontSunday;
 @synthesize fontSmall1, fontSmall2, fontSmall3, fontSmall4, fontSmall5, fontSmall6, fontSmall7, fontSmall8, fontSmall9, fontSmall0;
 @synthesize dateDigit0, dateDigit1, dateDigit2, dateDigit3;
 @synthesize alarmDigit0, alarmDigit1, alarmDigit2, alarmDigit3;
 @synthesize timeDigit0, timeDigit1, timeDigit2, timeDigit3, timeDigit4, timeDigit5;
-@synthesize alarmSign, alarmDots, timeDots;
+@synthesize alarmSign, alarmDots, timeDots, drawDate;
 
 @synthesize fullSize;
 @synthesize drawContext;
     NSImage *alarmImage = [NSImage imageNamed:@"alarm"];
     NSImage *dotsSmallImage = [NSImage imageNamed:@"dots_small"];
     NSImage *dotsLargeImage = [NSImage imageNamed:@"dots_large"];
+    NSImage *blankImage = [NSImage imageNamed:@"blank"];
     
     NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithAttributes:nil];
     
     alarmGraphic = [alarmImage CGImageForProposedRect:nil context:context hints:nil];
     dotSmallGraphic = [dotsSmallImage CGImageForProposedRect:nil context:context hints:nil];
     dotLargeGraphic = [dotsLargeImage CGImageForProposedRect:nil context:context hints:nil];
+    blankGraphic = [blankImage CGImageForProposedRect:nil context:context hints:nil];
     eye0 = [eye0Image CGImageForProposedRect:nil context:context hints:nil];
     eye1 = [eye1Image CGImageForProposedRect:nil context:context hints:nil];
     eye2 = [eye2Image CGImageForProposedRect:nil context:context hints:nil];
     } \
 } while (0);
 
+- (void)drawDate:(BOOL)draw {
+    drawDate = draw;
+}
+
 - (void)drawWithDate:(NSDate *)date {
     NSCalendarUnit comps = NSWeekdayCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
     NSDateComponents *components = [[NSCalendar currentCalendar] components:comps fromDate:date];
     size.origin.y = BUBBLE_Y_OFFSET;
     CGContextDrawImage(drawContext, size, bubbleGraphic);
 
-    // Draw Date
-    size.size.width = FONT_SMALL_WIDTH;
-    size.size.height = FONT_SMALL_HEIGHT;
-    size.origin.y = FONT_SMALL_DATE_Y_OFFSET;
-    if (dateDigit0 == 1) {
-        size.origin.x = FONT_SMALL_DATE_X0_OFFSET;
-        CGContextDrawImage(drawContext, size, fontSmall1);
+    if (drawDate == YES) {
+        // Draw Date
+        size.size.width = FONT_SMALL_WIDTH;
+        size.size.height = FONT_SMALL_HEIGHT;
+        size.origin.y = FONT_SMALL_DATE_Y_OFFSET;
+        if (dateDigit0 == 1) {
+            size.origin.x = FONT_SMALL_DATE_X0_OFFSET;
+            CGContextDrawImage(drawContext, size, fontSmall1);
+        }
+        if ((dateDigit1 >= 0) && (dateDigit1 <= 9)) {
+            size.origin.x = FONT_SMALL_DATE_X1_OFFSET;
+            CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit1]);
+        }
+        if ((dateDigit2 >= 0) && (dateDigit2 <= 9)) {
+            size.origin.x = FONT_SMALL_DATE_X2_OFFSET;
+            CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit2]);
+        }
+        if ((dateDigit3 >= 0) && (dateDigit3 <= 9)) {
+            size.origin.x = FONT_SMALL_DATE_X3_OFFSET;
+            CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit3]);
+        }
+
+        // Draw Day of Week
+        CGImageRef day = [self dayHelper:dayOfWeek];
+        size.size.width = FONT_DAYS_WIDTH;
+        size.size.height = FONT_DAYS_HEIGHT;
+        size.origin.x = FONT_DAYS_X_OFFSET;
+        size.origin.y = FONT_DAYS_Y_OFFSET;
+        CGContextDrawImage(drawContext, size, day);
+    } else {
+        // Block unneeded date elements
+        size.size.width = CGImageGetWidth(blankGraphic);
+        size.size.height = CGImageGetHeight(blankGraphic);
+        size.origin.x = BLANK_OFFSET_X;
+        size.origin.y = BLANK_OFFSET_Y;
+        CGContextDrawImage(drawContext, size, blankGraphic);
     }
-    if ((dateDigit1 >= 0) && (dateDigit1 <= 9)) {
-        size.origin.x = FONT_SMALL_DATE_X1_OFFSET;
-        CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit1]);
-    }
-    if ((dateDigit2 >= 0) && (dateDigit2 <= 9)) {
-        size.origin.x = FONT_SMALL_DATE_X2_OFFSET;
-        CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit2]);
-    }
-    if ((dateDigit3 >= 0) && (dateDigit3 <= 9)) {
-        size.origin.x = FONT_SMALL_DATE_X3_OFFSET;
-        CGContextDrawImage(drawContext, size, [self smallHelper:dateDigit3]);
-    }
-
-    // Draw Day of Week
-    CGImageRef day = [self dayHelper:dayOfWeek];
-    size.size.width = FONT_DAYS_WIDTH;
-    size.size.height = FONT_DAYS_HEIGHT;
-    size.origin.x = FONT_DAYS_X_OFFSET;
-    size.origin.y = FONT_DAYS_Y_OFFSET;
-    CGContextDrawImage(drawContext, size, day);
     
     // Draw Time
     size.size.width = FONT_LARGE_WIDTH;