25 files changed, 3471 insertions, 169 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
index a473f28..944b1b9 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
@@ -91,20 +91,18 @@ namespace gui
     /// @param[in] label                Item label
     /// @param[in] label2               Second Item label (if needed)
     /// @param[in] iconImage            Item icon image (if needed)
-    /// @param[in] thumbnailImage       Thumbnail Image of item (if needed)
     /// @param[in] path                 Path to where item is defined
     ///
     CListItem(
       const std::string& label = "",
       const std::string& label2 = "",
       const std::string& iconImage = "",
-      const std::string& thumbnailImage = "",
       const std::string& path = "")
       : CAddonGUIControlBase(nullptr)
     {
       m_controlHandle = m_interface->kodi_gui->listItem->create(m_interface->kodiBase, label.c_str(),
                                                                 label2.c_str(), iconImage.c_str(),
-                                                                thumbnailImage.c_str(), path.c_str());
+                                                                path.c_str());
     }
 
     /*
@@ -124,7 +122,7 @@ namespace gui
     /// \ingroup cpp_kodi_gui_CListItem
     /// @brief Class destructor
     ///
-    virtual ~CListItem()
+    ~CListItem() override
     {
       m_interface->kodi_gui->listItem->destroy(m_interface->kodiBase, m_controlHandle);
     }
@@ -330,6 +328,86 @@ namespace gui
     }
     //--------------------------------------------------------------------------
 
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Sets a listitem property, similar to an infolabel.
+    ///
+    /// @param[in] key            string - property name.
+    /// @param[in] value          string or unicode - value of property.
+    ///
+    /// @note Key is NOT case sensitive.
+    ///       You can use the above as keywords for arguments and skip certain\n
+    ///       optional arguments.\n
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    /// Some of these are treated internally by Kodi, such as the
+    /// <b>'StartOffset'</b> property, which is the offset in seconds at which to
+    /// start playback of an item.  Others may be used in the skin to add
+    /// extra information, such as <b>'WatchedCount'</b> for tvshow items
+    ///
+    void SetProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->listItem->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Returns a listitem property as a string, similar to an infolabel.
+    ///
+    /// @param[in] key                string - property name.
+    /// @return                       string - List item property
+    ///
+    /// @note Key is NOT case sensitive.\n
+    ///       You can use the above as keywords for arguments and skip certain
+    ///       optional arguments.\n
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    std::string GetProperty(const std::string& key)
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->listItem->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief To control selection of item in list (also multiple selection,
+    /// in list on serveral items possible).
+    ///
+    /// @param[in] selected             if true becomes set as selected
+    ///
+    void Select(bool selected)
+    {
+      m_interface->kodi_gui->listItem->select(m_interface->kodiBase, m_controlHandle, selected);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Returns the listitem's selected status.
+    ///
+    /// @return                         true if selected, otherwise false
+    ///
+    bool IsSelected()
+    {
+      return m_interface->kodi_gui->listItem->is_selected(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
   };
 
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
index 7069e63..b78585f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -110,7 +110,7 @@ namespace gui
     ///
     ///
     ///
-    virtual ~CWindow()
+    ~CWindow() override
     {
       if (m_controlHandle)
         m_interface->kodi_gui->window->destroy(m_interface->kodiBase, m_controlHandle);
@@ -166,6 +166,232 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Gives the control with the supplied focus.
+    ///
+    /// @param[in] iControlId           On skin defined id of control
+    /// @return                         Return true if call and focus is successed,
+    ///                                 if false was something failed to get needed
+    ///                                 skin parts.
+    ///
+    ///
+    bool SetFocusId(int iControlId)
+    {
+      return m_interface->kodi_gui->window->set_focus_id(m_interface->kodiBase, m_controlHandle, iControlId);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns the id of the control which is focused.
+    ///
+    /// @return                         Focused control id
+    ///
+    ///
+    int GetFocusId()
+    {
+      return m_interface->kodi_gui->window->get_focus_id(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set the used label on given control id
+    ///
+    /// @param[in] controlId            Control id where label need to set
+    /// @param[in] label                Label to use
+    ///
+    ///
+    void SetControlLabel(int controlId, const std::string& label)
+    {
+      m_interface->kodi_gui->window->set_control_label(m_interface->kodiBase, m_controlHandle, controlId, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property, similar to an infolabel.
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                string or unicode - value of property.
+    ///
+    /// @note  Key is NOT case sensitive. Setting value to an empty string is
+    ///        equivalent to clearProperty(key).\n
+    ///        You can use the above as keywords for arguments and skip certain
+    ///        optional arguments.\n
+    ///        Once you use a keyword, all following arguments require the keyword.
+    ///
+    void SetProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property as a string, similar to an infolabel.
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         The property as strin (if present)
+    ///
+    /// @note  Key is NOT case sensitive. Setting value to an empty string is
+    ///        equivalent to clearProperty(key).\n
+    ///        You can use the above as keywords for arguments and skip certain
+    ///        optional arguments.\n
+    ///        Once you use a keyword, all following arguments require the keyword.
+    ///
+    ///
+    std::string GetProperty(const std::string& key) const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->window->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with integer value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                integer value to set
+    ///
+    ///
+    void SetPropertyInt(const std::string& key, int value)
+    {
+      m_interface->kodi_gui->window->set_property_int(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with integer value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         integer value of property
+    ///
+    int GetPropertyInt(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_int(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with boolean value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                boolean value to set
+    ///
+    ///
+    void SetPropertyBool(const std::string& key, bool value)
+    {
+      m_interface->kodi_gui->window->set_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with boolean value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         boolean value of property
+    ///
+    bool GetPropertyBool(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with double value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                double value to set
+    ///
+    ///
+    void SetPropertyDouble(const std::string& key, double value)
+    {
+      m_interface->kodi_gui->window->set_property_double(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with double value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         double value of property
+    ///
+    ///
+    double GetPropertyDouble(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_double(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove all present properties from window
+    ///
+    ///
+    ///
+    void ClearProperties()
+    {
+      m_interface->kodi_gui->window->clear_properties(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Clears the specific window property.
+    ///
+    /// @param[in] key                string - property name.
+    ///
+    /// @note Key is NOT case sensitive. Equivalent to SetProperty(key, "")
+    ///       You can use the above as keywords for arguments and skip certain
+    ///       optional arguments.
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    ///
+    ///-----------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    /// ..
+    /// ClearProperty('Category')
+    /// ..
+    /// ~~~~~~~~~~~~~
+    ///
+    void ClearProperty(const std::string& key)
+    {
+      m_interface->kodi_gui->window->clear_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //@{
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
     /// @brief Function delete all entries in integrated list.
     ///
     ///
@@ -209,6 +435,34 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove list item on position.
+    ///
+    /// @param[in] itemPosition         List position to remove
+    ///
+    ///
+    void RemoveListItem(int itemPosition)
+    {
+      m_interface->kodi_gui->window->remove_list_item_from_position(m_interface->kodiBase, m_controlHandle, itemPosition);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove item with given control class from list.
+    ///
+    /// @param[in] item                 List item control class to remove
+    ///
+    ///
+    void RemoveListItem(ListItemPtr item)
+    {
+      m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle, item->m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
     /// @brief To get list item control class on wanted position.
     ///
     /// @param[in] listPos              Position from where control is needed
@@ -227,6 +481,135 @@ namespace gui
     //--------------------------------------------------------------------------
 
     //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set position of selected part in list.
+    ///
+    /// @param[in] listPos              Position to use
+    ///
+    ///
+    void SetCurrentListPosition(int listPos)
+    {
+      m_interface->kodi_gui->window->set_current_list_position(m_interface->kodiBase, m_controlHandle, listPos);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To get current selected position in list
+    ///
+    /// @return                         Current list position
+    ///
+    ///
+    int GetCurrentListPosition()
+    {
+      return m_interface->kodi_gui->window->get_current_list_position(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To get the amount of entries in the list.
+    ///
+    /// @return                         Size of in window integrated control class
+    ///
+    ///
+    int GetListSize()
+    {
+      return m_interface->kodi_gui->window->get_list_size(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a container property, similar to an infolabel.
+    ///
+    /// @param[in] key        string - property name.
+    /// @param[in] value      string or unicode - value of property.
+    ///
+    /// @note Key is NOT case sensitive.\n
+    /// You can use the above as keywords for arguments and skip certain
+    /// optional arguments.\n
+    /// Once you use a keyword, all following arguments require the keyword.
+    ///
+    ///
+    void SetContainerProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_container_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets the content type of the container.
+    ///
+    /// @param[in] value      string or unicode - content value.
+    ///
+    /// __Available content types__
+    /// | Name        | Media                                    |
+    /// |:-----------:|:-----------------------------------------|
+    /// | actors      | Videos
+    /// | addons      | Addons, Music, Pictures, Programs, Videos
+    /// | albums      | Music, Videos
+    /// | artists     | Music, Videos
+    /// | countries   | Music, Videos
+    /// | directors   | Videos
+    /// | files       | Music, Videos
+    /// | games       | Games
+    /// | genres      | Music, Videos
+    /// | images      | Pictures
+    /// | mixed       | Music, Videos
+    /// | movies      | Videos
+    /// | Musicvideos | Music, Videos
+    /// | playlists   | Music, Videos
+    /// | seasons     | Videos
+    /// | sets        | Videos
+    /// | songs       | Music
+    /// | studios     | Music, Videos
+    /// | tags        | Music, Videos
+    /// | tvshows     | Videos
+    /// | videos      | Videos
+    /// | years       | Music, Videos
+    ///
+    ///
+    void SetContainerContent(const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_container_content(m_interface->kodiBase, m_controlHandle, value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Get the id of the currently visible container.
+    ///
+    /// @return               currently visible container id
+    ///
+    ///
+    int GetCurrentContainerId()
+    {
+      return m_interface->kodi_gui->window->get_current_container_id(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+    //@}
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To inform Kodi that it need to render region new.
+    ///
+    ///
+    void MarkDirtyRegion()
+    {
+      return m_interface->kodi_gui->window->mark_dirty_region(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
     //
     /// @defgroup cpp_kodi_gui_CWindow_callbacks Callback functions from Kodi to add-on
     /// \ingroup cpp_kodi_gui_CWindow
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
new file mode 100644
index 0000000..5892d24
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
@@ -0,0 +1,176 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CButton Control Button
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CButton }
+  /// **Standard push button control for window**
+  ///
+  /// The  button  control  is used for creating push buttons  in Kodi.  You can
+  /// choose the position,  size,  and look of the button,  as well as  choosing
+  /// what action(s) should be performed when pushed.
+  ///
+  /// It has the header \ref Button.h "#include <kodi/gui/controls/Button.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref skin_Button_control "button control"
+  ///
+  /// @note The call of the control is  only  possible  from  the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CButton : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CButton(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_button(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CButton can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Destructor
+    ///
+    ~CButton() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_button->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled              If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_button->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief To set the text string on button
+    ///
+    /// @param[in] label                Text to show
+    ///
+    void SetLabel(const std::string& label)
+    {
+      m_interface->kodi_gui->control_button->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Get the used text from button
+    ///
+    /// @return                         Text shown
+    ///
+    std::string GetLabel() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_button->get_label(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief If two labels are used for button becomes it set with them
+    ///
+    /// @param[in] label                Text for second label
+    ///
+    void SetLabel2(const std::string& label)
+    {
+      m_interface->kodi_gui->control_button->set_label2(m_interface->kodiBase, m_controlHandle, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_gui_control_CButton
+    /// @brief Get the second label if present
+    ///
+    /// @return                         Second label
+    ///
+    std::string GetLabel2() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_button->get_label2(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
new file mode 100644
index 0000000..83eeede
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
@@ -0,0 +1,276 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CEdit Control Edit
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CEdit }
+  /// **Editable window text control used as an input control for the osd keyboard
+  /// and other input fields**
+  ///
+  /// The edit control  allows a user to  input text in Kodi. You can choose the
+  /// font, size, colour, location and header of the text to be displayed.
+  ///
+  /// It has the header \ref Edit.h "#include <kodi/gui/controls/Edit.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here  you  find  the   needed  skin  part  for  a   \ref skin_Edit_control
+  /// "edit control".
+  ///
+  /// @note The  call of the  control is only possible  from  the  corresponding
+  /// window as its class and identification number is required.
+  ///
+
+  //============================================================================
+  // see gui/definition.h for use of group "cpp_kodi_gui_controls_CEdit_Defs"
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CEdit_Defs Definitions, structures and enumerators
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief **Library definition values**
+  ///
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
+
+//============================================================================
+///
+/// \ingroup cpp_kodi_gui_controls_CEdit_Defs
+/// @{
+/// @anchor AddonGUIInputType
+/// @brief Text input types used on kodi::gui::controls::CEdit
+enum AddonGUIInputType
+{
+  /// Text inside edit control only readable
+  ADDON_INPUT_TYPE_READONLY = -1,
+  /// Normal text entries
+  ADDON_INPUT_TYPE_TEXT = 0,
+  /// To use on edit control only numeric numbers
+  ADDON_INPUT_TYPE_NUMBER,
+  /// To insert seconds
+  ADDON_INPUT_TYPE_SECONDS,
+  /// To insert time
+  ADDON_INPUT_TYPE_TIME,
+  /// To insert a date
+  ADDON_INPUT_TYPE_DATE,
+  /// Used for write in IP addresses
+  ADDON_INPUT_TYPE_IPADDRESS,
+  /// Text field used as password entry field with not visible text
+  ADDON_INPUT_TYPE_PASSWORD,
+  /// Text field used as password entry field with not visible text but
+  /// returned as MD5 value
+  ADDON_INPUT_TYPE_PASSWORD_MD5,
+  /// Use text field for search purpose
+  ADDON_INPUT_TYPE_SEARCH,
+  /// Text field as filter
+  ADDON_INPUT_TYPE_FILTER,
+  ///
+  ADDON_INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW
+};
+/// @}
+//----------------------------------------------------------------------------
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  class CEdit : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CEdit(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_edit(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::control::CEdit can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Destructor
+    ///
+    ~CEdit() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_edit->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled              If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_edit->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief To set the text string on edit control
+    ///
+    /// @param[in] label                Text to show
+    ///
+    void SetLabel(const std::string& label)
+    {
+      m_interface->kodi_gui->control_edit->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Returns the text heading for this edit control.
+    ///
+    /// @return                         Heading text
+    ///
+    std::string GetLabel() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_edit->get_label(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Set's text heading for this edit control.
+    ///
+    /// @param[in] text                 string or unicode - text string.
+    ///
+    void SetText(const std::string& text)
+    {
+      m_interface->kodi_gui->control_edit->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Returns the text value for this edit control.
+    ///
+    /// @return                         Text value of control
+    ///
+    std::string GetText() const
+    {
+      std::string text;
+      char* ret = m_interface->kodi_gui->control_edit->get_text(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          text = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return text;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief Set the cursor position on text.
+    ///
+    /// @param[in] iPosition            The position to set
+    ///
+    void SetCursorPosition(unsigned int iPosition)
+    {
+      m_interface->kodi_gui->control_edit->set_cursor_position(m_interface->kodiBase, m_controlHandle, iPosition);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief To get current cursor position on text field
+    ///
+    /// @return                         The current cursor position
+    ///
+    unsigned int GetCursorPosition()
+    {
+      return m_interface->kodi_gui->control_edit->get_cursor_position(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CEdit
+    /// @brief To set field input type which are defined on \ref AddonGUIInputType
+    ///
+    /// @param[in] type                 The \ref AddonGUIInputType "Add-on input type"
+    ///                                 to use
+    /// @param[in] heading              The heading text for related keyboard
+    ///                                 dialog
+    ///
+    void SetInputType(AddonGUIInputType type, const std::string& heading)
+    {
+      m_interface->kodi_gui->control_edit->set_input_type(m_interface->kodiBase, m_controlHandle, static_cast<int>(type), heading.c_str());
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
new file mode 100644
index 0000000..82d17ff
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
@@ -0,0 +1,159 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CFadeLabel Control Fade Label
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CFadeLabel }
+  /// **Window control used to show multiple pieces of text in the same position,
+  /// by fading from one to the other**
+  ///
+  /// The fade label  control is used for displaying multiple pieces  of text in
+  /// the same  space in  Kodi. You can choose  the font, size, colour, location
+  /// and contents  of the text to be displayed.  The first piece of information
+  /// to display fades in over 50 frames, then scrolls off to the left.  Once it
+  /// is  finished scrolling off screen,  the second piece  of information fades
+  /// in and  the process repeats.  A fade label  control is not  supported in a
+  /// list container.
+  ///
+  /// It has the header \ref FadeLabel.h "#include <kodi/gui/controls/FadeLabel.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Fade_Label_Control "fade label control"
+  ///
+  /// @note The  call of the  control is only  possible from  the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CFadeLabel : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief Construct a new control.
+    ///
+    /// @param[in] window     related window control class
+    /// @param[in] controlId  Used skin xml control id
+    ///
+    CFadeLabel(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_fade_label(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CFadeLabel can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief Destructor.
+    ///
+    ~CFadeLabel() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief Set the control on window to visible.
+    ///
+    /// @param[in] visible    If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_fade_label->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief To add additional text string on fade label.
+    ///
+    /// @param[in] label      Text to show
+    ///
+    void AddLabel(const std::string& label)
+    {
+      m_interface->kodi_gui->control_fade_label->add_label(m_interface->kodiBase, m_controlHandle, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief Get the used text from button
+    ///
+    /// @return               Text shown
+    ///
+    std::string GetLabel() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_fade_label->get_label(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief To enable or disable scrolling on fade label
+    ///
+    /// @param[in] scroll     To  enable scrolling  set  to true,  otherwise  is
+    ///                       disabled
+    ///
+    void SetScrolling(bool scroll)
+    {
+      m_interface->kodi_gui->control_fade_label->set_scrolling(m_interface->kodiBase, m_controlHandle, scroll);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+    /// @brief To reset al inserted labels.
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_fade_label->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
new file mode 100644
index 0000000..1179fab
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
@@ -0,0 +1,123 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CImage Control Image
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CImage }
+  /// **Window control used to show an image.**
+  ///
+  /// The  image control is used  for displaying  images in Kodi. You can choose
+  /// the position, size, transparency and contents of the image to be displayed.
+  ///
+  /// It has the header \ref Image.h "#include <kodi/gui/controls/Image.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Image_Control "image control"
+  ///
+  /// @note The  call of  the control is  only possible  from the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CImage : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CImage
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CImage(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_image(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CImage can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CImage
+    /// @brief Destructor
+    ///
+    ~CImage() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CImage
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_image->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CImage
+    /// @brief To set the filename used on image control.
+    ///
+    /// @param[in] filename             Image file to use
+    /// @param[in] useCache             To define  storage of image,  default is
+    ///                                 in  cache,  if false  becomes it  loaded
+    ///                                 always on changes again
+    ///
+    void SetFileName(const std::string& filename, bool useCache = true)
+    {
+      m_interface->kodi_gui->control_image->set_filename(m_interface->kodiBase, m_controlHandle, filename.c_str(), useCache);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CImage
+    /// @brief To set set the diffuse color on image.
+    ///
+    /// @param[in] colorDiffuse         Color to use for diffuse
+    ///
+    void SetColorDiffuse(uint32_t colorDiffuse)
+    {
+      m_interface->kodi_gui->control_image->set_color_diffuse(m_interface->kodiBase, m_controlHandle, colorDiffuse);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
new file mode 100644
index 0000000..f74ac03
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
@@ -0,0 +1,128 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CLabel Control Label
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CLabel }
+  /// **Window control used to show some lines of text.**
+  ///
+  /// The  label control  is used for  displaying text  in Kodi.  You can choose
+  /// the font, size, colour, location and contents of the text to be displayed.
+  ///
+  /// It has the header \ref Label.h "#include <kodi/gui/controls/Label.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Label_Control "label control"
+  ///
+  /// @note The  call  of the control  is only possible  from the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CLabel : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CLabel
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CLabel(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_label(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CLabel can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CLabel
+    /// @brief Destructor
+    ///
+    ~CLabel() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CLabel
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_label->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CLabel
+    /// @brief To set the text string on label
+    ///
+    /// @param[in] text                 Text to show
+    ///
+    void SetLabel(const std::string& text)
+    {
+      m_interface->kodi_gui->control_label->set_label(m_interface->kodiBase, m_controlHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CLabel
+    /// @brief Get the used text from control
+    ///
+    /// @return                         Used text on label control
+    ///
+    std::string GetLabel() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_label->get_label(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
new file mode 100644
index 0000000..44310ed
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
@@ -0,0 +1,121 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CProgress Control Progress
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CProgress }
+  /// **Window control to show the progress of a particular operation**
+  ///
+  /// The progress control is used to show the progress of an item that may take
+  /// a long time,  or to show how far  through a movie you are.  You can choose
+  /// the position, size, and look of the progress control.
+  ///
+  /// It has the header \ref Progress.h "#include <kodi/gui/controls/Progress.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Progress_Control "progress control"
+  ///
+  /// @note The call of the control is only possible from the corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CProgress : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CProgress
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CProgress(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_progress(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CProgress can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CProgress
+    /// @brief Destructor
+    ///
+    ~CProgress() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CProgress
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_progress->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CProgress
+    /// @brief To set Percent position of control
+    ///
+    /// @param[in] percent              The percent position to use
+    ///
+    void SetPercentage(float percent)
+    {
+      m_interface->kodi_gui->control_progress->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CProgress
+    /// @brief Get the active percent position of progress bar
+    ///
+    /// @return                         Progress position as percent
+    ///
+    float GetPercentage() const
+    {
+      return m_interface->kodi_gui->control_progress->get_percentage(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
new file mode 100644
index 0000000..b87920d
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
@@ -0,0 +1,171 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CRadioButton Control Radio Button
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CRadioButton }
+  /// **Window control for a radio button (as used for on/off settings)**
+  ///
+  /// The radio  button control is used for creating push button on/off settings
+  /// in Kodi. You can choose the position,  size,  and look of the button. When
+  /// the user clicks on the radio button,  the state will change,  toggling the
+  /// extra  textures  (textureradioon and textureradiooff).  Used  for settings
+  /// controls.
+  ///
+  /// It has the header \ref RadioButton.h "#include <kodi/gui/controls/RadioButton.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Radio_button_control "radio button control"
+  ///
+  /// @note The  call  of the  control is  only possible  from the corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CRadioButton : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window     related window control class
+    /// @param[in] controlId  Used skin xml control id
+    ///
+    CRadioButton(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_radio_button(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CRadioButton can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Destructor
+    ///
+    ~CRadioButton() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible    If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_radio_button->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled    If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_radio_button->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief To set the text string on radio button
+    ///
+    /// @param[in] label      Text to show
+    ///
+    void SetLabel(const std::string& label)
+    {
+      m_interface->kodi_gui->control_radio_button->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Get the used text from control
+    ///
+    /// @return               Text shown
+    ///
+    std::string GetLabel() const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->control_radio_button->get_label(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief To set radio button condition to on or off
+    ///
+    /// @param[in] selected   true set radio button to  selection on,  otherwise
+    ///                       off
+    ///
+    void SetSelected(bool selected)
+    {
+      m_interface->kodi_gui->control_radio_button->set_selected(m_interface->kodiBase, m_controlHandle, selected);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRadioButton
+    /// @brief Get the current selected condition of radio button
+    ///
+    /// @return               Selected condition
+    ///
+    bool IsSelected() const
+    {
+      return m_interface->kodi_gui->control_radio_button->is_selected(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
new file mode 100644
index 0000000..f80fcfa
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
@@ -0,0 +1,215 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CRendering Control Rendering
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CRendering }
+  /// **Window control for rendering own parts**
+  ///
+  /// This rendering control is used  when own parts are needed.  You  have  the
+  /// control  over them  to render direct  OpenGL or  DirectX  content  to  the
+  /// screen set by the size of them.
+  ///
+  /// Alternative  can be  the virtual  functions from t his been ignored if the
+  /// callbacks are  defined  by the  \ref CRendering_SetIndependentCallbacks function  and
+  /// class is used as single and not as a parent class.
+  ///
+  /// It has the header \ref Rendering.h "#include <kodi/gui/controls/Rendering.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Addon_Rendering_control "rendering control"
+  ///
+  /// @note The  call of  the control is only  possible  from  the corresponding
+  /// window as its class and identification number is required.
+  ///
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CRendering_Defs Definitions, structures and enumerators
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief **Library definition values**
+  ///
+
+  class CRendering : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CRendering(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_render_addon(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (m_controlHandle)
+        m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
+                                                                OnCreateCB, OnRenderCB, OnStopCB, OnDirtyCB);
+      else
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::%s can't create control class from Kodi !!!", __FUNCTION__);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief Destructor
+    ///
+    ~CRendering() override
+    {
+      m_interface->kodi_gui->control_rendering->destroy(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief To create rendering control on Add-on
+    ///
+    /// Function  creates the  needed rendering  control for Kodi  which becomes
+    /// handled and processed from Add-on
+    ///
+    /// @note This is  callback  function  from Kodi  to  Add-on and  not to use
+    /// for calls from add-on to this function.
+    ///
+    /// @param[in] x                    Horizontal position
+    /// @param[in] y                    Vertical position
+    /// @param[in] w                    Width of control
+    /// @param[in] h                    Height of control
+    /// @param[in] device               The device to use.  For OpenGL  is empty
+    ///                                 on Direct X is the needed device send.
+    /// @return                         Add-on needs to return true if successed,
+    ///                                 otherwise false.
+    ///
+    virtual bool Create(int x, int y, int w, int h, void* device) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief Render process call from Kodi
+    ///
+    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+    /// for calls from add-on to this function.
+    ///
+    virtual void Render() { }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief Call from Kodi to stop rendering process
+    ///
+    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+    /// for calls from add-on to this function.
+    ///
+    virtual void Stop() { }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// @brief Call from Kodi where add-on  becomes asked about  dirty rendering
+    /// region.
+    ///
+    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+    /// for calls from add-on to this function.
+    ///
+    virtual bool Dirty() { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CRendering
+    /// \anchor CRendering_SetIndependentCallbacks
+    /// @brief If the  class is used  independent (with "new CRendering")
+    /// and not as  parent (with "cCLASS_own : CRendering") from own must
+    /// be the callback from Kodi to add-on overdriven with own functions!
+    ///
+    void SetIndependentCallbacks(
+        GUIHANDLE             cbhdl,
+        bool      (*CBCreate)(GUIHANDLE cbhdl,
+                              int       x,
+                              int       y,
+                              int       w,
+                              int       h,
+                              void*     device),
+        void      (*CBRender)(GUIHANDLE cbhdl),
+        void      (*CBStop)  (GUIHANDLE cbhdl),
+        bool      (*CBDirty) (GUIHANDLE cbhdl))
+    {
+      if (!cbhdl ||
+          !CBCreate || !CBRender || !CBStop || !CBDirty)
+      {
+        kodi::Log(ADDON_LOG_ERROR, "kodi::gui::controls::%s called with nullptr !!!", __FUNCTION__);
+        return;
+      }
+
+      m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase, m_controlHandle, cbhdl,
+                                          CBCreate, CBRender, CBStop, CBDirty);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    /*
+     * Defined callback functions from Kodi to add-on, for use in parent / child system
+     * (is private)!
+     */
+    static bool OnCreateCB(void* cbhdl, int x, int y, int w, int h, void* device)
+    {
+      return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
+    }
+
+    static void OnRenderCB(void* cbhdl)
+    {
+      static_cast<CRendering*>(cbhdl)->Render();
+    }
+
+    static void OnStopCB(void* cbhdl)
+    {
+      static_cast<CRendering*>(cbhdl)->Stop();
+    }
+
+    static bool OnDirtyCB(void* cbhdl)
+    {
+      return static_cast<CRendering*>(cbhdl)->Dirty();
+    }
+
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
new file mode 100644
index 0000000..e51433a
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
@@ -0,0 +1,323 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CSettingsSlider Control Settings Slider
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CSettingsSlider }
+  /// **Window control for moveable slider with text name**
+  ///
+  /// The settings slider control is  used in the settings  screens for  when an
+  /// option is best  specified on a sliding scale. You can choose the position,
+  /// size, and look of the slider control.  It is basically a cross between the
+  /// button control  and a slider  control.  It has a  label and  focus and non
+  /// focus textures, as well as a slider control on the right.
+  ///
+  /// It has the header \ref SettingsSlider.h "#include <kodi/gui/controls/SettingsSlider.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Settings_Slider_Control "settings slider control"
+  ///
+  /// @note The call  of the control  is only  possible  from the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CSettingsSlider : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CSettingsSlider(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_settings_slider(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSettingsSlider can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Destructor
+    ///
+    ~CSettingsSlider() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled              If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To set the text string on settings slider
+    ///
+    /// @param[in] text                 Text to show
+    ///
+    void SetText(const std::string& text)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To reset slider on defaults
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_settings_slider->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+    /// start and e.g. +10 is  the from here defined position where it reach the
+    /// end.
+    ///
+    /// Ad default is the range from 0 to 100.
+    ///
+    /// The integer interval is as default 1 and can be changed with
+    /// @ref SetIntInterval.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent, floating point  or integer are alone possible.  Combining
+    /// these different  values  can be not  together  and can, therefore,  only
+    /// one each can be used.
+    ///
+    void SetIntRange(int start, int end)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Set the slider position  with the given integer value.  The Range
+    /// must be defined with a call from \ref SetIntRange before.
+    ///
+    /// @param[in] value                Position in range to set with integer
+    ///
+    /// @note Percent, floating point  or integer are alone possible.  Combining
+    /// these different  values ​​can  be not  together and  can, therefore,  only
+    /// one each can be used.
+    ///
+    void SetIntValue(int value)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_int_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To get the current position as integer value.
+    ///
+    /// @return                         The position as integer
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different  values ​​can  be not  together and can,  therefore,  only
+    /// one each can be used.
+    ///
+    int GetIntValue() const
+    {
+      return m_interface->kodi_gui->control_settings_slider->get_int_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To set the  interval steps of slider,  as default is it 1.  If it
+    /// becomes  changed with  this function  will a step  of the user  with the
+    /// value fixed here be executed.
+    ///
+    /// @param[in] interval             Intervall step to set.
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different values  ​​can  be not  together and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetIntInterval(int interval)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_int_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Sets the percent of the slider.
+    ///
+    /// @param[in] percent              float - Percent value of slide
+    ///
+    /// @note Percent, floating point  or integer are alone possible.  Combining
+    /// these different  values ​​can  be not together  and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetPercentage(float percent)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Returns a float of the percent of the slider.
+    ///
+    /// @return                         float - Percent of slider
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different  values ​​can be  not together  and can,  therefore,  only
+    /// one each can be used.
+    ///
+    float GetPercentage() const
+    {
+      return m_interface->kodi_gui->control_settings_slider->get_percentage(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
+    /// start and  e.g.  +25.0 is the from  here defined position where it reach
+    /// the end.
+    ///
+    /// As default is the range 0.0 to 1.0.
+    ///
+    /// The float interval is as default 0.1 and can be changed with
+    /// @ref SetFloatInterval.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different values ​​ can be not  together  and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetFloatRange(float start, float end)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief Set  the slider position  with the given  float value.  The Range
+    /// can be defined with a  call from \ref SetIntRange before,  as default it
+    /// is 0.0 to 1.0.
+    ///
+    /// @param[in] value                Position in range to set with float
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different  values ​​can be not  together  and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetFloatValue(float value)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_float_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To get the current position as float value.
+    ///
+    /// @return                         The position as float
+    ///
+    float GetFloatValue() const
+    {
+      return m_interface->kodi_gui->control_settings_slider->get_float_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+    /// @brief To set  the interval steps of slider,  as default is it 0.1 If it
+    /// becomes changed with this function will a step of the user with the
+    /// value fixed here be executed.
+    ///
+    /// @param[in] interval             Intervall step to set.
+    ///
+    /// @note Percent, floating point or  integer are alone possible.  Combining
+    /// these different values ​​can be not together and can, therefore, only
+    /// one each can be used.
+    ///
+    void SetFloatInterval(float interval)
+    {
+      m_interface->kodi_gui->control_settings_slider->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
new file mode 100644
index 0000000..cbb9b8f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
@@ -0,0 +1,336 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CSlider Control Slider
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CSlider }
+  /// **Window control for moveable slider**
+  ///
+  /// The slider control is used for things where a sliding bar best  represents
+  /// the operation at hand (such as a volume control or seek control).  You can
+  /// choose the position, size, and look of the slider control.
+  ///
+  /// It has the header \ref Slider.h "#include <kodi/gui/controls/Slider.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Slider_Control "slider control"
+  ///
+  /// @note The  call of the  control  is only  possible from  the corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CSlider : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CSlider(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_slider(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSlider can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Destructor
+    ///
+    ~CSlider() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_slider->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled              If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_slider->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To reset slider on defaults
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_slider->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief With GetDescription becomes a string value of position returned.
+    ///
+    /// @return                        Text string about current slider position
+    ///
+    /// The following are the text definition returned from this:
+    /// | Value     | Without range selection | With range selection           |
+    /// |:---------:|:------------------------|:-------------------------------|
+    /// | float     | <c>%2.2f</c>            | <c>[%2.2f, %2.2f]</c>          |
+    /// | integer   | <c>%i</c>               | <c>[%i, %i]</c>                |
+    /// | percent   | <c>%i%%</c>             | <c>[%i%%, %i%%]</c>            |
+    ///
+    std::string GetDescription() const
+    {
+      std::string text;
+      char* ret = m_interface->kodi_gui->control_slider->get_description(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          text = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return text;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+    /// start and e.g. +10 is the from here defined position where it  reach the
+    /// end.
+    ///
+    /// Ad default is the range from 0 to 100.
+    ///
+    /// The integer interval is as default 1 and can be changed with
+    /// @ref SetIntInterval.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent, floating point or  integer are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    void SetIntRange(int start, int end)
+    {
+      m_interface->kodi_gui->control_slider->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup CSlider
+    /// @brief Set the slider position  with the given integer value.  The Range
+    /// must be defined with a call from \ref SetIntRange before.
+    ///
+    /// @param[in] value                Position in range to set with integer
+    ///
+    /// @note Percent, floating point or integer  are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    void SetIntValue(int value)
+    {
+      m_interface->kodi_gui->control_slider->set_int_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To get the current position as integer value.
+    ///
+    /// @return                         The position as integer
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these  different  values  can be not together and can,  therefore,  only
+    /// one each can be used.
+    ///
+    int GetIntValue() const
+    {
+      return m_interface->kodi_gui->control_slider->get_int_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To set the interval  steps of slider,  as default is it 1.  If it
+    /// becomes  changed  with this function  will a step  of the  user with the
+    /// value fixed here be executed.
+    ///
+    /// @param[in] interval             Intervall step to set.
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    void SetIntInterval(int interval)
+    {
+      m_interface->kodi_gui->control_slider->set_int_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Sets the percent of the slider.
+    ///
+    /// @param[in] percent              float - Percent value of slide
+    ///
+    /// @note Percent, floating point or  integer are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    void SetPercentage(float percent)
+    {
+      m_interface->kodi_gui->control_slider->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Returns a float of the percent of the slider.
+    ///
+    /// @return                         float - Percent of slider
+    ///
+    /// @note Percent, floating point or integer  are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    float GetPercentage() const
+    {
+      return m_interface->kodi_gui->control_slider->get_percentage(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
+    /// start and e.g. +25.0 is  the from here  defined position  where it reach
+    /// the end.
+    ///
+    /// As default is the range 0.0 to 1.0.
+    ///
+    /// The float interval is as default 0.1 and can be changed with
+    /// @ref SetFloatInterval.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these  different  values  can be not together and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetFloatRange(float start, float end)
+    {
+      m_interface->kodi_gui->control_slider->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief Set the slider  position with the  given float value.  The  Range
+    /// can be defined with a call from  \ref SetIntRange before,  as default it
+    /// is 0.0 to 1.0.
+    ///
+    /// @param[in] value                Position in range to set with float
+    ///
+    /// @note Percent, floating  point or integer are alone possible.  Combining
+    /// these different values can be not together and can, therefore,  only one
+    /// each can be used.
+    ///
+    void SetFloatValue(float value)
+    {
+      m_interface->kodi_gui->control_slider->set_float_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To get the current position as float value.
+    ///
+    /// @return                         The position as float
+    ///
+    float GetFloatValue() const
+    {
+      return m_interface->kodi_gui->control_slider->get_float_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSlider
+    /// @brief To set the interval  steps of slider, as default is it 0.1  If it
+    /// becomes changed  with this  function  will a step  of the user  with the
+    /// value fixed here be executed.
+    ///
+    /// @param[in] interval             Intervall step to set.
+    ///
+    /// @note Percent, floating point or integer  are alone possible.  Combining
+    /// these different  values can be  not together  and can,  therefore,  only
+    /// one each can be used.
+    ///
+    void SetFloatInterval(float interval)
+    {
+      m_interface->kodi_gui->control_slider->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
new file mode 100644
index 0000000..b39cd06
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
@@ -0,0 +1,376 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CSpin Control Spin
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CSpin }
+  /// **Window control used for cycling up/down controls**
+  ///
+  /// The settings spin control is used in the settings  screens for when a list
+  /// of options  can be chosen  from using  up/down arrows.  You can choose the
+  /// position,  size,  and look of  the spin control.  It is basically  a cross
+  /// between  the button  control and a spin control.  It has a label and focus
+  /// and non focus textures, as well as a spin control on the right.
+  ///
+  /// It has the header \ref Spin.h "#include <kodi/gui/controls/Spin.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Spin_Control "spin control"
+  ///
+  /// @note The  call of  the  control is  only possible from  the corresponding
+  /// window as its class and identification number is required.
+  ///
+
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSpin
+  /// @anchor AddonGUISpinControlType
+  /// @brief The values here defines the used value format for steps on
+  /// spin control.
+  ///
+  typedef enum AddonGUISpinControlType
+  {
+    /// One spin step interpreted as integer
+    ADDON_SPIN_CONTROL_TYPE_INT    = 1,
+    /// One spin step interpreted as floating point value
+    ADDON_SPIN_CONTROL_TYPE_FLOAT  = 2,
+    /// One spin step interpreted as text string
+    ADDON_SPIN_CONTROL_TYPE_TEXT   = 3,
+    /// One spin step interpreted as a page change value
+    ADDON_SPIN_CONTROL_TYPE_PAGE   = 4
+  } AddonGUISpinControlType;
+  //----------------------------------------------------------------------------
+
+  class CSpin : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CSpin(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_spin(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSpin can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Destructor
+    ///
+    ~CSpin() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_spin->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Set's the control's enabled/disabled state
+    ///
+    /// @param[in] enabled              If true enabled, otherwise disabled
+    ///
+    void SetEnabled(bool enabled)
+    {
+      m_interface->kodi_gui->control_spin->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the text string on spin control
+    ///
+    /// @param[in] text                Text to show as name for spin
+    ///
+    void SetText(const std::string& text)
+    {
+      m_interface->kodi_gui->control_spin->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To reset spin control to defaults
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_spin->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the with SpinControlType defined types of spin.
+    ///
+    /// @param[in] type                 The type to use
+    ///
+    /// @note See description of \ref AddonGUISpinControlType for available types.
+    ///
+    void SetType(AddonGUISpinControlType type)
+    {
+      m_interface->kodi_gui->control_spin->set_type(m_interface->kodiBase, m_controlHandle, (int)type);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To add a label entry in spin defined with a value as string.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @param[in] label                Label string to view on skin
+    /// @param[in] value                String value to use for selection
+    ///                                 of them.
+    ///
+    void AddLabel(const std::string& label, const std::string& value)
+    {
+      m_interface->kodi_gui->control_spin->add_string_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To add a label entry in spin defined with a value as integer.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_INT to use this function.
+    ///
+    /// @param[in] label                Label string to view on skin
+    /// @param[in] value                Integer value to use for selection
+    ///                                 of them.
+    ///
+    void AddLabel(const std::string& label, int value)
+    {
+      m_interface->kodi_gui->control_spin->add_int_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To change the spin to position with them string as value.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @param[in] value                 String value to change to
+    ///
+    void SetStringValue(const std::string& value)
+    {
+      m_interface->kodi_gui->control_spin->set_string_value(m_interface->kodiBase, m_controlHandle, value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To get the current spin control position with text string value.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @return                         Currently selected string value
+    ///
+    std::string GetStringValue() const
+    {
+      std::string value;
+      char* ret = m_interface->kodi_gui->control_spin->get_string_value(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          value = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return value;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+    /// start and e.g. +10 is the from here defined position where it reach  the
+    /// end.
+    ///
+    /// Ad default is the range from 0 to 100.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent, floating point or  integer are alone possible.  Combining
+    /// these  different  values  can be not together and can,  therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    void SetIntRange(int start, int end)
+    {
+      m_interface->kodi_gui->control_spin->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Set the slider  position with the given integer value.  The Range
+    /// must be defined with a call from \ref SetIntRange before.
+    ///
+    /// @param[in] value                Position in range to set with integer
+    ///
+    /// @note Percent, floating point or  integer are alone possible.  Combining
+    /// these different  values can  be not  together  and can, therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    void SetIntValue(int value)
+    {
+      m_interface->kodi_gui->control_spin->set_int_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To get the current position as integer value.
+    ///
+    /// @return                         The position as integer
+    ///
+    /// @note Percent,  floating point or integer are alone possible.  Combining
+    /// these different values  can be not  together  and can,  therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    int GetIntValue() const
+    {
+      return m_interface->kodi_gui->control_spin->get_int_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the  the range as  float of spin,  e.g. -25.0 is  the spin
+    /// start and e.g. +25.0 is the from  here defined  position where  it reach
+    /// the end.
+    ///
+    /// As default is the range 0.0 to 1.0.
+    ///
+    /// The float interval is as default 0.1 and can be changed with
+    /// @ref SetFloatInterval.
+    ///
+    /// @param[in] start                Integer start value
+    /// @param[in] end                  Integer end value
+    ///
+    /// @note Percent, floating point  or integer are alone possible.  Combining
+    /// these different  values can be  not together  and can,  therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    void SetFloatRange(float start, float end)
+    {
+      m_interface->kodi_gui->control_spin->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Set  the spin  position with  the given float  value.  The  Range
+    /// can be defined with a call from  \ref SetIntRange before, as  default it
+    /// is 0.0 to 1.0.
+    ///
+    /// @param[in] value                Position in range to set with float
+    ///
+    /// @note Percent, floating point or integer are  alone possible.  Combining
+    /// these different  values can  be not together  and can,  therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    void SetFloatValue(float value)
+    {
+      m_interface->kodi_gui->control_spin->set_float_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To get the current position as float value.
+    ///
+    /// @return                         The position as float
+    ///
+    float GetFloatValue() const
+    {
+      return m_interface->kodi_gui->control_spin->get_float_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the  interval steps of spin,  as default  is it 0.1  If it
+    /// becomes  changed  with this  function will  a step of the  user with the
+    /// value fixed here be executed.
+    ///
+    /// @param[in] interval             Intervall step to set.
+    ///
+    /// @note Percent, floating point  or integer are alone possible.  Combining
+    /// these  different values  can  be not together and can,  therefore,  only
+    /// one each can be used and must be defined with \ref SetType before.
+    ///
+    void SetFloatInterval(float interval)
+    {
+      m_interface->kodi_gui->control_spin->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
new file mode 100644
index 0000000..9d8976e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
@@ -0,0 +1,176 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CTextBox Control Text Box
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CTextBox }
+  /// **Used to show a multi-page piece of text**
+  ///
+  /// The text box control  can be used to display  descriptions,  help texts or
+  /// other larger texts.  It corresponds to the representation which is also to
+  /// be seen on the CDialogTextViewer.
+  ///
+  /// It has the header \ref TextBox.h "#include <kodi/gui/controls/TextBox.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Text_Box "textbox control".
+  ///
+  /// @note The call  of the  control is  only possible  from the  corresponding
+  /// window as its class and identification number is required.
+  ///
+  class CTextBox : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CTextBox(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_text_box(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CTextBox can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief Destructor
+    ///
+    ~CTextBox() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief Set the control on window to visible
+    ///
+    /// @param[in] visible              If true visible, otherwise hidden
+    ///
+    void SetVisible(bool visible)
+    {
+      m_interface->kodi_gui->control_text_box->set_visible(m_interface->kodiBase, m_controlHandle,  visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief To reset box an remove all the text
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_text_box->reset(m_controlHandle, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief To set the text on box
+    ///
+    /// @param[in] text                 Text to show
+    ///
+    void SetText(const std::string& text)
+    {
+      m_interface->kodi_gui->control_text_box->set_text(m_interface->kodiBase, m_controlHandle,  text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief Get the used text from control
+    ///
+    /// @return                         Text shown
+    ///
+    std::string GetText() const
+    {
+      std::string text;
+      char* ret = m_interface->kodi_gui->control_text_box->get_text(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          text = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return text;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief To scroll text on other position
+    ///
+    /// @param[in] position             The line position to scroll to
+    ///
+    void Scroll(unsigned int position)
+    {
+      m_interface->kodi_gui->control_text_box->scroll(m_interface->kodiBase, m_controlHandle, position);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CTextBox
+    /// @brief To set automatic scrolling of textbox
+    ///
+    /// Specifies the timing  and conditions of  any autoscrolling  this textbox
+    /// should have. Times are in milliseconds.  The content is delayed  for the
+    /// given delay,  then scrolls at a rate of one line per time interval until
+    /// the end.  If the repeat tag is present,  it then  delays for  the repeat
+    /// time,  fades out over 1 second,  and repeats.  It does not wrap or reset
+    /// to the top at the end of the scroll.
+    ///
+    /// @param[in] delay                Content delay
+    /// @param[in] time                 One line per time interval
+    /// @param[in] repeat               Delays with given time, fades out over 1
+    ///                                 second, and repeats
+    ///
+    void SetAutoScrolling(int delay, int time, int repeat)
+    {
+      m_interface->kodi_gui->control_text_box->set_auto_scrolling(m_interface->kodiBase, m_controlHandle, delay, time, repeat);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
index a4cf963..61af9fe 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -39,6 +39,145 @@ typedef struct AddonToKodiFuncTable_kodi_gui_general
   int (*get_current_window_id)(void* kodiBase);
 } AddonToKodiFuncTable_kodi_gui_general;
 
+typedef struct AddonToKodiFuncTable_kodi_gui_control_button
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* label);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_label2)(void* kodiBase, void* handle, const char *label);
+  char* (*get_label2)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_button;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_edit
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* label);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  char* (*get_text)(void* kodiBase, void* handle);
+  void (*set_cursor_position)(void* kodiBase, void* handle, unsigned int position);
+  unsigned int (*get_cursor_position)(void* kodiBase, void* handle);
+  void (*set_input_type)(void* kodiBase, void* handle, int type, const char* heading);
+} AddonToKodiFuncTable_kodi_gui_control_edit;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_fade_label
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*add_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_scrolling)(void* kodiBase, void* handle, bool scroll);
+  void (*reset)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_fade_label;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_image
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_filename)(void* kodiBase, void* handle, const char* filename, bool use_cache);
+  void (*set_color_diffuse)(void* kodiBase, void* handle, uint32_t color_diffuse);
+} AddonToKodiFuncTable_kodi_gui_control_image;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_label
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_label;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_progress
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_progress;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_radio_button
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_selected)(void* kodiBase, void* handle, bool selected);
+  bool (*is_selected)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_radio_button;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_rendering
+{
+  void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
+      bool    (*createCB)(void*,int,int,int,int,void*),
+      void    (*renderCB)(void*),
+      void    (*stopCB)(void*),
+      bool    (*dirtyCB)(void*));
+  void (*destroy)(void *kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_rendering;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_settings_slider
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_text)(void* kodiBase, void* handle, const char* label);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_settings_slider;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_slider
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*reset)(void* kodiBase, void* handle);
+  char* (*get_description)(void* kodiBase, void* handle);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_slider;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_spin
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_type)(void* kodiBase, void* handle, int type);
+  void (*add_string_label)(void* kodiBase, void* handle, const char* label, const char* value);
+  void (*set_string_value)(void* kodiBase, void* handle, const char* value);
+  char* (*get_string_value)(void* kodiBase, void* handle);
+  void (*add_int_label)(void* kodiBase, void* handle, const char* label, int value);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_spin;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_text_box
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  char* (*get_text)(void* kodiBase, void* handle);
+  void (*scroll)(void* kodiBase, void* handle, unsigned int scroll);
+  void (*set_auto_scrolling)(void* kodiBase, void* handle, int delay, int time, int repeat);
+} AddonToKodiFuncTable_kodi_gui_control_text_box;
+
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu
 {
   int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size);
@@ -122,7 +261,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogProgress
 
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogSelect
 {
-  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size, int selected, bool autoclose);
+  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size, int selected, unsigned int autoclose);
 } AddonToKodiFuncTable_kodi_gui_dialogSelect;
 
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer
@@ -139,7 +278,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogYesNo
 
 typedef struct AddonToKodiFuncTable_kodi_gui_listItem
 {
-  void* (*create)(void* kodiBase, const char* label, const char* label2, const char* icon_image, const char* thumbnail_image, const char* path);
+  void* (*create)(void* kodiBase, const char* label, const char* label2, const char* icon_image, const char* path);
   void (*destroy)(void* kodiBase, void* handle);
   char* (*get_label)(void* kodiBase, void* handle);
   void (*set_label)(void* kodiBase, void* handle, const char* label);
@@ -151,6 +290,10 @@ typedef struct AddonToKodiFuncTable_kodi_gui_listItem
   void (*set_art)(void* kodiBase, void* handle, const char* type, const char* image);
   char* (*get_path)(void* kodiBase, void* handle);
   void (*set_path)(void* kodiBase, void* handle, const char* path);
+  char* (*get_property)(void* kodiBase, void* handle, const char* key);
+  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*select)(void* kodiBase, void* handle, bool select);
+  bool (*is_selected)(void* kodiBase, void* handle);
 } AddonToKodiFuncTable_kodi_gui_listItem;
 
 #define ADDON_MAX_CONTEXT_ENTRIES 20
@@ -160,9 +303,10 @@ typedef struct gui_context_menu_pair
   unsigned int id;
   char name[ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH];
 } gui_context_menu_pair;
-    
+
 typedef struct AddonToKodiFuncTable_kodi_gui_window
 {
+  /* Window creation functions */
   void* (*create)(void* kodiBase, const char* xml_filename, const char* default_skin, bool as_dialog, bool is_media);
   void (*destroy)(void* kodiBase, void* handle);
   void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
@@ -175,14 +319,90 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   bool (*show)(void* kodiBase, void* handle);
   bool (*close)(void* kodiBase, void* handle);
   bool (*do_modal)(void* kodiBase, void* handle);
+
+  /* Window control functions */
+  bool (*set_focus_id)(void* kodiBase, void* handle, int control_id);
+  int (*get_focus_id)(void* kodiBase, void* handle);
+  void (*set_control_label)(void* kodiBase, void* handle, int control_id, const char* label);
+
+  /* Window property functions */
+  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*set_property_int)(void* kodiBase, void* handle, const char* key, int value);
+  void (*set_property_bool)(void* kodiBase, void* handle, const char* key, bool value);
+  void (*set_property_double)(void* kodiBase, void* handle, const char* key, double value);
+  char* (*get_property)(void* kodiBase, void* handle, const char* key);
+  int (*get_property_int)(void* kodiBase, void* handle, const char* key);
+  bool (*get_property_bool)(void* kodiBase, void* handle, const char* key);
+  double (*get_property_double)(void* kodiBase, void* handle, const char* key);
+  void (*clear_properties)(void* kodiBase, void* handle);
+  void (*clear_property)(void* kodiBase, void* handle, const char* key);
+
+  /* List item functions */
   void (*clear_item_list)(void* kodiBase, void* handle);
-  void (*add_list_item)(void* kodiBase, void* handle, void* item, int item_position);
-  void* (*get_list_item)(void* kodiBase, void* handle, int listPos);
+  void (*add_list_item)(void* kodiBase, void* handle, void* item, int list_position);
+  void (*remove_list_item_from_position)(void* kodiBase, void* handle, int list_position);
+  void (*remove_list_item)(void* kodiBase, void* handle, void* item);
+  void* (*get_list_item)(void* kodiBase, void* handle, int list_position);
+  void (*set_current_list_position)(void* kodiBase, void* handle, int list_position);
+  int (*get_current_list_position)(void* kodiBase, void* handle);
+  int (*get_list_size)(void* kodiBase, void* handle);
+  void (*set_container_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*set_container_content)(void* kodiBase, void* handle, const char* value);
+  int (*get_current_container_id)(void* kodiBase, void* handle);
+
+  /* Various functions */
+  void (*mark_dirty_region)(void* kodiBase, void* handle);
+
+  /* GUI control access functions */
+  void* (*get_control_button)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_edit)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_fade_label)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_image)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_label)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_progress)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_radio_button)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_render_addon)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_settings_slider)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_slider)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_spin)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_text_box)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy1)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy2)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy3)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy4)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy5)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy6)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy7)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy8)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy9)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy10)(void* kodiBase, void* handle, int control_id); /* This and above used to add new get_control_* functions */
 } AddonToKodiFuncTable_kodi_gui_window;
 
 typedef struct AddonToKodiFuncTable_kodi_gui
 {
   AddonToKodiFuncTable_kodi_gui_general* general;
+  AddonToKodiFuncTable_kodi_gui_control_button* control_button;
+  AddonToKodiFuncTable_kodi_gui_control_edit* control_edit;
+  AddonToKodiFuncTable_kodi_gui_control_fade_label* control_fade_label;
+  AddonToKodiFuncTable_kodi_gui_control_label* control_label;
+  AddonToKodiFuncTable_kodi_gui_control_image* control_image;
+  AddonToKodiFuncTable_kodi_gui_control_progress* control_progress;
+  AddonToKodiFuncTable_kodi_gui_control_radio_button* control_radio_button;
+  AddonToKodiFuncTable_kodi_gui_control_rendering* control_rendering;
+  AddonToKodiFuncTable_kodi_gui_control_settings_slider* control_settings_slider;
+  AddonToKodiFuncTable_kodi_gui_control_slider* control_slider;
+  AddonToKodiFuncTable_kodi_gui_control_spin* control_spin;
+  AddonToKodiFuncTable_kodi_gui_control_text_box* control_text_box;
+  void* control_dummy1;
+  void* control_dummy2;
+  void* control_dummy3;
+  void* control_dummy4;
+  void* control_dummy5;
+  void* control_dummy6;
+  void* control_dummy7;
+  void* control_dummy8;
+  void* control_dummy9;
+  void* control_dummy10; /* This and above used to add new controls */
   AddonToKodiFuncTable_kodi_gui_dialogContextMenu* dialogContextMenu;
   AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress* dialogExtendedProgress;
   AddonToKodiFuncTable_kodi_gui_dialogFileBrowser* dialogFileBrowser;
@@ -193,6 +413,16 @@ typedef struct AddonToKodiFuncTable_kodi_gui
   AddonToKodiFuncTable_kodi_gui_dialogSelect* dialogSelect;
   AddonToKodiFuncTable_kodi_gui_dialogTextViewer* dialogTextViewer;
   AddonToKodiFuncTable_kodi_gui_dialogYesNo* dialogYesNo;
+  void* dialog_dummy1;
+  void* dialog_dummy2;
+  void* dialog_dummy3;
+  void* dialog_dummy4;
+  void* dialog_dummy5;
+  void* dialog_dummy6;
+  void* dialog_dummy7;
+  void* dialog_dummy8;
+  void* dialog_dummy9;
+  void* dialog_dummy10; /* This and above used to add new dialogs */
   AddonToKodiFuncTable_kodi_gui_listItem* listItem;
   AddonToKodiFuncTable_kodi_gui_window* window;
 } AddonToKodiFuncTable_kodi_gui;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
index 66a1c90..47afc23 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
@@ -19,33 +19,35 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogContextMenu Dialog Context Menu
+  /// \defgroup cpp_kodi_gui_dialogs_ContextMenu Dialog Context Menu
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogContextMenu }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::ContextMenu }
   /// **Context menu dialog**
   ///
   /// The function listed below permits the call of a dialogue as context menu to
   /// select of an entry as a key
   ///
-  /// It has the header \ref DialogContextMenu.h "#include <kodi/gui/DialogContextMenu.h>"
+  /// It has the header \ref ContextMenu.h "#include <kodi/gui/dialogs/ContextMenu.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogContextMenu
+  namespace ContextMenu
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogContextMenu
+    /// \ingroup cpp_kodi_gui_dialogs_ContextMenu
     /// @brief Show a context menu dialog about given parts.
     ///
     /// @param[in] heading   Dialog heading name
@@ -57,7 +59,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogContextMenu.h>
+    /// #include <kodi/gui/dialogs/ContextMenu.h>
     ///
     /// const std::vector<std::string> entries
     /// {
@@ -68,7 +70,7 @@ namespace gui
     ///   "Test 5"
     /// };
     ///
-    /// int selected = kodi::gui::DialogContextMenu::Show("Test selection", entries);
+    /// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
     /// if (selected < 0)
     ///   fprintf(stderr, "Item selection canceled\n");
     /// else
@@ -91,5 +93,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
index b6f2deb..e9c5a9d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
@@ -19,22 +19,24 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_CDialogExtendedProgress Dialog Extended Progress
+  /// \defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CDialogExtendedProgress }
+  /// @brief \cpp_class{ kodi::gui::dialogs::ExtendedProgress }
   /// **Progress dialog shown for background work**
   ///
-  /// The with \ref DialogExtendedProgress.h "#include <kodi/gui/DialogExtendedProgress.h>"
+  /// The with \ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
   /// given class are basically used to create Kodi's extended progress.
   ///
   ///
@@ -42,9 +44,9 @@ namespace gui
   ///
   /// **Example:**
   /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/gui/DialogExtendedProgress.h>
+  /// #include <kodi/gui/dialogs/ExtendedProgress.h>
   ///
-  /// kodi::gui::CDialogExtendedProgress *ext_progress = new kodi::gui::CDialogExtendedProgress("Test Extended progress");
+  /// kodi::gui::dialogs::CExtendedProgress *ext_progress = new kodi::gui::dialogs::CExtendedProgress("Test Extended progress");
   /// ext_progress->SetText("Test progress");
   /// for (unsigned int i = 0; i < 50; i += 10)
   /// {
@@ -63,17 +65,17 @@ namespace gui
   /// delete ext_progress;
   /// ~~~~~~~~~~~~~
   ///
-  class CDialogExtendedProgress
+  class CExtendedProgress
   {
   public:
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// Construct a new dialog
     ///
     /// @param[in] title  Title string
     ///
-    CDialogExtendedProgress(const std::string& title = "")
+    CExtendedProgress(const std::string& title = "")
     {
       using namespace ::kodi::addon;
       m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase, title.c_str());
@@ -84,10 +86,10 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// Destructor
     ///
-    ~CDialogExtendedProgress()
+    ~CExtendedProgress()
     {
       using namespace ::kodi::addon;
       if (m_DialogHandle)
@@ -97,7 +99,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the used title
     ///
     /// @return Title string
@@ -119,7 +121,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set the title of dialog
     ///
     /// @param[in] title     Title string
@@ -133,7 +135,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the used text information string
     ///
     /// @return Text string
@@ -155,7 +157,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set the used text information string
     ///
     /// @param[in] text         information text to set
@@ -169,7 +171,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To ask dialog is finished
     ///
     /// @return True if on end
@@ -183,7 +185,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Mark progress finished
     ///
     void MarkFinished()
@@ -195,7 +197,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the current progress position as percent
     ///
     /// @return Position
@@ -209,7 +211,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set the current progress position as percent
     ///
     /// @param[in] percentage   Position to use from 0.0 to 100.0
@@ -223,7 +225,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set progress position with predefined places
     ///
     /// @param[in] currentItem    Place position to use
@@ -240,5 +242,6 @@ namespace gui
     void* m_DialogHandle;
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
index e348125..401a78d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
@@ -19,35 +19,37 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogFileBrowser Dialog File Browser
+  /// \defgroup cpp_kodi_gui_dialogs_FileBrowser Dialog File Browser
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogFileBrowser }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::FileBrowser }
   /// **File browser dialog**
   ///
-  /// The functions listed below of the class "DialogFileBrowser" offer
+  /// The functions listed below of the class "FileBrowser" offer
   /// the possibility to select to a file by the user of the add-on.
   ///
   /// It allows all the options that are possible in Kodi itself and offers all
   /// support file types.
   ///
-  /// It has the header \ref DialogFileBrowser.h "#include <kodi/gui/DialogFileBrowser.h>"
+  /// It has the header \ref FileBrowser.h "#include <kodi/gui/dialogs/FileBrowser.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogFileBrowser
+  namespace FileBrowser
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Directory selection dialog
     ///
     /// @param[in] shares       With Shares becomes the available start folders
@@ -60,7 +62,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogFileBrowser.h>
+    /// #include <kodi/gui/dialogs/FileBrowser.h>
     ///
     /// /*
     ///  * Example show directory selection dialog with on 'share' (first value)
@@ -73,7 +75,7 @@ namespace gui
     ///  * to a start place.
     ///  */
     /// std::string directory;
-    /// bool ret = kodi::gui::DialogFileBrowser::ShowAndGetDirectory("local|network|removable",
+    /// bool ret = kodi::gui::dialogs::FileBrowser::ShowAndGetDirectory("local|network|removable",
     ///                                                    "Test directory selection",
     ///                                                    directory,
     ///                                                    false);
@@ -98,7 +100,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection dialog
     ///
     /// @param[in] shares               With Shares becomes the available  start
@@ -133,7 +135,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection from a directory
     ///
     /// @param[in] directory            The  directory  name  where  the  dialog
@@ -171,7 +173,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection dialog to get several in to a list
     ///
     /// @param[in] shares             With Shares becomes  the  available  start
@@ -206,7 +208,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Source selection dialog
     ///
     /// @param[in,out] path           As in the path to start and Return value
@@ -235,7 +237,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Image selection dialog
     ///
     /// @param[in] shares     With Shares becomes the available start folders be
@@ -262,7 +264,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Image selection dialog to get several in to a list
     ///
     /// @param[in] shares       With Shares becomes the available  start folders
@@ -289,5 +291,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
index 9261972..cff30d8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
@@ -19,19 +19,21 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogKeyboard Dialog Keyboard
+  /// \defgroup cpp_kodi_gui_dialogs_Keyboard Dialog Keyboard
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogKeyboard }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Keyboard }
   /// **Keyboard dialogs**
   ///
   /// The functions listed below have to be permitted by the user for the
@@ -40,14 +42,14 @@ namespace gui
   /// The class supports several kinds, from an easy text choice up to the
   /// passport Word production and their confirmation for add-on.
   ///
-  /// It has the header \ref DialogKeyboard.h "#include <kodi/gui/DialogKeyboard.h>"
+  /// It has the header \ref Keyboard.h "#include <kodi/gui/dialogs/Keyboard.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogKeyboard
+  namespace Keyboard
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard with initial value `text` and replace with  result
     /// string.
     ///
@@ -67,7 +69,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogKeyboard.h>
+    /// #include <kodi/gui/dialogs/Keyboard.h>
     ///
     /// /*
     ///  * The example shows the display of keyboard call dialog at Kodi from the add-on.
@@ -76,7 +78,7 @@ namespace gui
     ///  */
     /// std::string text = "Please change me to them want you want"; /*< It can be leaved empty or a
     ///                                                                  entry text added */
-    /// bool bRet = ::kodi::gui::DialogKeyboard::ShowAndGetInput(text,
+    /// bool bRet = ::kodi::gui::dialogs::Keyboard::ShowAndGetInput(text,
     ///                                                      "Demonstration text entry",
     ///                                                      true,
     ///                                                      false,
@@ -104,7 +106,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief The example shows the display of keyboard  call dialog  at  Kodi
     /// from the add-on.
     ///
@@ -137,7 +139,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows  keyboard  and  prompts  for  a  password.   Differs  from
     /// `ShowAndVerifyNewPassword()` in that no second verification
     ///
@@ -170,7 +172,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows keyboard and prompts for a password. Differs from
     /// `ShowAndVerifyNewPassword()` in that no second verification
     ///
@@ -200,7 +202,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard twice to  get and confirm a  user-entered  password
     /// string.
     ///
@@ -220,7 +222,7 @@ namespace gui
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <kodi/General.h>
-    /// #include <kodi/gui/DialogKeyboard.h>
+    /// #include <kodi/gui/dialogs/Keyboard.h>
     ///
     /// /*
     ///  * The example below shows the complete use of keyboard dialog for password
@@ -246,7 +248,7 @@ namespace gui
     ///   /*
     ///    * Ask the user about the password.
     ///    */
-    ///   ret = ::kodi::gui::DialogKeyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
+    ///   ret = ::kodi::gui::dialogs::Keyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
     ///   if (ret == 0)
     ///   {
     ///     fprintf(stderr, "Password successfull confirmed after '%i' tries\n", i+1);
@@ -283,7 +285,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard twice to get and confirm  a user-entered  password
     /// string.
     ///
@@ -313,7 +315,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard and verify user input against `password`.
     ///
     /// @param[in,out] password    Value to compare against user input.
@@ -347,7 +349,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows a filter related keyboard
     ///
     /// @param[in,out] text        Overwritten with user input if  return=true.
@@ -381,7 +383,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Send a text to a visible keyboard
     ///
     /// @param[in] text            Overwritten with user input if  return=true.
@@ -399,7 +401,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Check for visible keyboard on GUI
     ///
     /// @return  true if keyboard present, false if not present
@@ -412,5 +414,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
index 8b5c592..dddbf7e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogNumeric Dialog Numeric
+  /// \defgroup cpp_kodi_gui_dialogs_Numeric Dialog Numeric
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogNumeric }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Numeric }
   /// **Numeric dialogs**
   ///
   /// The functions listed below have to be permitted by the user for the
@@ -41,14 +43,14 @@ namespace gui
   /// The class supports several kinds, from an easy number choice up to the
   /// passport Word production and their confirmation for add-on.
   ///
-  /// It has the header \ref DialogNumeric.h "#include <kodi/gui/DialogNumeric.h>"
+  /// It has the header \ref Numeric.h "#include <kodi/gui/dialogs/Numeric.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogNumeric
+  namespace Numeric
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get numeric new password
     ///
     /// @param[out] newPassword        String to preload into the keyboard
@@ -76,7 +78,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to verify numeric password.
     ///
     /// @param[in] password             Password to compare with user input, need
@@ -97,7 +99,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* fprintf */
     /// #include <kodi/General.h>
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// /*
     ///  * The example below shows the complete use of keyboard dialog for password
@@ -123,7 +125,7 @@ namespace gui
     ///   /*
     ///    * Ask the user about the password.
     ///    */
-    ///   ret = kodi::gui::DialogNumeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
+    ///   ret = kodi::gui::dialogs::Numeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
     ///   if (ret == 0)
     ///   {
     ///     fprintf(stderr, "Numeric password successfull confirmed after '%i' tries\n", i+1);
@@ -151,7 +153,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to verify numeric password
     ///
     /// @param[in,out] toVerify         Value to compare against user input.
@@ -180,7 +182,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get time value.
     ///
     /// @param[out] time                Overwritten with user input if
@@ -197,7 +199,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* printf */
     /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// time_t rawtime;
     /// struct tm * timeinfo;
@@ -205,7 +207,7 @@ namespace gui
     ///
     /// time (&rawtime);
     /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::DialogNumeric::ShowAndGetTime(*timeinfo, "Selected time test call");
+    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetTime(*timeinfo, "Selected time test call");
     /// strftime(buffer, sizeof(buffer), "%H:%M.", timeinfo);
     /// printf("Selected time it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -219,7 +221,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get date value.
     ///
     /// @param[in,out] date             Overwritten with user input if
@@ -236,7 +238,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* printf */
     /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// time_t rawtime;
     /// struct tm * timeinfo;
@@ -244,7 +246,7 @@ namespace gui
     ///
     /// time (&rawtime);
     /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::DialogNumeric::ShowAndGetDate(*timeinfo, "Selected date test call");
+    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetDate(*timeinfo, "Selected date test call");
     /// strftime(buffer, sizeof(buffer), "%Y-%m-%d", timeinfo);
     /// printf("Selected date it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -258,7 +260,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get a IP
     ///
     /// @param[in,out] ipAddress        Overwritten with user input if
@@ -287,7 +289,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get normal number.
     ///
     /// @param[in,out] input            Overwritten with user input if
@@ -308,10 +310,10 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     ///   #include <stdio.h>      /* printf */
     ///   #include <stdlib.h>     /* strtoull (C++11) */
-    ///   #include <kodi/gui/DialogNumeric.h>
+    ///   #include <kodi/gui/dialogs/Numeric.h>
     ///
     ///   std::string number;
-    ///   bool bRet = kodi::gui::DialogNumeric::ShowAndGetNumber(number, "Number test call");
+    ///   bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetNumber(number, "Number test call");
     ///   printf("Written number input is : %llu and was %s\n",
     ///                  strtoull(number.c_str(), nullptr, 0), bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -334,7 +336,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Show numeric keypad to get seconds.
     ///
     /// @param[in,out] time     Overwritten with user input if return=true and
@@ -362,5 +364,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
index fa98241..12799b7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
@@ -19,33 +19,35 @@
  *
  */
 
-#include "../AddonBase.h"
-#include "definitions.h"
+#include "../../AddonBase.h"
+#include "../definitions.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogOK Dialog OK
+  /// \defgroup cpp_kodi_gui_dialogs_OK Dialog OK
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogOK }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::OK }
   /// **OK dialog**
   ///
   /// The functions listed below permit the call of a dialogue of information, a
   /// confirmation of the user by press from OK required.
   ///
-  /// It has the header \ref DialogOK.h "#include <kodi/gui/DialogOK.h>"
+  /// It has the header \ref OK.h "#include <kodi/gui/dialogs/OK.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogOK
+  namespace OK
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogOK
+    /// \ingroup cpp_kodi_gui_dialogs_OK
     /// @brief Use dialog to inform user with text and confirmation with OK with continued string.
     ///
     /// @param[in] heading Dialog heading.
@@ -56,9 +58,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogOK.h>
+    /// #include <kodi/gui/dialogs/OK.h>
     /// ...
-    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
+    /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
     /// ~~~~~~~~~~~~~
     ///
     inline void ShowAndGetInput(const std::string& heading, const std::string& text)
@@ -71,7 +73,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogOK
+    /// \ingroup cpp_kodi_gui_dialogs_OK
     /// @brief Use dialog to inform user with text and confirmation with OK with strings separated to the lines.
     ///
     /// @param[in] heading Dialog heading.
@@ -84,9 +86,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogOK.h>
+    /// #include <kodi/gui/dialogs/OK.h>
     /// ...
-    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
+    /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
     /// ~~~~~~~~~~~~~
     ///
     inline void ShowAndGetInput(const std::string& heading, const std::string& line0, const std::string& line1, const std::string& line2)
@@ -100,5 +102,6 @@ namespace gui
   }
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
index e652644..3f18499 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
@@ -19,30 +19,32 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_CDialogProgress Dialog Progress
+  /// \defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CDialogProgress }
+  /// @brief \cpp_class{ kodi::gui::dialogs::CProgress }
   /// **Progress dialog shown in center**
   ///
-  /// The with \ref DialogProgress.h "#include <kodi/gui/DialogProgress.h>"
+  /// The with \ref DialogProgress.h "#include <kodi/gui/dialogs/Progress.h>"
   /// given class are basically used to create Kodi's progress dialog with named
   /// text fields.
   ///
   /// **Example:**
   /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/gui/DialogProgress.h>
+  /// #include <kodi/gui/dialogs/Progress.h>
   ///
-  /// kodi::gui::CDialogProgress *progress = new kodi::gui::CDialogProgress;
+  /// kodi::gui::dialogs::CProgress *progress = new kodi::gui::dialogs::CProgress;
   /// progress->SetHeading("Test progress");
   /// progress->SetLine(1, "line 1");
   /// progress->SetLine(2, "line 2");
@@ -58,29 +60,29 @@ namespace gui
   /// delete progress;
   /// ~~~~~~~~~~~~~
   ///
-  class CDialogProgress
+  class CProgress
   {
   public:
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Construct a new dialog
     ///
-    CDialogProgress()
+    CProgress()
     {
       using namespace ::kodi::addon;
       m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase);
       if (!m_DialogHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CDialogProgress can't create window class from Kodi !!!");
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::dialogs::CProgress can't create window class from Kodi !!!");
     }
     //--------------------------------------------------------------------------
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Destructor
     ///
-    ~CDialogProgress()
+    ~CProgress()
     {
       using namespace ::kodi::addon;
       if (m_DialogHandle)
@@ -90,7 +92,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To open the dialog
     ///
     void Open()
@@ -102,7 +104,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Set the heading title of dialog
     ///
     /// @param[in] heading Title string to use
@@ -116,7 +118,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To set the line text field on dialog from 0 - 2
     ///
     /// @param[in] iLine Line number
@@ -131,7 +133,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To enable and show cancel button on dialog
     ///
     /// @param[in] canCancel if true becomes it shown
@@ -145,7 +147,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To check dialog for clicked cancel button
     ///
     /// @return True if canceled
@@ -159,7 +161,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Get the current progress position as percent
     ///
     /// @param[in] percentage Position to use from 0 to 100
@@ -173,7 +175,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To set the current progress position as percent
     ///
     /// @return Current Position used from 0 to 100
@@ -187,7 +189,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To show or hide progress bar dialog
     ///
     /// @param[in] onOff If true becomes it shown
@@ -201,7 +203,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Set the maximum position of progress, needed if `SetProgressAdvance(...)` is used
     ///
     /// @param[in] max Biggest usable position to use
@@ -215,7 +217,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To increase progress bar by defined step size until reach of maximum position
     ///
     /// @param[in] steps Step size to increase, default is 1
@@ -229,7 +231,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To check progress was canceled on work
     ///
     /// @return True if aborted
@@ -245,5 +247,6 @@ namespace gui
     void* m_DialogHandle;
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
index 36433db..963c84c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
@@ -19,41 +19,44 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogSelect Dialog Select
+  /// \defgroup cpp_kodi_gui_dialogs_Select Dialog Select
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogSelect }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Select }
   /// **Selection dialog**
   ///
   /// The function listed below permits the call of a dialogue to select of an
   /// entry as a key
   ///
-  /// It has the header \ref DialogSelect.h "#include <kodi/gui/DialogSelect.h>"
+  /// It has the header \ref Select.h "#include <kodi/gui/dialogs/Select.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogSelect
+  namespace Select
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogSelect
+    /// \ingroup cpp_kodi_gui_dialogs_Select
     /// @brief Show a selection dialog about given parts.
     ///
     /// @param[in] heading      Dialog heading name
     /// @param[in] entries      String list about entries
     /// @param[in] selected     [opt] Predefined selection (default is
     ///                         <tt>-1</tt> for the first)
-    /// @param[in] autoclose    [opt] To close dialog automatic after a time
+    /// @param[in] autoclose    [opt] To close dialog automatic after the given
+    ///                         time in ms. As '0' it stays open.
     /// @return                 The selected entry, if return <tt>-1</tt> was
     ///                         nothing selected or canceled
     ///
@@ -62,7 +65,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogSelect.h>
+    /// #include <kodi/gui/dialogs/Select.h>
     ///
     /// const std::vector<std::string> entries
     /// {
@@ -73,14 +76,14 @@ namespace gui
     ///   "Test 5"
     /// };
     ///
-    /// int selected = kodi::gui::DialogSelect::Show("Test selection", entries, -1);
+    /// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
     /// if (selected < 0)
     ///   fprintf(stderr, "Item selection canceled\n");
     /// else
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, bool autoclose = false)
+    inline int Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, unsigned int autoclose = 0)
     {
       using namespace ::kodi::addon;
       unsigned int size = entries.size();
@@ -97,5 +100,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
index 09c81bd..c64bc1e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogTextViewer Dialog Text Viewer
+  /// \defgroup cpp_kodi_gui_dialogs_TextViewer Dialog Text Viewer
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogTextViewer }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::TextViewer }
   /// **Text viewer dialog**
   ///
   /// The text viewer dialog can be used to display descriptions, help texts or
@@ -42,14 +44,14 @@ namespace gui
   /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
   /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
   ///
-  /// It has the header \ref DialogTextViewer.h "#include <kodi/gui/DialogTextViewer.h>"
+  /// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogTextViewer
+  namespace TextViewer
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogTextViewer
+    /// \ingroup cpp_kodi_gui_dialogs_TextViewer
     /// @brief Show info text dialog
     ///
     /// @param[in] heading  Small heading text
@@ -60,9 +62,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogTextViewer.h>
+    /// #include <kodi/gui/dialogs/TextViewer.h>
     ///
-    /// kodi::gui::DialogTextViewer::Show("The Wizard of Oz (1939 film)",
+    /// kodi::gui::dialogs::TextViewer::Show("The Wizard of Oz (1939 film)",
     ///  "The Wizard of Oz is a 1939 American musical comedy-drama fantasy film "
     ///  "produced by Metro-Goldwyn-Mayer, and the most well-known and commercially "
     ///  "successful adaptation based on the 1900 novel The Wonderful Wizard of Oz "
@@ -111,5 +113,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
index 064bf8c..d9c34ff 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogYesNo Dialog Yes/No
+  /// \defgroup cpp_kodi_gui_dialogs_YesNo Dialog Yes/No
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogYesNo }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::YesNo }
   /// **Yes / No dialog**
   ///
   /// The Yes / No dialog can be used to inform the user about questions and get
@@ -42,15 +44,15 @@ namespace gui
   /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
   /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
   ///
-  /// It has the header \ref DialogYesNo.h "#include <kodi/gui/DialogYesNo.h>"
+  /// It has the header \ref YesNo.h "#include <kodi/gui/dialogs/YesNo.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogYesNo
+  namespace YesNo
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with one text string shown
     /// everywhere and cancel return field
     ///
@@ -68,10 +70,10 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
     /// bool canceled;
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   /* The Header */
     ///    "You has opened Yes / No dialog for test\n\nIs this OK for you?",
     ///    canceled,               /* return value about cancel button */
@@ -95,7 +97,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with separated line strings
     ///
     /// @param[in] heading      Dialog heading
@@ -111,9 +113,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   // The Header
     ///    "You has opened Yes / No dialog for test",
     ///    "",
@@ -137,7 +139,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with separated line strings and cancel return field
     ///
     /// @param[in] heading      Dialog heading
@@ -154,10 +156,10 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
     /// bool canceled;
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   // The Header
     ///    "You has opened Yes / No dialog for test",
     ///    "",
@@ -183,5 +185,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */