diff --git a/time/timeswitch/package.json b/time/timeswitch/package.json
index acaf2bf0..9b699382 100644
--- a/time/timeswitch/package.json
+++ b/time/timeswitch/package.json
@@ -3,6 +3,7 @@
     "version"       : "0.0.8",
     "description"   : "A Node-RED node to provide a simple timeswitch to schedule daily on/off events.",
     "dependencies"  : {
+        "moment-timezone": "^0.5.33",
         "suncalc": "^1.8.0"
     },
     "repository" : {
diff --git a/time/timeswitch/timeswitch.html b/time/timeswitch/timeswitch.html
index 910cca6a..7689f5bf 100644
--- a/time/timeswitch/timeswitch.html
+++ b/time/timeswitch/timeswitch.html
@@ -214,6 +214,605 @@
         </select>
     </div>
 
+  <div class="form-row" id="node-timeswitch-timezone-row">
+    <label for="node-input-timezone">Timezone</label>
+    <select id="node-input-timezone">
+        <option>Africa/Abidjan</option>
+        <option>Africa/Accra</option>
+        <option>Africa/Addis_Ababa</option>
+        <option>Africa/Algiers</option>
+        <option>Africa/Asmara</option>
+        <option>Africa/Asmera</option>
+        <option>Africa/Bamako</option>
+        <option>Africa/Bangui</option>
+        <option>Africa/Banjul</option>
+        <option>Africa/Bissau</option>
+        <option>Africa/Blantyre</option>
+        <option>Africa/Brazzaville</option>
+        <option>Africa/Bujumbura</option>
+        <option>Africa/Cairo</option>
+        <option>Africa/Casablanca</option>
+        <option>Africa/Ceuta</option>
+        <option>Africa/Conakry</option>
+        <option>Africa/Dakar</option>
+        <option>Africa/Dar_es_Salaam</option>
+        <option>Africa/Djibouti</option>
+        <option>Africa/Douala</option>
+        <option>Africa/El_Aaiun</option>
+        <option>Africa/Freetown</option>
+        <option>Africa/Gaborone</option>
+        <option>Africa/Harare</option>
+        <option>Africa/Johannesburg</option>
+        <option>Africa/Juba</option>
+        <option>Africa/Kampala</option>
+        <option>Africa/Khartoum</option>
+        <option>Africa/Kigali</option>
+        <option>Africa/Kinshasa</option>
+        <option>Africa/Lagos</option>
+        <option>Africa/Libreville</option>
+        <option>Africa/Lome</option>
+        <option>Africa/Luanda</option>
+        <option>Africa/Lubumbashi</option>
+        <option>Africa/Lusaka</option>
+        <option>Africa/Malabo</option>
+        <option>Africa/Maputo</option>
+        <option>Africa/Maseru</option>
+        <option>Africa/Mbabane</option>
+        <option>Africa/Mogadishu</option>
+        <option>Africa/Monrovia</option>
+        <option>Africa/Nairobi</option>
+        <option>Africa/Ndjamena</option>
+        <option>Africa/Niamey</option>
+        <option>Africa/Nouakchott</option>
+        <option>Africa/Ouagadougou</option>
+        <option>Africa/Porto-Novo</option>
+        <option>Africa/Sao_Tome</option>
+        <option>Africa/Timbuktu</option>
+        <option>Africa/Tripoli</option>
+        <option>Africa/Tunis</option>
+        <option>Africa/Windhoek</option>
+        <option>America/Adak</option>
+        <option>America/Anchorage</option>
+        <option>America/Anguilla</option>
+        <option>America/Antigua</option>
+        <option>America/Araguaina</option>
+        <option>America/Argentina/Buenos_Aires</option>
+        <option>America/Argentina/Catamarca</option>
+        <option>America/Argentina/ComodRivadavia</option>
+        <option>America/Argentina/Cordoba</option>
+        <option>America/Argentina/Jujuy</option>
+        <option>America/Argentina/La_Rioja</option>
+        <option>America/Argentina/Mendoza</option>
+        <option>America/Argentina/Rio_Gallegos</option>
+        <option>America/Argentina/Salta</option>
+        <option>America/Argentina/San_Juan</option>
+        <option>America/Argentina/San_Luis</option>
+        <option>America/Argentina/Tucuman</option>
+        <option>America/Argentina/Ushuaia</option>
+        <option>America/Aruba</option>
+        <option>America/Asuncion</option>
+        <option>America/Atikokan</option>
+        <option>America/Atka</option>
+        <option>America/Bahia</option>
+        <option>America/Bahia_Banderas</option>
+        <option>America/Barbados</option>
+        <option>America/Belem</option>
+        <option>America/Belize</option>
+        <option>America/Blanc-Sablon</option>
+        <option>America/Boa_Vista</option>
+        <option>America/Bogota</option>
+        <option>America/Boise</option>
+        <option>America/Buenos_Aires</option>
+        <option>America/Cambridge_Bay</option>
+        <option>America/Campo_Grande</option>
+        <option>America/Cancun</option>
+        <option>America/Caracas</option>
+        <option>America/Catamarca</option>
+        <option>America/Cayenne</option>
+        <option>America/Cayman</option>
+        <option>America/Chicago</option>
+        <option>America/Chihuahua</option>
+        <option>America/Coral_Harbour</option>
+        <option>America/Cordoba</option>
+        <option>America/Costa_Rica</option>
+        <option>America/Creston</option>
+        <option>America/Cuiaba</option>
+        <option>America/Curacao</option>
+        <option>America/Danmarkshavn</option>
+        <option>America/Dawson</option>
+        <option>America/Dawson_Creek</option>
+        <option>America/Denver</option>
+        <option>America/Detroit</option>
+        <option>America/Dominica</option>
+        <option>America/Edmonton</option>
+        <option>America/Eirunepe</option>
+        <option>America/El_Salvador</option>
+        <option>America/Ensenada</option>
+        <option>America/Fort_Nelson</option>
+        <option>America/Fort_Wayne</option>
+        <option>America/Fortaleza</option>
+        <option>America/Glace_Bay</option>
+        <option>America/Godthab</option>
+        <option>America/Goose_Bay</option>
+        <option>America/Grand_Turk</option>
+        <option>America/Grenada</option>
+        <option>America/Guadeloupe</option>
+        <option>America/Guatemala</option>
+        <option>America/Guayaquil</option>
+        <option>America/Guyana</option>
+        <option>America/Halifax</option>
+        <option>America/Havana</option>
+        <option>America/Hermosillo</option>
+        <option>America/Indiana/Indianapolis</option>
+        <option>America/Indiana/Knox</option>
+        <option>America/Indiana/Marengo</option>
+        <option>America/Indiana/Petersburg</option>
+        <option>America/Indiana/Tell_City</option>
+        <option>America/Indiana/Vevay</option>
+        <option>America/Indiana/Vincennes</option>
+        <option>America/Indiana/Winamac</option>
+        <option>America/Indianapolis</option>
+        <option>America/Inuvik</option>
+        <option>America/Iqaluit</option>
+        <option>America/Jamaica</option>
+        <option>America/Jujuy</option>
+        <option>America/Juneau</option>
+        <option>America/Kentucky/Louisville</option>
+        <option>America/Kentucky/Monticello</option>
+        <option>America/Knox_IN</option>
+        <option>America/Kralendijk</option>
+        <option>America/La_Paz</option>
+        <option>America/Lima</option>
+        <option>America/Los_Angeles</option>
+        <option>America/Louisville</option>
+        <option>America/Lower_Princes</option>
+        <option>America/Maceio</option>
+        <option>America/Managua</option>
+        <option>America/Manaus</option>
+        <option>America/Marigot</option>
+        <option>America/Martinique</option>
+        <option>America/Matamoros</option>
+        <option>America/Mazatlan</option>
+        <option>America/Mendoza</option>
+        <option>America/Menominee</option>
+        <option>America/Merida</option>
+        <option>America/Metlakatla</option>
+        <option>America/Mexico_City</option>
+        <option>America/Miquelon</option>
+        <option>America/Moncton</option>
+        <option>America/Monterrey</option>
+        <option>America/Montevideo</option>
+        <option>America/Montreal</option>
+        <option>America/Montserrat</option>
+        <option>America/Nassau</option>
+        <option>America/New_York</option>
+        <option>America/Nipigon</option>
+        <option>America/Nome</option>
+        <option>America/Noronha</option>
+        <option>America/North_Dakota/Beulah</option>
+        <option>America/North_Dakota/Center</option>
+        <option>America/North_Dakota/New_Salem</option>
+        <option>America/Nuuk</option>
+        <option>America/Ojinaga</option>
+        <option>America/Panama</option>
+        <option>America/Pangnirtung</option>
+        <option>America/Paramaribo</option>
+        <option>America/Phoenix</option>
+        <option>America/Port-au-Prince</option>
+        <option>America/Port_of_Spain</option>
+        <option>America/Porto_Acre</option>
+        <option>America/Porto_Velho</option>
+        <option>America/Puerto_Rico</option>
+        <option>America/Punta_Arenas</option>
+        <option>America/Rainy_River</option>
+        <option>America/Rankin_Inlet</option>
+        <option>America/Recife</option>
+        <option>America/Regina</option>
+        <option>America/Resolute</option>
+        <option>America/Rio_Branco</option>
+        <option>America/Rosario</option>
+        <option>America/Santa_Isabel</option>
+        <option>America/Santarem</option>
+        <option>America/Santiago</option>
+        <option>America/Santo_Domingo</option>
+        <option>America/Sao_Paulo</option>
+        <option>America/Scoresbysund</option>
+        <option>America/Shiprock</option>
+        <option>America/Sitka</option>
+        <option>America/St_Barthelemy</option>
+        <option>America/St_Johns</option>
+        <option>America/St_Kitts</option>
+        <option>America/St_Lucia</option>
+        <option>America/St_Thomas</option>
+        <option>America/St_Vincent</option>
+        <option>America/Swift_Current</option>
+        <option>America/Tegucigalpa</option>
+        <option>America/Thule</option>
+        <option>America/Thunder_Bay</option>
+        <option>America/Tijuana</option>
+        <option>America/Toronto</option>
+        <option>America/Tortola</option>
+        <option>America/Vancouver</option>
+        <option>America/Virgin</option>
+        <option>America/Whitehorse</option>
+        <option>America/Winnipeg</option>
+        <option>America/Yakutat</option>
+        <option>America/Yellowknife</option>
+        <option>Antarctica/Casey</option>
+        <option>Antarctica/Davis</option>
+        <option>Antarctica/DumontDUrville</option>
+        <option>Antarctica/Macquarie</option>
+        <option>Antarctica/Mawson</option>
+        <option>Antarctica/McMurdo</option>
+        <option>Antarctica/Palmer</option>
+        <option>Antarctica/Rothera</option>
+        <option>Antarctica/South_Pole</option>
+        <option>Antarctica/Syowa</option>
+        <option>Antarctica/Troll</option>
+        <option>Antarctica/Vostok</option>
+        <option>Arctic/Longyearbyen</option>
+        <option>Asia/Aden</option>
+        <option>Asia/Almaty</option>
+        <option>Asia/Amman</option>
+        <option>Asia/Anadyr</option>
+        <option>Asia/Aqtau</option>
+        <option>Asia/Aqtobe</option>
+        <option>Asia/Ashgabat</option>
+        <option>Asia/Ashkhabad</option>
+        <option>Asia/Atyrau</option>
+        <option>Asia/Baghdad</option>
+        <option>Asia/Bahrain</option>
+        <option>Asia/Baku</option>
+        <option>Asia/Bangkok</option>
+        <option>Asia/Barnaul</option>
+        <option>Asia/Beirut</option>
+        <option>Asia/Bishkek</option>
+        <option>Asia/Brunei</option>
+        <option>Asia/Calcutta</option>
+        <option>Asia/Chita</option>
+        <option>Asia/Choibalsan</option>
+        <option>Asia/Chongqing</option>
+        <option>Asia/Chungking</option>
+        <option>Asia/Colombo</option>
+        <option>Asia/Dacca</option>
+        <option>Asia/Damascus</option>
+        <option>Asia/Dhaka</option>
+        <option>Asia/Dili</option>
+        <option>Asia/Dubai</option>
+        <option>Asia/Dushanbe</option>
+        <option>Asia/Famagusta</option>
+        <option>Asia/Gaza</option>
+        <option>Asia/Harbin</option>
+        <option>Asia/Hebron</option>
+        <option>Asia/Ho_Chi_Minh</option>
+        <option>Asia/Hong_Kong</option>
+        <option>Asia/Hovd</option>
+        <option>Asia/Irkutsk</option>
+        <option>Asia/Istanbul</option>
+        <option>Asia/Jakarta</option>
+        <option>Asia/Jayapura</option>
+        <option>Asia/Jerusalem</option>
+        <option>Asia/Kabul</option>
+        <option>Asia/Kamchatka</option>
+        <option>Asia/Karachi</option>
+        <option>Asia/Kashgar</option>
+        <option>Asia/Kathmandu</option>
+        <option>Asia/Katmandu</option>
+        <option>Asia/Khandyga</option>
+        <option>Asia/Kolkata</option>
+        <option>Asia/Krasnoyarsk</option>
+        <option>Asia/Kuala_Lumpur</option>
+        <option>Asia/Kuching</option>
+        <option>Asia/Kuwait</option>
+        <option>Asia/Macao</option>
+        <option>Asia/Macau</option>
+        <option>Asia/Magadan</option>
+        <option>Asia/Makassar</option>
+        <option>Asia/Manila</option>
+        <option>Asia/Muscat</option>
+        <option>Asia/Nicosia</option>
+        <option>Asia/Novokuznetsk</option>
+        <option>Asia/Novosibirsk</option>
+        <option>Asia/Omsk</option>
+        <option>Asia/Oral</option>
+        <option>Asia/Phnom_Penh</option>
+        <option>Asia/Pontianak</option>
+        <option>Asia/Pyongyang</option>
+        <option>Asia/Qatar</option>
+        <option>Asia/Qostanay</option>
+        <option>Asia/Qyzylorda</option>
+        <option>Asia/Rangoon</option>
+        <option>Asia/Riyadh</option>
+        <option>Asia/Saigon</option>
+        <option>Asia/Sakhalin</option>
+        <option>Asia/Samarkand</option>
+        <option>Asia/Seoul</option>
+        <option>Asia/Shanghai</option>
+        <option>Asia/Singapore</option>
+        <option>Asia/Srednekolymsk</option>
+        <option>Asia/Taipei</option>
+        <option>Asia/Tashkent</option>
+        <option>Asia/Tbilisi</option>
+        <option>Asia/Tehran</option>
+        <option>Asia/Tel_Aviv</option>
+        <option>Asia/Thimbu</option>
+        <option>Asia/Thimphu</option>
+        <option>Asia/Tokyo</option>
+        <option>Asia/Tomsk</option>
+        <option>Asia/Ujung_Pandang</option>
+        <option>Asia/Ulaanbaatar</option>
+        <option>Asia/Ulan_Bator</option>
+        <option>Asia/Urumqi</option>
+        <option>Asia/Ust-Nera</option>
+        <option>Asia/Vientiane</option>
+        <option>Asia/Vladivostok</option>
+        <option>Asia/Yakutsk</option>
+        <option>Asia/Yangon</option>
+        <option>Asia/Yekaterinburg</option>
+        <option>Asia/Yerevan</option>
+        <option>Atlantic/Azores</option>
+        <option>Atlantic/Bermuda</option>
+        <option>Atlantic/Canary</option>
+        <option>Atlantic/Cape_Verde</option>
+        <option>Atlantic/Faeroe</option>
+        <option>Atlantic/Faroe</option>
+        <option>Atlantic/Jan_Mayen</option>
+        <option>Atlantic/Madeira</option>
+        <option>Atlantic/Reykjavik</option>
+        <option>Atlantic/South_Georgia</option>
+        <option>Atlantic/St_Helena</option>
+        <option>Atlantic/Stanley</option>
+        <option>Australia/ACT</option>
+        <option>Australia/Adelaide</option>
+        <option>Australia/Brisbane</option>
+        <option>Australia/Broken_Hill</option>
+        <option>Australia/Canberra</option>
+        <option>Australia/Currie</option>
+        <option>Australia/Darwin</option>
+        <option>Australia/Eucla</option>
+        <option>Australia/Hobart</option>
+        <option>Australia/LHI</option>
+        <option>Australia/Lindeman</option>
+        <option>Australia/Lord_Howe</option>
+        <option>Australia/Melbourne</option>
+        <option>Australia/NSW</option>
+        <option>Australia/North</option>
+        <option>Australia/Perth</option>
+        <option>Australia/Queensland</option>
+        <option>Australia/South</option>
+        <option>Australia/Sydney</option>
+        <option>Australia/Tasmania</option>
+        <option>Australia/Victoria</option>
+        <option>Australia/West</option>
+        <option>Australia/Yancowinna</option>
+        <option>Brazil/Acre</option>
+        <option>Brazil/DeNoronha</option>
+        <option>Brazil/East</option>
+        <option>Brazil/West</option>
+        <option>CET</option>
+        <option>CST6CDT</option>
+        <option>Canada/Atlantic</option>
+        <option>Canada/Central</option>
+        <option>Canada/Eastern</option>
+        <option>Canada/Mountain</option>
+        <option>Canada/Newfoundland</option>
+        <option>Canada/Pacific</option>
+        <option>Canada/Saskatchewan</option>
+        <option>Canada/Yukon</option>
+        <option>Chile/Continental</option>
+        <option>Chile/EasterIsland</option>
+        <option>Cuba</option>
+        <option>EET</option>
+        <option>EST</option>
+        <option>EST5EDT</option>
+        <option>Egypt</option>
+        <option>Eire</option>
+        <option>Etc/GMT</option>
+        <option>Etc/GMT+0</option>
+        <option>Etc/GMT+1</option>
+        <option>Etc/GMT+10</option>
+        <option>Etc/GMT+11</option>
+        <option>Etc/GMT+12</option>
+        <option>Etc/GMT+2</option>
+        <option>Etc/GMT+3</option>
+        <option>Etc/GMT+4</option>
+        <option>Etc/GMT+5</option>
+        <option>Etc/GMT+6</option>
+        <option>Etc/GMT+7</option>
+        <option>Etc/GMT+8</option>
+        <option>Etc/GMT+9</option>
+        <option>Etc/GMT-0</option>
+        <option>Etc/GMT-1</option>
+        <option>Etc/GMT-10</option>
+        <option>Etc/GMT-11</option>
+        <option>Etc/GMT-12</option>
+        <option>Etc/GMT-13</option>
+        <option>Etc/GMT-14</option>
+        <option>Etc/GMT-2</option>
+        <option>Etc/GMT-3</option>
+        <option>Etc/GMT-4</option>
+        <option>Etc/GMT-5</option>
+        <option>Etc/GMT-6</option>
+        <option>Etc/GMT-7</option>
+        <option>Etc/GMT-8</option>
+        <option>Etc/GMT-9</option>
+        <option>Etc/GMT0</option>
+        <option>Etc/Greenwich</option>
+        <option>Etc/UCT</option>
+        <option>Etc/UTC</option>
+        <option>Etc/Universal</option>
+        <option>Etc/Zulu</option>
+        <option>Europe/Amsterdam</option>
+        <option>Europe/Andorra</option>
+        <option>Europe/Astrakhan</option>
+        <option>Europe/Athens</option>
+        <option>Europe/Belfast</option>
+        <option>Europe/Belgrade</option>
+        <option>Europe/Berlin</option>
+        <option>Europe/Bratislava</option>
+        <option>Europe/Brussels</option>
+        <option>Europe/Bucharest</option>
+        <option>Europe/Budapest</option>
+        <option>Europe/Busingen</option>
+        <option>Europe/Chisinau</option>
+        <option>Europe/Copenhagen</option>
+        <option>Europe/Dublin</option>
+        <option>Europe/Gibraltar</option>
+        <option>Europe/Guernsey</option>
+        <option>Europe/Helsinki</option>
+        <option>Europe/Isle_of_Man</option>
+        <option>Europe/Istanbul</option>
+        <option>Europe/Jersey</option>
+        <option>Europe/Kaliningrad</option>
+        <option>Europe/Kiev</option>
+        <option>Europe/Kirov</option>
+        <option>Europe/Lisbon</option>
+        <option>Europe/Ljubljana</option>
+        <option>Europe/London</option>
+        <option>Europe/Luxembourg</option>
+        <option>Europe/Madrid</option>
+        <option>Europe/Malta</option>
+        <option>Europe/Mariehamn</option>
+        <option>Europe/Minsk</option>
+        <option>Europe/Monaco</option>
+        <option>Europe/Moscow</option>
+        <option>Europe/Nicosia</option>
+        <option>Europe/Oslo</option>
+        <option>Europe/Paris</option>
+        <option>Europe/Podgorica</option>
+        <option>Europe/Prague</option>
+        <option>Europe/Riga</option>
+        <option>Europe/Rome</option>
+        <option>Europe/Samara</option>
+        <option>Europe/San_Marino</option>
+        <option>Europe/Sarajevo</option>
+        <option>Europe/Saratov</option>
+        <option>Europe/Simferopol</option>
+        <option>Europe/Skopje</option>
+        <option>Europe/Sofia</option>
+        <option>Europe/Stockholm</option>
+        <option>Europe/Tallinn</option>
+        <option>Europe/Tirane</option>
+        <option>Europe/Tiraspol</option>
+        <option>Europe/Ulyanovsk</option>
+        <option>Europe/Uzhgorod</option>
+        <option>Europe/Vaduz</option>
+        <option>Europe/Vatican</option>
+        <option>Europe/Vienna</option>
+        <option>Europe/Vilnius</option>
+        <option>Europe/Volgograd</option>
+        <option>Europe/Warsaw</option>
+        <option>Europe/Zagreb</option>
+        <option>Europe/Zaporozhye</option>
+        <option>Europe/Zurich</option>
+        <option>GB</option>
+        <option>GB-Eire</option>
+        <option>GMT</option>
+        <option>GMT+0</option>
+        <option>GMT-0</option>
+        <option>GMT0</option>
+        <option>Greenwich</option>
+        <option>HST</option>
+        <option>Hongkong</option>
+        <option>Iceland</option>
+        <option>Indian/Antananarivo</option>
+        <option>Indian/Chagos</option>
+        <option>Indian/Christmas</option>
+        <option>Indian/Cocos</option>
+        <option>Indian/Comoro</option>
+        <option>Indian/Kerguelen</option>
+        <option>Indian/Mahe</option>
+        <option>Indian/Maldives</option>
+        <option>Indian/Mauritius</option>
+        <option>Indian/Mayotte</option>
+        <option>Indian/Reunion</option>
+        <option>Iran</option>
+        <option>Israel</option>
+        <option>Jamaica</option>
+        <option>Japan</option>
+        <option>Kwajalein</option>
+        <option>Libya</option>
+        <option>MET</option>
+        <option>MST</option>
+        <option>MST7MDT</option>
+        <option>Mexico/BajaNorte</option>
+        <option>Mexico/BajaSur</option>
+        <option>Mexico/General</option>
+        <option>NZ</option>
+        <option>NZ-CHAT</option>
+        <option>Navajo</option>
+        <option>PRC</option>
+        <option>PST8PDT</option>
+        <option>Pacific/Apia</option>
+        <option>Pacific/Auckland</option>
+        <option>Pacific/Bougainville</option>
+        <option>Pacific/Chatham</option>
+        <option>Pacific/Chuuk</option>
+        <option>Pacific/Easter</option>
+        <option>Pacific/Efate</option>
+        <option>Pacific/Enderbury</option>
+        <option>Pacific/Fakaofo</option>
+        <option>Pacific/Fiji</option>
+        <option>Pacific/Funafuti</option>
+        <option>Pacific/Galapagos</option>
+        <option>Pacific/Gambier</option>
+        <option>Pacific/Guadalcanal</option>
+        <option>Pacific/Guam</option>
+        <option>Pacific/Honolulu</option>
+        <option>Pacific/Johnston</option>
+        <option>Pacific/Kiritimati</option>
+        <option>Pacific/Kosrae</option>
+        <option>Pacific/Kwajalein</option>
+        <option>Pacific/Majuro</option>
+        <option>Pacific/Marquesas</option>
+        <option>Pacific/Midway</option>
+        <option>Pacific/Nauru</option>
+        <option>Pacific/Niue</option>
+        <option>Pacific/Norfolk</option>
+        <option>Pacific/Noumea</option>
+        <option>Pacific/Pago_Pago</option>
+        <option>Pacific/Palau</option>
+        <option>Pacific/Pitcairn</option>
+        <option>Pacific/Pohnpei</option>
+        <option>Pacific/Ponape</option>
+        <option>Pacific/Port_Moresby</option>
+        <option>Pacific/Rarotonga</option>
+        <option>Pacific/Saipan</option>
+        <option>Pacific/Samoa</option>
+        <option>Pacific/Tahiti</option>
+        <option>Pacific/Tarawa</option>
+        <option>Pacific/Tongatapu</option>
+        <option>Pacific/Truk</option>
+        <option>Pacific/Wake</option>
+        <option>Pacific/Wallis</option>
+        <option>Pacific/Yap</option>
+        <option>Poland</option>
+        <option>Portugal</option>
+        <option>ROC</option>
+        <option>ROK</option>
+        <option>Singapore</option>
+        <option>Turkey</option>
+        <option>UCT</option>
+        <option>US/Alaska</option>
+        <option>US/Aleutian</option>
+        <option>US/Arizona</option>
+        <option>US/Central</option>
+        <option>US/East-Indiana</option>
+        <option>US/Eastern</option>
+        <option>US/Hawaii</option>
+        <option>US/Indiana-Starke</option>
+        <option>US/Michigan</option>
+        <option>US/Mountain</option>
+        <option>US/Pacific</option>
+        <option>US/Samoa</option>
+        <option>UTC</option>
+        <option>Universal</option>
+        <option>W-SU</option>
+        <option>WET</option>
+        <option>Zulu</option>
+    </select>
+  </div>
+
   <div class="form-row" id="latlonrow">
     <label for="node-input-lat"><i class="fa fa-globe"></i> Place&nbsp;&nbsp;&nbsp;&nbsp;Lat</label>
     <input type="text" id="node-input-lat" placeholder="51.025" style="width:22%">
@@ -280,6 +879,15 @@
 
 <script type="text/javascript">
 
+    function getSunriseSunsetUsage() {
+        var startTime = parseInt($("#node-input-starttime").val());
+        var endTime = parseInt($("#node-input-endtime").val());
+        return {
+            sunrise: !isNaN(startTime) && startTime >= 5000,
+            sunset: !isNaN(endTime) && endTime >= 5000
+        }
+    }
+
     function updaterows() {
         if (($("#node-input-starttime").val() >= 5000 ) || ($("#node-input-endtime").val() == 5000 ) || ($("#node-input-endtime").val() == 6000 )) {
             $("#latlonrow").show();
@@ -290,16 +898,34 @@
         }
     }
 
+    function updateTimezone() {
+        var usage = getSunriseSunsetUsage();
+        if (usage.sunrise && usage.sunset) {
+            $("#node-timeswitch-timezone-row").hide();
+        } else {
+            $("#node-timeswitch-timezone-row").show();
+        }
+    }
+
+    function validateLatLon (arg) {
+        var usage = getSunriseSunsetUsage();
+        if (!usage.sunrise && !usage.sunset) {
+            return true;
+        }
+        return RED.validators.number()(arg);
+    }
+
     RED.nodes.registerType('timeswitch',{
         category: 'time',
         color:"#6699ff",
         defaults: {
             name: {value:""},
             mytopic: {value:""},
-            lat: {value:"", validate:RED.validators.number()},
-            lon: {value:"", required:true, validate:RED.validators.number()},
+            lat: {value:"", validate:validateLatLon},
+            lon: {value:"", validate:validateLatLon},
             starttime: {value:"5000", required: true},
             endtime: {value:"780", required: true},
+            timezone: {value:Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC"},
             duskoff: {value:"0", required: true},
             dawnoff: {value:"0", required: true},
             sun: {value:true},
@@ -342,10 +968,15 @@
             }
             $("#node-input-starttime").change(function() {
                 updaterows();
+                updateTimezone();
             });
             $("#node-input-endtime").change(function() {
                 updaterows();
+                updateTimezone();
             });
+            if (!$("#node-input-timezone").val()) {
+                $("#node-input-timezone").val("UTC")
+            }
         },
         button: {
             onclick: function() {
diff --git a/time/timeswitch/timeswitch.js b/time/timeswitch/timeswitch.js
index 593c648a..0e1c7506 100644
--- a/time/timeswitch/timeswitch.js
+++ b/time/timeswitch/timeswitch.js
@@ -2,6 +2,7 @@
 module.exports = function(RED) {
     "use strict";
     var SunCalc = require('suncalc');
+    var moment = require('moment-timezone');
 
     function TimeswitchNode(n) {
         RED.nodes.createNode(this, n);
@@ -14,6 +15,7 @@ module.exports = function(RED) {
         this.duskoff = n.duskoff;
         this.dawnoff = n.dawnoff;
         this.mytopic = n.mytopic;
+        this.timezone = n.timezone;
 
         this.sun = n.sun;
         this.mon = n.mon;
@@ -42,10 +44,9 @@ module.exports = function(RED) {
         this.on("input", function(msg2) {
             if (msg2.payload === "reset") { ison = 0; }
 
-            var now = new Date();
-            var nowoff = -now.getTimezoneOffset() * 60000;
+            var timeOffset = moment.tz.zone(this.timezone).utcOffset(Date.now()) * 60 * 1000;
+            var now = new Date(Date.now() - timeOffset);
             var nowMillis = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), 0);
-            nowMillis += nowoff;
             var midnightMillis = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 0, 0);
             var today = Math.round((nowMillis - midnightMillis) / 60000) % 1440;
             var starttime = Number(node.startt);
@@ -55,8 +56,6 @@ module.exports = function(RED) {
                 var times = SunCalc.getTimes(now, node.lat, node.lon);
                 var startMillis = Date.UTC(times[node.start].getUTCFullYear(), times[node.start].getUTCMonth(), times[node.start].getUTCDate(), times[node.start].getUTCHours(), times[node.start].getUTCMinutes());
                 var endMillis = Date.UTC(times[node.end].getUTCFullYear(), times[node.end].getUTCMonth(), times[node.end].getUTCDate(), times[node.end].getUTCHours(), times[node.end].getUTCMinutes());
-                startMillis += nowoff;
-                endMillis += nowoff;
                 var dawn = ((startMillis - midnightMillis) / 60000) + Number(node.dawnoff);
                 var dusk = ((endMillis - midnightMillis) / 60000) + Number(node.duskoff);
                 if (starttime == 5000) { starttime = dawn; }