diff --git a/fs_src/index.html b/fs_src/index.html
index 8a4b732d..773ed236 100644
--- a/fs_src/index.html
+++ b/fs_src/index.html
@@ -672,6 +672,10 @@ <h1 id="head">Window</h1>
           <span class="slider round"></span>
         </label>
       </div>
+      <div class="form-control">
+        <label>Slat movement time from min to max tilt (0 disables tilt feature):</label>
+        <input type="text" id="tilt_time_ms" style="width: 2em; min-width: 2em;" pattern="[0-9]{0-4}"> ms
+      </div>
       <div class="button-container" id="btns">
         <button id="save_btn">
           <label><span id="save_spinner"></span>Save</label>
diff --git a/fs_src/script.js b/fs_src/script.js
index 0d1b50f8..81c0986f 100644
--- a/fs_src/script.js
+++ b/fs_src/script.js
@@ -51,7 +51,7 @@ function el(container, id) {
 }
 
 function checkName(name) {
-  return !!name.match(/^[a-z0-9\-]{1,63}$/i)
+  return !!name.match(/^[a-z0-9\-]{1,63}$/i);
 }
 
 el("sys_save_btn").onclick = function () {
@@ -254,7 +254,7 @@ function dateStringToSeconds(dateString) {
     days, hours, minutes, seconds, milliseconds
   } = dateString.match(
     /^(?<days>\d+)\:(?<hours>\d{2})\:(?<minutes>\d{2})\:(?<seconds>\d{2})\.(?<milliseconds>\d{3})/
-  ).groups
+  ).groups;
 
   return parseInt(days) * 24 * 3600 +
     parseInt(hours) * 3600 +
@@ -402,6 +402,7 @@ function wcSetConfig(c, cfg, spinner) {
       in_mode: parseInt(el(c, "in_mode").value),
       swap_inputs: el(c, "swap_inputs").checked,
       swap_outputs: el(c, "swap_outputs").checked,
+      tilt_time_ms: el(c, "tilt_time_ms").value,
     };
   }
   setComponentConfig(c, cfg, spinner);
@@ -446,7 +447,7 @@ el("reboot_btn").onclick = function () {
   callDevice("Sys.Reboot", {delay_ms: 500}).then(function () {
     alert("System is rebooting and will reconnect when ready.");
   });
-}
+};
 
 el("reset_btn").onclick = function () {
   if(!confirm("Device configuration will be wiped and return to AP mode. Are you sure?")) return;
@@ -454,7 +455,7 @@ el("reset_btn").onclick = function () {
   callDevice("Shelly.WipeDevice", {}).then(function () {
     alert("Device configuration has been reset, it will reboot in AP mode.");
   });
-}
+};
 
 function findOrAddContainer(cd) {
   let elId = `c${cd.type}-${cd.id}`;
@@ -495,7 +496,7 @@ function findOrAddContainer(cd) {
         setComponentState(c, {tgt_pos: 0}, el(c, "close_spinner"));
       };
       el(c, "save_btn").onclick = function () {
-        wcSetConfig(c, null, el(c, "save_spinner"))
+        wcSetConfig(c, null, el(c, "save_spinner"));
       };
       el(c, "cal_btn").onclick = function () {
         setComponentState(c, {state: 10}, null);
@@ -682,6 +683,7 @@ function updateComponent(cd) {
       selectIfNotModified(el(c, "in_mode"), cd.in_mode);
       checkIfNotModified(el(c, "swap_inputs"), cd.swap_inputs);
       checkIfNotModified(el(c, "swap_outputs"), cd.swap_outputs);
+      setValueIfNotModified(el(c, "tilt_time_ms"), cd.tile_time_ms);
       let posText, calText;
       if (cd.cal_done == 1) {
         if (cd.cur_pos != cd.tgt_pos) {
@@ -1488,7 +1490,7 @@ async function uploadFW(blob, spinner, status, ar) {
 
 // major.minor.patch-variantN
 function parseVersion(versionString) {
-  version = versionString.match(/^(?<major>\d+).(?<minor>\d+).(?<patch>\d+)-?(?<variant>[a-z]*)(?<varSeq>\d*)$/).groups
+  version = versionString.match(/^(?<major>\d+).(?<minor>\d+).(?<patch>\d+)-?(?<variant>[a-z]*)(?<varSeq>\d*)$/).groups;
   version.major = parseInt(version.major);
   version.minor = parseInt(version.minor);
   version.patch = parseInt(version.patch);
@@ -1579,7 +1581,7 @@ function checkUpdate() {
       se.className = "";
       e.innerHTML = `
         Version ${latestVersion} is available.
-        See <a href="${relNotesURL}" target="_blank">release notes</a>.`
+        See <a href="${relNotesURL}" target="_blank">release notes</a>.`;
       el("update_btn_text").innerText = "Install";
       el("update_btn").onclick = function () {
         return downloadUpdate(updateURL, el("fw_spinner"), el("update_status"));
diff --git a/mos.yml b/mos.yml
index 0be831a1..c961bbf4 100644
--- a/mos.yml
+++ b/mos.yml
@@ -72,8 +72,10 @@ config_schema:
   - ["wc.idle_power_thr", "d", 10.0, {title: "Power consumption threshold for motor idle detection"}]
   - ["wc.move_power", "d", 0.0, {title: "Power consumption during movement, watts"}]
   - ["wc.move_time_ms", "i", 0, {title: "Move time, in millseconds"}]
-  - ["wc.max_ramp_up_time_ms", "i", 5000, {title: "Maximum ramp up time, in millseconds"}]
+  - ["wc.tilt_time_ms", "i", 0, {title: "Time for turn from min to max tilt angle, in milliseconds; 0 to disable slat feature"}]
+  - ["wc.max_ramp_up_time_ms", "i", 5000, {title: "Maximum ramp up time, in milliseconds"}]
   - ["wc.current_pos", "d", 0.0, {title: "Last position, percent: 0 - fully closed, 100 - fully open."}]
+  - ["wc.current_tilt", "d", 0.0, {title: "Last tilt, percent: 0 - fully towards minimum, 100 - fully towards maximum"}]
 
   - ["gdo", "o", {title: "Garage door settings", abstract: true}]
   - ["gdo.name", "s", "Garage Door", {title: "Accessory name"}]
diff --git a/src/shelly_hap_window_covering.cpp b/src/shelly_hap_window_covering.cpp
index 096c5983..ef262517 100644
--- a/src/shelly_hap_window_covering.cpp
+++ b/src/shelly_hap_window_covering.cpp
@@ -37,6 +37,8 @@ WindowCovering::WindowCovering(int id, Input *in0, Input *in1, Output *out0,
       state_timer_(std::bind(&WindowCovering::RunOnce, this)),
       cur_pos_(cfg_->current_pos),
       tgt_pos_(cfg_->current_pos),
+      cur_tilt_(cfg->current_tilt),
+      tgt_tilt_(cfg->current_tilt),
       move_ms_per_pct_(cfg_->move_time_ms / 100.0) {
   if (!cfg_->swap_inputs) {
     in_open_ = in0;
@@ -149,6 +151,41 @@ Status WindowCovering::Init() {
       true /* supports_notification */, nullptr /* write_handler */,
       kHAPCharacteristicDebugDescription_ObstructionDetected);
   AddChar(obst_char_);
+  // Tilt Angle (only if configured)
+  if (cfg_->tilt_time_ms != 0) {
+    // Target Horizontal Tilt Angle
+    tgt_tilt_char_ = new mgos::hap::UInt8Characteristic(
+        iid++, &kHAPCharacteristicType_TargetHorizontalTiltAngle, 0, 100, 1,
+        [this](HAPAccessoryServerRef *, const HAPUInt8CharacteristicReadRequest *,
+              uint8_t *value) {
+          *value = tgt_tilt_;
+          return kHAPError_None;
+        },
+        true /* supports_notification */,
+        [this](HAPAccessoryServerRef *,
+              const HAPUInt8CharacteristicWriteRequest *, uint8_t value) {
+          // We need to decouple from the current invocation
+          // because we may want to raise a notification on the target position
+          // and we can't do that within the write callback.
+          mgos::InvokeCB(std::bind(&WindowCovering::HAPSetTgtTilt, this, value));
+          return kHAPError_None;
+        },
+        kHAPCharacteristicDebugDescription_TargetHorizontalTiltAngle);
+    AddChar(tgt_tilt_char_);
+    
+    // Current Horizontal Tilt Angle
+    cur_tilt_char_ = new mgos::hap::UInt8Characteristic(
+        iid++, &kHAPCharacteristicType_CurrentHorizontalTiltAngle, 0, 100, 1,
+        [this](HAPAccessoryServerRef *, const HAPUInt8CharacteristicReadRequest *,
+              uint8_t *value) {
+          *value = cur_tilt_;
+          return kHAPError_None;
+        },
+        true /* supports_notification */, nullptr /* write_handler */,
+        kHAPCharacteristicDebugDescription_CurrentHorizontalTiltAngle);
+    AddChar(cur_tilt_char_);
+  }
+
   switch (static_cast<InMode>(cfg_->in_mode)) {
     case InMode::kSeparateMomentary:
     case InMode::kSeparateToggle:
@@ -186,9 +223,11 @@ std::string WindowCovering::name() const {
 StatusOr<std::string> WindowCovering::GetInfo() const {
   return mgos::SPrintf(
       "c:%d mp:%.2f mt_ms:%d cp:%.2f tp:%.2f "
+      "tt_ms:%d ct:%.2f tt:%.2f "
       "md:%d lemd:%d lhmd:%d",
       cfg_->calibrated, cfg_->move_power, cfg_->move_time_ms, cur_pos_,
-      tgt_pos_, (int) moving_dir_, (int) last_ext_move_dir_,
+      tgt_pos_, cfg_->tilt_time_ms, cur_tilt_, tgt_tilt_, 
+      (int) moving_dir_, (int) last_ext_move_dir_,
       (int) last_hap_move_dir_);
 }
 
@@ -197,11 +236,13 @@ StatusOr<std::string> WindowCovering::GetInfoJSON() const {
       "{id: %d, type: %d, name: %Q, "
       "in_mode: %d, swap_inputs: %B, swap_outputs: %B, "
       "cal_done: %B, move_time_ms: %d, move_power: %d, "
-      "state: %d, state_str: %Q, cur_pos: %d, tgt_pos: %d}",
+      "tilt_time_ms: %d, state: %d, state_str: %Q, "
+      "cur_pos: %d, tgt_pos: %d, cur_tilt: %d, tgt_tilt: %d}",
       id(), type(), cfg_->name, cfg_->in_mode, cfg_->swap_inputs,
       cfg_->swap_outputs, cfg_->calibrated, cfg_->move_time_ms,
-      (int) cfg_->move_power, (int) state_, StateStr(state_), (int) cur_pos_,
-      (int) tgt_pos_);
+      (int) cfg_->move_power, cfg_->tilt_time_ms, (int) state_,
+      StateStr(state_), (int) cur_pos_, (int) tgt_pos_,
+      (int) cur_tilt_, (int) tgt_tilt_);
 }
 
 Status WindowCovering::SetConfig(const std::string &config_json,
@@ -350,6 +391,25 @@ void WindowCovering::SetTgtPos(float new_tgt_pos, const char *src) {
   tgt_pos_char_->RaiseEvent();
 }
 
+void WindowCovering::SetCurTilt(float new_cur_tilt, float p) {
+  new_cur_tilt = new_cur_tilt;
+  if (new_cur_tilt == cur_tilt_) return;
+  LOG_EVERY_N(LL_INFO, 8,
+              ("WC %d: Cur tilt %.2f -> %.2f, P = %.2f", id(), cur_tilt_,
+               new_cur_tilt, p));
+  cur_tilt_ = new_cur_tilt;
+  cfg_->current_tilt = cur_tilt_;
+  cur_tilt_char_->RaiseEvent();
+}
+
+void WindowCovering::SetTgtTilt(float new_tgt_tilt, const char *src) {
+  new_tgt_tilt = TrimPos(new_tgt_tilt);
+  if (new_tgt_tilt == tgt_tilt_) return;
+  LOG(LL_INFO,
+      ("WC %d: Tgt tilt %.2f -> %.2f (%s)", id(), tgt_tilt_, new_tgt_tilt, src));
+  tgt_tilt_ = new_tgt_tilt;
+  tgt_tilt_char_->RaiseEvent();
+}
 // We want tile taps to cycle the open-stop-close-stop sequence.
 // Problem is, tile taps behave as "prefer close": Home will send
 // 0 ("fully close") if tile is tapped while in the intermediate position.
@@ -367,6 +427,7 @@ void WindowCovering::HAPSetTgtPos(float value) {
   if (mgos_uptime_micros() - last_hap_set_tgt_pos_ > 60 * 1000000) {
     last_hap_move_dir_ = Direction::kNone;
   }
+  // TODO: restore tilt position after moving
   LOG(LL_INFO, ("WC %d: HAPSetTgtPos %.2f cur %.2f tgt %.2f lhmd %d", id(),
                 value, cur_pos_, tgt_pos_, (int) last_hap_move_dir_));
   // If the specified position is intermediate, just do what we are told.
@@ -394,6 +455,10 @@ void WindowCovering::HAPSetTgtPos(float value) {
   RunOnce();
 }
 
+void WindowCovering::HAPSetTgtTilt(float value) {
+  // TODO: Implement
+}
+
 WindowCovering::Direction WindowCovering::GetDesiredMoveDirection() {
   if (tgt_pos_ == kNotSet) return Direction::kNone;
   float pos_diff = tgt_pos_ - cur_pos_;
diff --git a/src/shelly_hap_window_covering.hpp b/src/shelly_hap_window_covering.hpp
index b85cd72e..c18beb53 100644
--- a/src/shelly_hap_window_covering.hpp
+++ b/src/shelly_hap_window_covering.hpp
@@ -101,7 +101,11 @@ class WindowCovering : public Component, public mgos::hap::Service {
   void SetCurPos(float new_cur_pos, float p);
   void SetTgtPos(float new_tgt_pos, const char *src);
 
+  void SetCurTilt(float new_cur_tilt, float p);
+  void SetTgtTilt(float new_tgt_tilt, const char *src);
+
   void HAPSetTgtPos(float value);
+  void HAPSetTgtTilt(float value);
 
   Direction GetDesiredMoveDirection();
   void Move(Direction dir);
@@ -124,11 +128,15 @@ class WindowCovering : public Component, public mgos::hap::Service {
 
   mgos::hap::Characteristic *cur_pos_char_ = nullptr;
   mgos::hap::Characteristic *tgt_pos_char_ = nullptr;
+  mgos::hap::Characteristic *cur_tilt_char_ = nullptr;
+  mgos::hap::Characteristic *tgt_tilt_char_ = nullptr;
   mgos::hap::Characteristic *pos_state_char_ = nullptr;
   mgos::hap::Characteristic *obst_char_ = nullptr;
 
   float cur_pos_ = kNotSet;
   float tgt_pos_ = kNotSet;
+  float cur_tilt_ = kNotSet;
+  float tgt_tilt_ = kNotSet;
 
   State state_ = State::kIdle;
   State tgt_state_ = State::kNone;