diff --git a/2-colour/Assistant-Bold.ttf b/2-colour/Assistant-Bold.ttf
new file mode 100644
index 0000000..4a58b5b
Binary files /dev/null and b/2-colour/Assistant-Bold.ttf differ
diff --git a/2-colour/OpenSans-Bold.ttf b/2-colour/OpenSans-Bold.ttf
new file mode 100644
index 0000000..df328ef
Binary files /dev/null and b/2-colour/OpenSans-Bold.ttf differ
diff --git a/2-colour/OpenSans-Semibold.ttf b/2-colour/OpenSans-Semibold.ttf
new file mode 100644
index 0000000..6b44ec1
Binary files /dev/null and b/2-colour/OpenSans-Semibold.ttf differ
diff --git a/2-colour/calibration.py b/2-colour/calibration.py
new file mode 100644
index 0000000..233d48b
--- /dev/null
+++ b/2-colour/calibration.py
@@ -0,0 +1,31 @@
+"""
+Calibration module for the 2-Colour E-Paper Calendar display. Running this script
+helps to 'flush' all the pixels and retain the colour on the display.
+"""
+import epd7in5
+from PIL import Image, ImageDraw, ImageFont
+EPD_WIDTH = 640
+EPD_HEIGHT = 384
+epd = epd7in5.EPD()
+
+def calibration():
+    for i in range(2):
+        epd.init()
+        black = Image.new('1', (EPD_WIDTH, EPD_HEIGHT), 0)
+        print('calibrating black...')
+        ImageDraw.Draw(black)
+        epd.display_frame(epd.get_frame_buffer(black))
+        
+        white = Image.new('1', (EPD_WIDTH, EPD_HEIGHT), 255)
+        ImageDraw.Draw(white)
+        print('calibrating white...')
+        epd.display_frame(epd.get_frame_buffer(white))
+        epd.sleep()
+    print('Cycle complete!')
+
+def main():
+    for i in range(1):
+        calibration()
+
+if __name__ == '__main__':
+    main()
diff --git a/2-colour/days/0.bmp b/2-colour/days/0.bmp
new file mode 100644
index 0000000..4f59226
Binary files /dev/null and b/2-colour/days/0.bmp differ
diff --git a/2-colour/days/1.bmp b/2-colour/days/1.bmp
new file mode 100644
index 0000000..545dca2
Binary files /dev/null and b/2-colour/days/1.bmp differ
diff --git a/2-colour/days/10.bmp b/2-colour/days/10.bmp
new file mode 100644
index 0000000..0ff9d18
Binary files /dev/null and b/2-colour/days/10.bmp differ
diff --git a/2-colour/days/11.bmp b/2-colour/days/11.bmp
new file mode 100644
index 0000000..ab621aa
Binary files /dev/null and b/2-colour/days/11.bmp differ
diff --git a/2-colour/days/12.bmp b/2-colour/days/12.bmp
new file mode 100644
index 0000000..3910bf5
Binary files /dev/null and b/2-colour/days/12.bmp differ
diff --git a/2-colour/days/13.bmp b/2-colour/days/13.bmp
new file mode 100644
index 0000000..031d5f3
Binary files /dev/null and b/2-colour/days/13.bmp differ
diff --git a/2-colour/days/14.bmp b/2-colour/days/14.bmp
new file mode 100644
index 0000000..0fa2432
Binary files /dev/null and b/2-colour/days/14.bmp differ
diff --git a/2-colour/days/15.bmp b/2-colour/days/15.bmp
new file mode 100644
index 0000000..ad958c4
Binary files /dev/null and b/2-colour/days/15.bmp differ
diff --git a/2-colour/days/16.bmp b/2-colour/days/16.bmp
new file mode 100644
index 0000000..3655da1
Binary files /dev/null and b/2-colour/days/16.bmp differ
diff --git a/2-colour/days/17.bmp b/2-colour/days/17.bmp
new file mode 100644
index 0000000..f358cb9
Binary files /dev/null and b/2-colour/days/17.bmp differ
diff --git a/2-colour/days/18.bmp b/2-colour/days/18.bmp
new file mode 100644
index 0000000..b7e7f36
Binary files /dev/null and b/2-colour/days/18.bmp differ
diff --git a/2-colour/days/19.bmp b/2-colour/days/19.bmp
new file mode 100644
index 0000000..3ba11c0
Binary files /dev/null and b/2-colour/days/19.bmp differ
diff --git a/2-colour/days/2.bmp b/2-colour/days/2.bmp
new file mode 100644
index 0000000..49c66e1
Binary files /dev/null and b/2-colour/days/2.bmp differ
diff --git a/2-colour/days/20.bmp b/2-colour/days/20.bmp
new file mode 100644
index 0000000..8666cfa
Binary files /dev/null and b/2-colour/days/20.bmp differ
diff --git a/2-colour/days/21.bmp b/2-colour/days/21.bmp
new file mode 100644
index 0000000..f2b42be
Binary files /dev/null and b/2-colour/days/21.bmp differ
diff --git a/2-colour/days/22.bmp b/2-colour/days/22.bmp
new file mode 100644
index 0000000..5ade4b5
Binary files /dev/null and b/2-colour/days/22.bmp differ
diff --git a/2-colour/days/23.bmp b/2-colour/days/23.bmp
new file mode 100644
index 0000000..7a263e7
Binary files /dev/null and b/2-colour/days/23.bmp differ
diff --git a/2-colour/days/24.bmp b/2-colour/days/24.bmp
new file mode 100644
index 0000000..cd8a373
Binary files /dev/null and b/2-colour/days/24.bmp differ
diff --git a/2-colour/days/25.bmp b/2-colour/days/25.bmp
new file mode 100644
index 0000000..6ddbb04
Binary files /dev/null and b/2-colour/days/25.bmp differ
diff --git a/2-colour/days/26.bmp b/2-colour/days/26.bmp
new file mode 100644
index 0000000..418114c
Binary files /dev/null and b/2-colour/days/26.bmp differ
diff --git a/2-colour/days/27.bmp b/2-colour/days/27.bmp
new file mode 100644
index 0000000..213917c
Binary files /dev/null and b/2-colour/days/27.bmp differ
diff --git a/2-colour/days/28.bmp b/2-colour/days/28.bmp
new file mode 100644
index 0000000..8ab0ada
Binary files /dev/null and b/2-colour/days/28.bmp differ
diff --git a/2-colour/days/29.bmp b/2-colour/days/29.bmp
new file mode 100644
index 0000000..920350c
Binary files /dev/null and b/2-colour/days/29.bmp differ
diff --git a/2-colour/days/3.bmp b/2-colour/days/3.bmp
new file mode 100644
index 0000000..c2ec20c
Binary files /dev/null and b/2-colour/days/3.bmp differ
diff --git a/2-colour/days/30.bmp b/2-colour/days/30.bmp
new file mode 100644
index 0000000..1053e9e
Binary files /dev/null and b/2-colour/days/30.bmp differ
diff --git a/2-colour/days/31.bmp b/2-colour/days/31.bmp
new file mode 100644
index 0000000..06d1510
Binary files /dev/null and b/2-colour/days/31.bmp differ
diff --git a/2-colour/days/4.bmp b/2-colour/days/4.bmp
new file mode 100644
index 0000000..1738f32
Binary files /dev/null and b/2-colour/days/4.bmp differ
diff --git a/2-colour/days/5.bmp b/2-colour/days/5.bmp
new file mode 100644
index 0000000..bff0bb7
Binary files /dev/null and b/2-colour/days/5.bmp differ
diff --git a/2-colour/days/6.bmp b/2-colour/days/6.bmp
new file mode 100644
index 0000000..cef5d5b
Binary files /dev/null and b/2-colour/days/6.bmp differ
diff --git a/2-colour/days/7.bmp b/2-colour/days/7.bmp
new file mode 100644
index 0000000..1056dda
Binary files /dev/null and b/2-colour/days/7.bmp differ
diff --git a/2-colour/days/8.bmp b/2-colour/days/8.bmp
new file mode 100644
index 0000000..2a14d46
Binary files /dev/null and b/2-colour/days/8.bmp differ
diff --git a/2-colour/days/9.bmp b/2-colour/days/9.bmp
new file mode 100644
index 0000000..6bb4472
Binary files /dev/null and b/2-colour/days/9.bmp differ
diff --git a/2-colour/epd7in5.py b/2-colour/epd7in5.py
new file mode 100644
index 0000000..91bf1eb
--- /dev/null
+++ b/2-colour/epd7in5.py
@@ -0,0 +1,181 @@
+import epdif
+from PIL import Image
+import RPi.GPIO as GPIO
+
+# Display resolution
+EPD_WIDTH       = 640
+EPD_HEIGHT      = 384
+
+# EPD7IN5 commands
+PANEL_SETTING                               = 0x00
+POWER_SETTING                               = 0x01
+POWER_OFF                                   = 0x02
+POWER_OFF_SEQUENCE_SETTING                  = 0x03
+POWER_ON                                    = 0x04
+POWER_ON_MEASURE                            = 0x05
+BOOSTER_SOFT_START                          = 0x06
+DEEP_SLEEP                                  = 0x07
+DATA_START_TRANSMISSION_1                   = 0x10
+DATA_STOP                                   = 0x11
+DISPLAY_REFRESH                             = 0x12
+IMAGE_PROCESS                               = 0x13
+LUT_FOR_VCOM                                = 0x20
+LUT_BLUE                                    = 0x21
+LUT_WHITE                                   = 0x22
+LUT_GRAY_1                                  = 0x23
+LUT_GRAY_2                                  = 0x24
+LUT_RED_0                                   = 0x25
+LUT_RED_1                                   = 0x26
+LUT_RED_2                                   = 0x27
+LUT_RED_3                                   = 0x28
+LUT_XON                                     = 0x29
+PLL_CONTROL                                 = 0x30
+TEMPERATURE_SENSOR_COMMAND                  = 0x40
+TEMPERATURE_CALIBRATION                     = 0x41
+TEMPERATURE_SENSOR_WRITE                    = 0x42
+TEMPERATURE_SENSOR_READ                     = 0x43
+VCOM_AND_DATA_INTERVAL_SETTING              = 0x50
+LOW_POWER_DETECTION                         = 0x51
+TCON_SETTING                                = 0x60
+TCON_RESOLUTION                             = 0x61
+SPI_FLASH_CONTROL                           = 0x65
+REVISION                                    = 0x70
+GET_STATUS                                  = 0x71
+AUTO_MEASUREMENT_VCOM                       = 0x80
+READ_VCOM_VALUE                             = 0x81
+VCM_DC_SETTING                              = 0x82
+
+class EPD:
+    def __init__(self):
+        self.reset_pin = epdif.RST_PIN
+        self.dc_pin = epdif.DC_PIN
+        self.busy_pin = epdif.BUSY_PIN
+        self.width = EPD_WIDTH
+        self.height = EPD_HEIGHT
+
+    def digital_write(self, pin, value):
+        epdif.epd_digital_write(pin, value)
+
+    def digital_read(self, pin):
+        return epdif.epd_digital_read(pin)
+
+    def delay_ms(self, delaytime):
+        epdif.epd_delay_ms(delaytime)
+
+    def send_command(self, command):
+        self.digital_write(self.dc_pin, GPIO.LOW)
+        # the parameter type is list but not int
+        # so use [command] instead of command
+        epdif.spi_transfer([command])
+
+    def send_data(self, data):
+        self.digital_write(self.dc_pin, GPIO.HIGH)
+        # the parameter type is list but not int
+        # so use [data] instead of data
+        epdif.spi_transfer([data])
+
+    def init(self):
+        if (epdif.epd_init() != 0):
+            return -1
+        self.reset()
+
+        self.send_command(POWER_SETTING)
+        self.send_data(0x37)
+        self.send_data(0x00)
+
+        self.send_command(PANEL_SETTING)
+        self.send_data(0xCF)
+        self.send_data(0x08)
+
+        self.send_command(BOOSTER_SOFT_START)
+        self.send_data(0xc7)
+        self.send_data(0xcc)
+        self.send_data(0x28)
+
+        self.send_command(POWER_ON)
+        self.wait_until_idle()
+
+        self.send_command(PLL_CONTROL)
+        self.send_data(0x3c)
+
+        self.send_command(TEMPERATURE_CALIBRATION)
+        self.send_data(0x00)
+
+        self.send_command(VCOM_AND_DATA_INTERVAL_SETTING)
+        self.send_data(0x77)
+
+        self.send_command(TCON_SETTING)
+        self.send_data(0x22)
+
+        self.send_command(TCON_RESOLUTION)
+        self.send_data(0x02)     #source 640
+        self.send_data(0x80)
+        self.send_data(0x01)     #gate 384
+        self.send_data(0x80)
+
+        self.send_command(VCM_DC_SETTING)
+        self.send_data(0x1E)      #decide by LUT file
+
+        self.send_command(0xe5)           #FLASH MODE
+        self.send_data(0x03)
+
+    def wait_until_idle(self):
+        while(self.digital_read(self.busy_pin) == 0):      # 0: busy, 1: idle
+            self.delay_ms(100)
+
+    def reset(self):
+        self.digital_write(self.reset_pin, GPIO.LOW)         # module reset
+        self.delay_ms(200)
+        self.digital_write(self.reset_pin, GPIO.HIGH)
+        self.delay_ms(200)    
+
+    def get_frame_buffer(self, image):
+        buf = [0x00] * int(self.width * self.height / 8)
+        # Set buffer to value of Python Imaging Library image.
+        # Image must be in mode 1.
+        image_monocolor = image.convert('1')
+        imwidth, imheight = image_monocolor.size
+        if imwidth != self.width or imheight != self.height:
+            raise ValueError('Image must be same dimensions as display \
+                ({0}x{1}).' .format(self.width, self.height))
+
+        pixels = image_monocolor.load()
+        for y in range(self.height):
+            for x in range(self.width):
+                # Set the bits for the column of pixels at the current position.
+                if pixels[x, y] != 0:
+                    buf[int((x + y * self.width) / 8)] |= 0x80 >> (x % 8)
+        return buf
+
+    def display_frame(self, frame_buffer):
+        self.send_command(DATA_START_TRANSMISSION_1)
+        for i in range(0, 30720):
+            temp1 = frame_buffer[i]
+            j = 0
+            while (j < 8):
+                if(temp1 & 0x80):
+                    temp2 = 0x03
+                else:
+                    temp2 = 0x00
+                temp2 = (temp2 << 4) & 0xFF
+                temp1 = (temp1 << 1) & 0xFF
+                j += 1
+                if(temp1 & 0x80):
+                    temp2 |= 0x03
+                else:
+                    temp2 |= 0x00
+                temp1 = (temp1 << 1) & 0xFF
+                self.send_data(temp2)
+                j += 1
+        self.send_command(DISPLAY_REFRESH)
+        self.delay_ms(100)
+        self.wait_until_idle()
+
+    def sleep(self):
+        self.send_command(POWER_OFF)
+        self.wait_until_idle()
+        self.send_command(DEEP_SLEEP)
+        self.send_data(0xa5)
+
+### END OF FILE ###
+
diff --git a/2-colour/epdif.py b/2-colour/epdif.py
new file mode 100644
index 0000000..710ee0f
--- /dev/null
+++ b/2-colour/epdif.py
@@ -0,0 +1,37 @@
+import spidev
+import RPi.GPIO as GPIO
+import time
+
+# Pin definition
+RST_PIN         = 17
+DC_PIN          = 25
+CS_PIN          = 8
+BUSY_PIN        = 24
+
+# SPI device, bus = 0, device = 0
+SPI = spidev.SpiDev(0, 0)
+
+def epd_digital_write(pin, value):
+    GPIO.output(pin, value)
+
+def epd_digital_read(pin):
+    return GPIO.input(BUSY_PIN)
+
+def epd_delay_ms(delaytime):
+    time.sleep(delaytime / 1000.0)
+
+def spi_transfer(data):
+    SPI.writebytes(data)
+
+def epd_init():
+    GPIO.setmode(GPIO.BCM)
+    GPIO.setwarnings(False)
+    GPIO.setup(RST_PIN, GPIO.OUT)
+    GPIO.setup(DC_PIN, GPIO.OUT)
+    GPIO.setup(CS_PIN, GPIO.OUT)
+    GPIO.setup(BUSY_PIN, GPIO.IN)
+    SPI.max_speed_hz = 2000000
+    SPI.mode = 0b00
+    return 0;
+
+### END OF FILE ###
diff --git a/2-colour/license b/2-colour/license
new file mode 100644
index 0000000..e026569
--- /dev/null
+++ b/2-colour/license
@@ -0,0 +1,326 @@
+## PYOWM
+The MIT License (MIT)
+
+Copyright (c) 2013 Claudio Sparpaglione
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## ICS
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+## ASSISTANT FONT
+Copyright 2010 The Assistant Project Authors, with Reserved Font Name ‘Source’. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+—————————————————————————————-
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+—————————————————————————————-
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+“Font Software” refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+“Reserved Font Name” refers to any names specified as such after the copyright statement(s).
+
+“Original Version” refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+“Modified Version” refers to any derivative made by adding to, deleting, or substituting—in part or in whole—any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+“Author” refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+## Pillow
+The Python Imaging Library (PIL) is
+
+    Copyright © 1997-2011 by Secret Labs AB
+    Copyright © 1995-2011 by Fredrik Lundh
+
+Pillow is the friendly PIL fork. It is
+
+    Copyright © 2010-2018 by Alex Clark and contributors
+
+Like PIL, Pillow is licensed under the open source PIL Software License:
+
+By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Secret Labs AB or the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
+
+SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+## Waveshare E-Paper libary for python
+  Copyright (C) Waveshare     July 10 2017
+ 
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documnetation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to  whom the Software is
+  furished to do so, subject to the following conditions:
+ 
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+ 
+ 
+## Weather Icons 
+The SIL Open Font License (OFL) is a free, libre and open source license specifically designed for fonts and related software based on our experience in font design and linguistic software engineering.
+
+The OFL provides a legal framework and infrastructure for worldwide development, sharing and improvement of fonts and related software in a collaborative manner. It enables font authors to release their work under a common license that allows use, bundling, modification and redistribution. It encourages shared value, is not limited to any specific computing platform or environment, and can be used by other organizations or individuals.
+
+The OFL meets the specific needs of typographic design and engineering as well as the gold standards of the FLOSS (Free/Libre and Open Source Software) community, namely the cultural values and guidelines from the FSF 1, the Debian Free Software Guidelines2, as well as the Open Source Definition3. It draws inspiration from concepts and elements found in other licenses, but our improvements in the specific area of fonts have made the licensing model work better than other approaches currently in use.
+
+ SIL International serves language communities worldwide, building their capacity for sustainable language development, by means of research, translation, training and materials development. We have been thinking about more open and participative models for a while, for example through our partnerships with UNESCO (Initiative B@bel) and our work on the Gentium typeface. See  www.sil.org/resources/software_fonts for a detailed list of free/libre and open source software resources provided by SIL.
+
+We want to:
+
+enable others to participate in our projects
+enable others to cater to needs for which we don't have the resources
+share our wealth of knowledge and experience in the area of writing systems and pass on our tools
+equip the community to meet its font needs
+We serve the peoples of the world without regard to their material wealth, so we are grateful to those that do fund our work. Please visit  Donate to SIL International for information on supporting our efforts.
diff --git a/2-colour/months/April.bmp b/2-colour/months/April.bmp
new file mode 100644
index 0000000..8aa4785
Binary files /dev/null and b/2-colour/months/April.bmp differ
diff --git a/2-colour/months/August.bmp b/2-colour/months/August.bmp
new file mode 100644
index 0000000..108b0ba
Binary files /dev/null and b/2-colour/months/August.bmp differ
diff --git a/2-colour/months/December.bmp b/2-colour/months/December.bmp
new file mode 100644
index 0000000..a283cc6
Binary files /dev/null and b/2-colour/months/December.bmp differ
diff --git a/2-colour/months/February.bmp b/2-colour/months/February.bmp
new file mode 100644
index 0000000..2c84e26
Binary files /dev/null and b/2-colour/months/February.bmp differ
diff --git a/2-colour/months/January.bmp b/2-colour/months/January.bmp
new file mode 100644
index 0000000..3e0a74f
Binary files /dev/null and b/2-colour/months/January.bmp differ
diff --git a/2-colour/months/July.bmp b/2-colour/months/July.bmp
new file mode 100644
index 0000000..3170c27
Binary files /dev/null and b/2-colour/months/July.bmp differ
diff --git a/2-colour/months/June.bmp b/2-colour/months/June.bmp
new file mode 100644
index 0000000..db0052f
Binary files /dev/null and b/2-colour/months/June.bmp differ
diff --git a/2-colour/months/March.bmp b/2-colour/months/March.bmp
new file mode 100644
index 0000000..4d06718
Binary files /dev/null and b/2-colour/months/March.bmp differ
diff --git a/2-colour/months/May.bmp b/2-colour/months/May.bmp
new file mode 100644
index 0000000..dc278ff
Binary files /dev/null and b/2-colour/months/May.bmp differ
diff --git a/2-colour/months/November.bmp b/2-colour/months/November.bmp
new file mode 100644
index 0000000..4d4c832
Binary files /dev/null and b/2-colour/months/November.bmp differ
diff --git a/2-colour/months/October.bmp b/2-colour/months/October.bmp
new file mode 100644
index 0000000..d00fe64
Binary files /dev/null and b/2-colour/months/October.bmp differ
diff --git a/2-colour/months/September.bmp b/2-colour/months/September.bmp
new file mode 100644
index 0000000..d290719
Binary files /dev/null and b/2-colour/months/September.bmp differ
diff --git a/2-colour/other/bar.bmp b/2-colour/other/bar.bmp
new file mode 100644
index 0000000..1a08347
Binary files /dev/null and b/2-colour/other/bar.bmp differ
diff --git a/2-colour/other/event.bmp b/2-colour/other/event.bmp
new file mode 100644
index 0000000..d3de8b6
Binary files /dev/null and b/2-colour/other/event.bmp differ
diff --git a/2-colour/other/hum-icon.bmp b/2-colour/other/hum-icon.bmp
new file mode 100644
index 0000000..7c78426
Binary files /dev/null and b/2-colour/other/hum-icon.bmp differ
diff --git a/2-colour/other/temp-icon.bmp b/2-colour/other/temp-icon.bmp
new file mode 100644
index 0000000..079be66
Binary files /dev/null and b/2-colour/other/temp-icon.bmp differ
diff --git a/2-colour/other/today.bmp b/2-colour/other/today.bmp
new file mode 100644
index 0000000..8ea51e9
Binary files /dev/null and b/2-colour/other/today.bmp differ
diff --git a/2-colour/other/week-mon.bmp b/2-colour/other/week-mon.bmp
new file mode 100644
index 0000000..28c5dd3
Binary files /dev/null and b/2-colour/other/week-mon.bmp differ
diff --git a/2-colour/other/week-sun.bmp b/2-colour/other/week-sun.bmp
new file mode 100644
index 0000000..13f060c
Binary files /dev/null and b/2-colour/other/week-sun.bmp differ
diff --git a/2-colour/other/weekday.bmp b/2-colour/other/weekday.bmp
new file mode 100644
index 0000000..41aeb85
Binary files /dev/null and b/2-colour/other/weekday.bmp differ
diff --git a/2-colour/stable.py b/2-colour/stable.py
new file mode 100644
index 0000000..73755cc
--- /dev/null
+++ b/2-colour/stable.py
@@ -0,0 +1,244 @@
+"""
+E-Paper Software (main script) adapted for the 2-colour E-Paper display
+A full and detailed breakdown for this code can be found in the wiki.
+If you have any questions, feel free to open an issue at Github.
+
+Copyright by Ace-Laboratory
+"""
+
+# url refers to the iCal url. It's the link you can copy when you click on
+# 'export' Calendar in Google or Yahoo (and many more online) Calendars
+
+# api-key refers to your openweathermap api key. It can be generated for free
+# when you sign up for an account and consists of a bunch of numbers and letters
+
+#location refers to the city you live in. You api key will be used to grab live
+# weather data for this city. Use the format below (city-name, country code)
+
+""" To quickly get started, fill in the following details:"""
+
+url = "https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics"
+api_key = ""
+location = "California, US"
+
+"""That's all. The software will do the rest."""
+
+import epd7in5
+from PIL import Image, ImageDraw, ImageFont, ImageOps #image operations
+import calendar,  pyowm #calendar and openweathermap wrapper
+from ics import Calendar, Event #icalendar parser
+from datetime import datetime #time operations
+from time import sleep #more time operations
+from urllib.request import urlopen #allows url to be 'read'
+import arrow #icalendar parser compatible dates
+from calibration import calibration
+
+epd = epd7in5.EPD() #required
+
+if (weekday_start_on == "Monday"):
+    calendar.setfirstweekday(calendar.MONDAY)
+    
+if (weekday_start_on == "Sunday"):
+    calendar.setfirstweekday(calendar.Sunday)
+
+c = Calendar(urlopen(url).read().decode('UTF-8'))
+e = Event()
+open = Image.open
+EPD_WIDTH = 640
+EPD_HEIGHT = 384
+
+path = '/home/pi/E-Paper-Master/Calendar/'
+wpath = path+'weather-icons/'
+mpath = path+'months/'
+dpath = path+'days/'
+font = ImageFont.truetype(path+'Assistant-Bold.ttf', 18)
+
+weekday =               open(path+'other/weekday.bmp')
+eventicon =             open(path+'other/event.bmp')
+dateicon =              open(path+'other/today.bmp')
+tempicon =              open(path+'other/temp-icon.bmp')
+humicon =               open(path+'other/hum-icon.bmp')
+weekmon =               open(path+'other/week-mon.bmp')
+weeksun =               open(path+'other/week-sun.bmp')
+bar =                   open(path+'other/bar.bmp')
+
+wiconplace = (570, 219)
+tempplace = (605, 310)
+humplace = (572, 308)
+monthplace = (443, 0)
+weekplace = (415,0)
+barplace = (555, 0)
+
+weekdaysmon = {'Mon': (416,3), 'Tue': (416,57), 'Wed': (416,111), 'Thu': (416,165), 'Fri': (416,219), 'Sat': (416,273), 'Sun':(416,327)}
+weekdayssun = {'Sun': (416,3), 'Mon': (416,57), 'Tue': (416,111), 'Wed': (416,165), 'Thu': (416,219), 'Fri': (416,273), 'Sat':(416,327)}
+
+positions = {'a1': (351, 3), 'a2': (351, 57), 'a3': (351, 111), 'a4': (351, 165),  'a5': (351, 219), 'a6': (351, 273), 'a7': (351, 327),
+'b1': (284, 3), 'b2': (284, 57), 'b3': (284, 111), 'b4': (284, 165), 'b5': (284, 219), 'b6': (284, 273), 'b7': (284, 327),
+'c1': (217, 3), 'c2': (217, 57), 'c3': (217, 111), 'c4': (217, 165), 'c5': (217, 219), 'c6': (217, 273), 'c7': (217, 327),
+'d1': (150, 3), 'd2': (150, 57), 'd3': (150, 111), 'd4': (150, 165), 'd5': (150, 219), 'd6': (150, 273), 'd7': (150, 327),
+'e1': (83, 3), 'e2': (83, 57), 'e3': (83, 111), 'e4': (83, 165), 'e5': (83, 219), 'e6': (83, 273), 'e7': (83, 327),
+'f1': (16, 3), 'f2': (16, 57), 'f3': (16, 111), 'f4': (16, 165), 'f5': (16, 219), 'f6': (16, 273), 'f7': (16, 327)}
+
+weathericons = {'01d': 'wi-day-sunny', '02d':'wi-day-cloudy', '03d': 'wi-cloudy',
+'04d': 'wi-cloudy-windy', '09d': 'wi-showers', '10d':'wi-rain',
+'11d':'wi-thunderstorm', '13d':'wi-snow', '50d': 'wi-fog',
+'01n': 'wi-night-clear', '02n':'wi-night-cloudy',
+'03n': 'wi-night-cloudy', '04n': 'wi-night-cloudy',
+'09n': 'wi-night-showers', '10n':'wi-night-rain',
+'11n':'wi-night-thunderstorm', '13n':'wi-night-snow',
+'50n': 'wi-night-alt-cloudy-windy'}
+
+def main():
+    while True:
+        
+        time = datetime.now()
+        hour = int(time.strftime("%-H"))
+        
+        for i in range(1):
+            epd.init()
+            if hour is 0:
+                calibration()
+            if hour is 12:
+                calibration()
+            if hour is 18:
+                calibration()
+
+            image = Image.new('1', (EPD_WIDTH, EPD_HEIGHT), 255)
+            draw = (ImageDraw.Draw(image)).bitmap
+            
+            #background image
+            draw(monthplace, Image.open(mpath+str(time.strftime("%B"))+'.bmp'))
+
+            if calendar.firstweekday() == 0:
+                #print('Your week starts on Monday') #->debug
+                draw(weekplace, weekmon)
+                
+            if calendar.firstweekday() == 6:
+                #print('Your week starts on Sunday') #->debug
+                draw(weekplace, weeksun)
+            
+            draw(barplace, bar) 
+
+            cal = calendar.monthcalendar(time.year, time.month)
+
+            for i in cal[0]:
+                draw(positions['a'+str(cal[0].index(i)+1)] ,open(dpath+str(i)+'.bmp'))
+            for i in cal[1]:
+                draw(positions['b'+str(cal[1].index(i)+1)] ,open(dpath+str(i)+'.bmp'))
+            for i in cal[2]:
+                draw(positions['c'+str(cal[2].index(i)+1)] ,open(dpath+str(i)+'.bmp'))
+            for i in cal[3]:
+                draw(positions['d'+str(cal[3].index(i)+1)] ,open(dpath+str(i)+'.bmp'))
+            for i in cal[4]:
+                draw(positions['e'+str(cal[4].index(i)+1)] ,open(dpath+str(i)+'.bmp'))
+            try:
+                for i in cal[5]:
+                    draw(positions['f'+str(cal[5].index(i)+1)] ,Image.open(dpath+str(i)+'.bmp'))
+            except IndexError:
+                pass
+            
+            # openweathermap api
+            owm = pyowm.OWM(api_key)
+            observation = owm.weather_at_place(location)
+            weather = observation.get_weather()
+            weathericon = weather.get_weather_icon_name()
+            Temperature = str(int(weather.get_temperature(unit='celsius')['temp']))
+            Humidity = str(weather.get_humidity())
+            #print('temp: '+Temperature +'°C') #->debug
+            #print('humidity: '+Humidity+'%') #->debug
+            #print(weathericon)              #->debug
+            
+            #weather icon handler
+            draw(wiconplace, open(wpath+weathericons[weathericon]+'.bmp'))
+
+            # date writing function
+            space1=Image.new('1', (115,25), color=255)
+            measure1= ImageDraw.Draw(space1)
+            date = ImageDraw.Draw(space1)
+            date.text((2, 3), (time.strftime('%a %-d %b %y')),  font=font, fill=0)
+            rotate1 = space1.rotate(270,  expand=1)
+            image.paste(rotate1, (595,20))
+
+            # temperature writing function
+            space2 = Image.new('1', (50,35), color=255)
+            measure2= ImageDraw.Draw(space2)
+            temperature = ImageDraw.Draw(space2)
+            temperature.text((2, 8), (Temperature + " °C"),  fill=0 ,font=font)
+            rotate2 = space2.rotate(270,  expand=1)
+            image.paste(rotate2, (605,334))
+
+            # humidity writing function
+            space3 = Image.new('1', (50,35), color=255)
+            measure3= ImageDraw.Draw(space3)
+            humidity = ImageDraw.Draw(space3)
+            humidity.text((4, 8), (Humidity +'%'),  fill=0 ,font=font)
+            rotate3 = space3.rotate(270,  expand=1)
+            image.paste(rotate3, (570,334))
+
+            # weekday handler
+            if calendar.firstweekday() == 0:
+                draw(weekdaysmon[(time.strftime("%a"))], weekday)
+                
+            if calendar.firstweekday() == 6:
+                draw(weekdayssun[(time.strftime("%a"))], weekday)
+            
+            print('It is currently:',time.strftime('%a %-d %b %y')) #--debug
+            print('The current time is:', time.strftime('%H:%M')) #--debug
+    
+            elist = []
+            for events in c.events:
+                if str(time.year) in str((events.begin).format('YYYY')):
+                    if str(time.month) in str((events.begin).format('M')):
+                        elist.append(int((events.begin).format('D')))
+
+            print('In this month, you have',len(elist),'Events')
+            
+            for x in elist:
+                if x in cal[0]:
+                    draw(positions['a'+str(cal[0].index(x)+1)] ,eventicon)
+                if x in cal[1]:
+                    draw(positions['b'+str(cal[1].index(x)+1)] ,eventicon)
+                if x in cal[2]:
+                    draw(positions['c'+str(cal[2].index(x)+1)] ,eventicon)
+                if x in cal[3]:
+                    draw(positions['d'+str(cal[3].index(x)+1)] ,eventicon)
+                if x in cal[4]:
+                    draw(positions['e'+str(cal[4].index(x)+1)] ,eventicon)
+                try:
+                    if x in cal[5]:
+                        draw(positions['f'+str(cal[5].index(x)+1)] ,eventicon)
+                except IndexError:
+                    pass
+
+            today = time.day
+            if today in cal[0]:
+                draw(positions['a'+str(cal[0].index(today)+1)] ,dateicon)
+            if today in cal[1]:
+                draw(positions['b'+str(cal[1].index(today)+1)] ,dateicon)
+            if today in cal[2]:
+                draw(positions['c'+str(cal[2].index(today)+1)] ,dateicon)
+            if today in cal[3]:
+                draw(positions['d'+str(cal[3].index(today)+1)] ,dateicon)
+            if today in cal[4]:
+                draw(positions['e'+str(cal[4].index(today)+1)] ,dateicon)
+            try:
+                if today in cal[5]:
+                    draw(positions['f'+str(cal[5].index(today)+1)] ,dateicon)
+            except IndexError:
+                    pass
+
+            draw(tempplace, tempicon)
+            draw(humplace, humicon)
+            epd.display_frame(epd.get_frame_buffer(image))
+
+            # delete the list so deleted events can be removed from the list
+            del elist[:]
+            epd.sleep()
+            
+            for i in range(1):
+                nexthour = ((60 - int(time.strftime("%-M")))*60) - (int(time.strftime("%-S")))
+                sleep(nexthour)
+
+if __name__ == '__main__':
+    main()
+    
diff --git a/2-colour/weather-icons/wi-cloudy-windy.bmp b/2-colour/weather-icons/wi-cloudy-windy.bmp
new file mode 100644
index 0000000..20fc804
Binary files /dev/null and b/2-colour/weather-icons/wi-cloudy-windy.bmp differ
diff --git a/2-colour/weather-icons/wi-cloudy.bmp b/2-colour/weather-icons/wi-cloudy.bmp
new file mode 100644
index 0000000..1f9db45
Binary files /dev/null and b/2-colour/weather-icons/wi-cloudy.bmp differ
diff --git a/2-colour/weather-icons/wi-day-cloudy.bmp b/2-colour/weather-icons/wi-day-cloudy.bmp
new file mode 100644
index 0000000..90f811d
Binary files /dev/null and b/2-colour/weather-icons/wi-day-cloudy.bmp differ
diff --git a/2-colour/weather-icons/wi-day-sunny.bmp b/2-colour/weather-icons/wi-day-sunny.bmp
new file mode 100644
index 0000000..6e44482
Binary files /dev/null and b/2-colour/weather-icons/wi-day-sunny.bmp differ
diff --git a/2-colour/weather-icons/wi-fog.bmp b/2-colour/weather-icons/wi-fog.bmp
new file mode 100644
index 0000000..ededca2
Binary files /dev/null and b/2-colour/weather-icons/wi-fog.bmp differ
diff --git a/2-colour/weather-icons/wi-night-alt-cloudy-windy.bmp b/2-colour/weather-icons/wi-night-alt-cloudy-windy.bmp
new file mode 100644
index 0000000..c0369ee
Binary files /dev/null and b/2-colour/weather-icons/wi-night-alt-cloudy-windy.bmp differ
diff --git a/2-colour/weather-icons/wi-night-clear.bmp b/2-colour/weather-icons/wi-night-clear.bmp
new file mode 100644
index 0000000..63f5e60
Binary files /dev/null and b/2-colour/weather-icons/wi-night-clear.bmp differ
diff --git a/2-colour/weather-icons/wi-night-cloudy.bmp b/2-colour/weather-icons/wi-night-cloudy.bmp
new file mode 100644
index 0000000..0a9b7d0
Binary files /dev/null and b/2-colour/weather-icons/wi-night-cloudy.bmp differ
diff --git a/2-colour/weather-icons/wi-night-rain.bmp b/2-colour/weather-icons/wi-night-rain.bmp
new file mode 100644
index 0000000..0bf46cd
Binary files /dev/null and b/2-colour/weather-icons/wi-night-rain.bmp differ
diff --git a/2-colour/weather-icons/wi-night-showers.bmp b/2-colour/weather-icons/wi-night-showers.bmp
new file mode 100644
index 0000000..65c8e66
Binary files /dev/null and b/2-colour/weather-icons/wi-night-showers.bmp differ
diff --git a/2-colour/weather-icons/wi-night-snow.bmp b/2-colour/weather-icons/wi-night-snow.bmp
new file mode 100644
index 0000000..57c61d4
Binary files /dev/null and b/2-colour/weather-icons/wi-night-snow.bmp differ
diff --git a/2-colour/weather-icons/wi-night-thunderstorm.bmp b/2-colour/weather-icons/wi-night-thunderstorm.bmp
new file mode 100644
index 0000000..2cdb562
Binary files /dev/null and b/2-colour/weather-icons/wi-night-thunderstorm.bmp differ
diff --git a/2-colour/weather-icons/wi-rain.bmp b/2-colour/weather-icons/wi-rain.bmp
new file mode 100644
index 0000000..44b62ca
Binary files /dev/null and b/2-colour/weather-icons/wi-rain.bmp differ
diff --git a/2-colour/weather-icons/wi-showers.bmp b/2-colour/weather-icons/wi-showers.bmp
new file mode 100644
index 0000000..cb5756b
Binary files /dev/null and b/2-colour/weather-icons/wi-showers.bmp differ
diff --git a/2-colour/weather-icons/wi-snow.bmp b/2-colour/weather-icons/wi-snow.bmp
new file mode 100644
index 0000000..77a45a8
Binary files /dev/null and b/2-colour/weather-icons/wi-snow.bmp differ
diff --git a/2-colour/weather-icons/wi-thunderstorm.bmp b/2-colour/weather-icons/wi-thunderstorm.bmp
new file mode 100644
index 0000000..840cf9b
Binary files /dev/null and b/2-colour/weather-icons/wi-thunderstorm.bmp differ