diff --git a/data/gui/normalStyle.css b/data/gui/normalStyle.css
index 4aca1d5e7c5eb..d697b6878ff34 100644
--- a/data/gui/normalStyle.css
+++ b/data/gui/normalStyle.css
@@ -369,6 +369,10 @@ QToolButton#pushButtonGotoSearchSkyObject {
 	icon-size: 24px;
 }
 
+QToolButton#moveUp, QToolButton#moveDown, QToolButton#moveLeft, QToolButton#moveRight {
+	icon-size: 22px;
+}
+
 QToolButton#pushButtonCustomStepsDialog, QToolButton#pushButtonNow, QToolButton#pushButtonExtraEphemerisDialog {
 	icon-size: 20px;
 	min-width: 22px;
@@ -895,7 +899,6 @@ QLineEdit[collision="true"] {
 
 #dateTimeDialogForm QSpinBox,
 #dateTimeDialogForm QDoubleSpinBox {
-	border-image: none;
 	border: 0;
 	background: rgba(0, 0, 0, 0%);
 	padding-top: 16px;
diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
index 3b22385fc54cd..96e60c9a40117 100644
--- a/plugins/TelescopeControl/src/CMakeLists.txt
+++ b/plugins/TelescopeControl/src/CMakeLists.txt
@@ -5,7 +5,9 @@ add_subdirectory(gui)
 add_subdirectory(Lx200)
 add_subdirectory(NexStar)
 add_subdirectory(Rts2)
-add_subdirectory(INDI)
+IF(NOT WIN32)
+    add_subdirectory(INDI)
+ENDIF()
 if(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
     add_subdirectory(ASCOM)
 endif(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
@@ -40,7 +42,6 @@ SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "TelescopeC
 TARGET_LINK_LIBRARIES(TelescopeControl-static
     TelescopeControl_gui
     TelescopeControl_Lx200
-    TelescopeControl_INDI
     TelescopeControl_NexStar
     TelescopeControl_Rts2
     TelescopeControl_common
@@ -49,6 +50,12 @@ TARGET_LINK_LIBRARIES(TelescopeControl-static
     Qt${QT_VERSION_MAJOR}::SerialPort
     )
 
+IF(NOT WIN32)
+TARGET_LINK_LIBRARIES(TelescopeControl-static
+    TelescopeControl_INDI
+    )
+ENDIF()
+
 # Due to incomprehensible errors between ASCOM and Qt6OpenGL!QOpenGL2PaintEngineEx::setState(), we must disable in QT6-based builds.
 if(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
 #TARGET_LINK_LIBRARIES(TelescopeControl-static
diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
index e88589e8a2492..afcaa438a1bde 100644
--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
@@ -25,9 +25,9 @@
 #include <limits>
 #include <cmath>
 
-#include "libindi/baseclient.h"
-#include "libindi/basedevice.h"
-#include "libindi/inditelescope.h"
+#include <libs/indiclient/baseclient.h>
+#include <libs/indidevice/basedevice.h>
+#include <libs/indibase/inditelescope.h>
 
 const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
 
@@ -38,104 +38,111 @@ INDIConnection::INDIConnection(QObject *parent) : QObject(parent)
 INDIConnection::Coordinates INDIConnection::position() const
 {
 	std::lock_guard<std::mutex> lock(mMutex);
+
+	Coordinates mCoordinates;
+	if (mTelescope.isValid() && mTelescope.isConnected())
+	{
+		auto property = mTelescope.getNumber("EQUATORIAL_EOD_COORD");
+		mCoordinates.RA = property.getNumber()->np[0].value;
+		mCoordinates.DEC = property.getNumber()->np[1].value;
+	}
+
 	return mCoordinates;
 }
 
 void INDIConnection::setPosition(INDIConnection::Coordinates coords)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope)
+	if (!mTelescope.isValid())
 		return;
 
-	if (!mTelescope->isConnected())
+	if (!mTelescope.isConnected())
 	{
 		qDebug() << "Error: Telescope not connected";
 		return;
 	}
 
 	// Make sure the TRACK member of switch ON_COORD_SET is set
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("ON_COORD_SET");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("ON_COORD_SET");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or ON_COORD_SET switch...";
 		return;
 	}
 	// Note that confusingly there is a SLEW switch member as well that will move but not track.
 	// TODO: Figure out if there is to be support for it
-	ISwitch *track = IUFindSwitch(switchVector, "TRACK");
+	auto track = switchVector.findWidgetByName("TRACK");
 	if (track->s == ISS_OFF)
 	{
-		track->s = ISS_ON;
+		track->setState(ISS_ON);
 		sendNewSwitch(switchVector);
 	}
 
-	INumberVectorProperty *property = nullptr;
-	property = mTelescope->getNumber("EQUATORIAL_EOD_COORD");
-	if (!property)
+	auto property = mTelescope.getNumber("EQUATORIAL_EOD_COORD");
+	if (!property.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or EQUATORIAL_EOD_COORD property...";
 		return;
 	}
 
-	property->np[0].value = coords.RA;
-	property->np[1].value = coords.DEC;
-	sendNewNumber(property);
+	property[0].setValue(coords.RA);
+	property[1].setValue(coords.DEC);
+	sendNewNumber(property);	
 }
 
 void INDIConnection::syncPosition(INDIConnection::Coordinates coords)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope)
+	if (!mTelescope.isValid())
 		return;
 
-	if (!mTelescope->isConnected())
+	if (!mTelescope.isConnected())
 	{
 		qDebug() << "Error: Telescope not connected";
 		return;
 	}
 
 	// Make sure the SYNC member of switch ON_COORD_SET is set
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("ON_COORD_SET");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("ON_COORD_SET");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or ON_COORD_SET switch...";
 		return;
 	}
 
-	ISwitch *track = IUFindSwitch(switchVector, "TRACK");
-	ISwitch *slew = IUFindSwitch(switchVector, "SLEW");
-	ISwitch *sync = IUFindSwitch(switchVector, "SYNC");
-	track->s = ISS_OFF;
-	slew->s = ISS_OFF;
-	sync->s = ISS_ON;
+	auto track = switchVector.findWidgetByName("TRACK");
+	auto slew = switchVector.findWidgetByName("SLEW");
+	auto sync = switchVector.findWidgetByName("SYNC");
+	track->setState(ISS_OFF);
+	slew->setState(ISS_OFF);
+	sync->setState(ISS_ON);
 	sendNewSwitch(switchVector);
 
-	INumberVectorProperty *property = nullptr;
-	property = mTelescope->getNumber("EQUATORIAL_EOD_COORD");
-	if (!property)
+	auto property = mTelescope.getNumber("EQUATORIAL_EOD_COORD");
+	if (!property.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or EQUATORIAL_EOD_COORD property...";
 		return;
 	}
 
-	property->np[0].value = coords.RA;
-	property->np[1].value = coords.DEC;
+	property[0].setValue(coords.RA);
+	property[1].setValue(coords.DEC);
 	sendNewNumber(property);
 
 	// And now unset SYNC switch member to revert to default state/behavior
-	track->s = ISS_ON;
-	slew->s = ISS_OFF;
-	sync->s = ISS_OFF;
+	track->setState(ISS_ON);
+	slew->setState(ISS_OFF);
+	sync->setState(ISS_OFF);
 	sendNewSwitch(switchVector);
 }
 
 bool INDIConnection::isDeviceConnected() const
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope)
+	if (!mTelescope.isValid())
 		return false;
 
-	return mTelescope->isConnected();
+	return mTelescope.isConnected();
 }
 
 const QStringList INDIConnection::devices() const
@@ -147,28 +154,28 @@ const QStringList INDIConnection::devices() const
 void INDIConnection::unParkTelescope()
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_PARK");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_PARK");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_PARK switch...";
 		return;
 	}
 
-	ISwitch *park = IUFindSwitch(switchVector, "PARK");
+	auto park = switchVector.findWidgetByName("PARK");
 	if (park->s == ISS_ON)
 	{
-		park->s = ISS_OFF;
+		park->setState(ISS_OFF);
 		sendNewSwitch(switchVector);
 	}
 
 	// The telescope will work without running command below, but I use it to avoid undefined state for parking property.
-	ISwitch *unpark = IUFindSwitch(switchVector, "UNPARK");
+	auto unpark = switchVector.findWidgetByName("UNPARK");
 	if (unpark->s == ISS_OFF)
 	{
-		unpark->s = ISS_ON;
+		unpark->setState(ISS_ON);
 		sendNewSwitch(switchVector);
 	}
 }
@@ -179,27 +186,27 @@ void INDIConnection::unParkTelescope()
 void INDIConnection::parkTelescope()
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_PARK");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_PARK");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_PARK switch...";
 		return;
 	}
 
-	ISwitch *park = IUFindSwitch(switchVector, "PARK");
+	auto park = switchVector.findWidgetByName("PARK");
 	if (park->s == ISS_OFF)
 	{
-		park->s = ISS_ON;
+		park->setState(ISS_ON);
 		sendNewSwitch(switchVector);
 	}
 
-	ISwitch *unpark = IUFindSwitch(switchVector, "UNPARK");
+	auto unpark = switchVector.findWidgetByName("UNPARK");
 	if (unpark->s == ISS_ON)
 	{
-		unpark->s = ISS_OFF;
+		unpark->setState(ISS_OFF);
 		sendNewSwitch(switchVector);
 	}
 }
@@ -208,24 +215,24 @@ void INDIConnection::parkTelescope()
 void INDIConnection::moveNorth(int speed)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_MOTION_NS");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_MOTION_NS");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_MOTION_NS switch...";
 		return;
 	}
 
-	ISwitch *motion = IUFindSwitch(switchVector, "MOTION_NORTH");
+	auto motion = switchVector.findWidgetByName("MOTION_NORTH");
 
 	if (speed == SLEW_STOP)
-		motion->s = ISS_OFF;
+		motion->setState(ISS_OFF);
 	else
 	{
 		setSpeed(speed);
-		motion->s = ISS_ON;
+		motion->setState(ISS_ON);
 	}
 
 	sendNewSwitch(switchVector);
@@ -234,24 +241,24 @@ void INDIConnection::moveNorth(int speed)
 void INDIConnection::moveEast(int speed)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_MOTION_WE");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_MOTION_WE");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_MOTION_WE switch...";
 		return;
 	}
 
-	ISwitch *motion = IUFindSwitch(switchVector, "MOTION_EAST");
+	auto motion = switchVector.findWidgetByName("MOTION_EAST");
 
 	if (speed == SLEW_STOP)
-		motion->s = ISS_OFF;
+		motion->setState(ISS_OFF);
 	else
 	{
 		setSpeed(speed);
-		motion->s = ISS_ON;
+		motion->setState(ISS_ON);
 	}
 
 	sendNewSwitch(switchVector);
@@ -260,24 +267,24 @@ void INDIConnection::moveEast(int speed)
 void INDIConnection::moveSouth(int speed)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_MOTION_NS");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_MOTION_NS");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_MOTION_NS switch...";
 		return;
 	}
 
-	ISwitch *motion = IUFindSwitch(switchVector, "MOTION_SOUTH");
+	auto motion = switchVector.findWidgetByName("MOTION_SOUTH");
 
 	if (speed == SLEW_STOP)
-		motion->s = ISS_OFF;
+		motion->setState(ISS_OFF);
 	else
 	{
 		setSpeed(speed);
-		motion->s = ISS_ON;
+		motion->setState(ISS_ON);
 	}
 
 	sendNewSwitch(switchVector);
@@ -286,24 +293,24 @@ void INDIConnection::moveSouth(int speed)
 void INDIConnection::moveWest(int speed)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (!mTelescope || !mTelescope->isConnected())
+	if (!mTelescope.isValid() || !mTelescope.isConnected())
 		return;
 
-	ISwitchVectorProperty *switchVector = mTelescope->getSwitch("TELESCOPE_MOTION_WE");
-	if (!switchVector)
+	auto switchVector = mTelescope.getSwitch("TELESCOPE_MOTION_WE");
+	if (!switchVector.isValid())
 	{
 		qDebug() << "Error: unable to find Telescope or TELESCOPE_MOTION_WE switch...";
 		return;
 	}
 
-	ISwitch *motion = IUFindSwitch(switchVector, "MOTION_WEST");
+	auto motion = switchVector.findWidgetByName("MOTION_WEST");
 
 	if (speed == SLEW_STOP)
-		motion->s = ISS_OFF;
+		motion->setState(ISS_OFF);
 	else
 	{
 		setSpeed(speed);
-		motion->s = ISS_ON;
+		motion->setState(ISS_ON);
 	}
 
 	sendNewSwitch(switchVector);
@@ -311,25 +318,26 @@ void INDIConnection::moveWest(int speed)
 
 void INDIConnection::setSpeed(int speed)
 {
-	ISwitchVectorProperty *slewRateSP = mTelescope->getSwitch("TELESCOPE_SLEW_RATE");
+	auto slewRateSP = mTelescope.getSwitch("TELESCOPE_SLEW_RATE");
 
-	if (!slewRateSP || speed < 0 || speed > slewRateSP->nsp)
+	if (!slewRateSP.isValid() || speed < 0 ||
+			static_cast<std::size_t>(speed) > slewRateSP.count())
 		return;
 
-	IUResetSwitch(slewRateSP);
-	slewRateSP->sp[speed].s = ISS_ON;
+	slewRateSP.reset();
+	slewRateSP[speed].setState(ISS_ON);
 	sendNewSwitch(slewRateSP);
 }
 
-void INDIConnection::newDevice(INDI::BaseDevice *dp)
+void INDIConnection::newDevice(INDI::BaseDevice dp)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
 	if (!dp)
 		return;
 
-	QString name(dp->getDeviceName());
+	QString name(dp.getDeviceName());
 
-	qDebug() << "INDIConnection::newDevice| New Device... " << name;
+	qDebug().noquote() << "INDIConnection::newDevice| New Device... " << name;
 
 	mDevices.append(name);
 	mTelescope = dp;
@@ -337,91 +345,48 @@ void INDIConnection::newDevice(INDI::BaseDevice *dp)
 	emit newDeviceReceived(name);
 }
 
-void INDIConnection::removeDevice(INDI::BaseDevice *dp)
+void INDIConnection::removeDevice(INDI::BaseDevice dp)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
 	if (!dp)
 		return;
 
-	QString name(dp->getDeviceName());
+	QString name(dp.getDeviceName());
 	int index = mDevices.indexOf(name);
 	if (index != -1)
 		mDevices.removeAt(index);
 
-	if (mTelescope == dp)
-		mTelescope = nullptr;
+	if (mTelescope.isDeviceNameMatch(dp.getDeviceName()))
+		mTelescope.detach();
 
 	emit removeDeviceReceived(name);
 }
 
-void INDIConnection::newProperty(INDI::Property *property)
+void INDIConnection::newProperty(INDI::Property property)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
-	if (mTelescope != property->getBaseDevice())
+	if (!mTelescope.isDeviceNameMatch(
+				property.getBaseDevice().getDeviceName()))
 		return;
 
-	QString name(property->getName());
-
-	qDebug() << "INDIConnection::newProperty| " << name;
+	QString name(property.getName());
 
-	if (name == "EQUATORIAL_EOD_COORD")
-	{
-		mCoordinates.RA = property->getNumber()->np[0].value;
-		mCoordinates.DEC = property->getNumber()->np[1].value;
-	}
+	qDebug().noquote() << "INDIConnection::newProperty| " << name;
 
-	if (!mTelescope->isConnected())
+	if (!mTelescope.isConnected())
 	{
-		connectDevice(mTelescope->getDeviceName());
-		if (mTelescope->isConnected())
+		connectDevice(mTelescope.getDeviceName());
+		if (mTelescope.isConnected())
 			qDebug() << "connected\n";
 	}
 }
 
-void INDIConnection::removeProperty(INDI::Property *property)
+void INDIConnection::removeProperty(INDI::Property property)
 {
 	Q_UNUSED(property)
 }
 
-void INDIConnection::newBLOB(IBLOB *bp)
-{
-	Q_UNUSED(bp)
-}
-
-void INDIConnection::newSwitch(ISwitchVectorProperty *svp)
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-	QString name(svp->name);
-	if (name == "TELESCOPE_SLEW_RATE")
-	{
-		int speed = IUFindOnSwitchIndex(svp);
-		emit speedChanged(speed);
-	}
-}
-
-void INDIConnection::newNumber(INumberVectorProperty *nvp)
-{
-	std::lock_guard<std::mutex> lock(mMutex);
-
-	QString name(nvp->name);
-	if (name == "EQUATORIAL_EOD_COORD")
-	{
-		mCoordinates.RA = nvp->np[0].value;
-		mCoordinates.DEC = nvp->np[1].value;
-	}
-}
-
-void INDIConnection::newText(ITextVectorProperty *tvp)
-{
-	Q_UNUSED(tvp)
-}
-
-void INDIConnection::newLight(ILightVectorProperty *lvp)
-{
-	Q_UNUSED(lvp)
-}
-
-void INDIConnection::newMessage(INDI::BaseDevice *dp, int messageID)
+void INDIConnection::newMessage(INDI::BaseDevice dp, int messageID)
 {
 	Q_UNUSED(dp)
 	Q_UNUSED(messageID)
diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
index 09dd4f915162f..e511f20cb0583 100644
--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
@@ -20,7 +20,8 @@
 #define INDICONNECTION_HPP
 
 #include <QObject>
-#include "libindi/baseclient.h"
+#include <libs/indiclient/baseclient.h>
+#include <libs/indidevice/basedevice.h>
 
 #include <mutex>
 #include <QStringList>
@@ -64,21 +65,15 @@ class INDIConnection final : public QObject, public INDI::BaseClient
 	void setSpeed(int speed);
 
 	mutable std::mutex mMutex;
-	INDI::BaseDevice* mTelescope = nullptr;
-	Coordinates mCoordinates;
+	INDI::BaseDevice mTelescope;
 	QStringList mDevices;
 
 public: // from INDI::BaseClient
-	void newDevice(INDI::BaseDevice *dp) override;
-	void removeDevice(INDI::BaseDevice *dp) override;
-	void newProperty(INDI::Property *property) override;
-	void removeProperty(INDI::Property *property) override;
-	void newBLOB(IBLOB *bp) override;
-	void newSwitch(ISwitchVectorProperty *svp) override;
-	void newNumber(INumberVectorProperty *nvp) override;
-	void newText(ITextVectorProperty *tvp) override;
-	void newLight(ILightVectorProperty *lvp) override;
-	void newMessage(INDI::BaseDevice *dp, int messageID) override;
+	void newDevice(INDI::BaseDevice dp) override;
+	void removeDevice(INDI::BaseDevice dp) override;
+	void newProperty(INDI::Property property) override;
+	void removeProperty(INDI::Property property) override;
+	void newMessage(INDI::BaseDevice dp, int messageID) override;
 	void serverConnected() override;
 	void serverDisconnected(int exit_code) override;
 	void unParkTelescope();
diff --git a/plugins/TelescopeControl/src/INDI/INDIControlWidget.cpp b/plugins/TelescopeControl/src/INDI/INDIControlWidget.cpp
index 355fecef21250..d1ec12905b545 100644
--- a/plugins/TelescopeControl/src/INDI/INDIControlWidget.cpp
+++ b/plugins/TelescopeControl/src/INDI/INDIControlWidget.cpp
@@ -26,14 +26,14 @@ INDIControlWidget::INDIControlWidget(QSharedPointer<TelescopeClient> telescope,
 {
 	ui->setupUi(this);
 
-	QObject::connect(ui->northButton, &QPushButton::pressed,  this, [=](){mTelescope->move(180, speed());});
-	QObject::connect(ui->northButton, &QPushButton::released, this, [=](){mTelescope->move(180, 0);});
-	QObject::connect(ui->eastButton,  &QPushButton::pressed,  this, [=](){mTelescope->move(270, speed());});
-	QObject::connect(ui->eastButton,  &QPushButton::released, this, [=](){mTelescope->move(270, 0);});
-	QObject::connect(ui->southButton, &QPushButton::pressed,  this, [=](){mTelescope->move(0, speed());});
-	QObject::connect(ui->southButton, &QPushButton::released, this, [=](){mTelescope->move(0, 0);});
-	QObject::connect(ui->westButton,  &QPushButton::pressed,  this, [=](){mTelescope->move(90, speed());});
-	QObject::connect(ui->westButton,  &QPushButton::released, this, [=](){mTelescope->move(90, 0);});
+	QObject::connect(ui->moveUp, &QToolButton::pressed,  this, [=](){mTelescope->move(0, speed());});
+	QObject::connect(ui->moveUp, &QToolButton::released, this, [=](){mTelescope->move(0, 0);});
+	QObject::connect(ui->moveRight,  &QToolButton::pressed,  this, [=](){mTelescope->move(270, speed());});
+	QObject::connect(ui->moveRight,  &QToolButton::released, this, [=](){mTelescope->move(270, 0);});
+	QObject::connect(ui->moveDown, &QToolButton::pressed,  this, [=](){mTelescope->move(180, speed());});
+	QObject::connect(ui->moveDown, &QToolButton::released, this, [=](){mTelescope->move(180, 0);});
+	QObject::connect(ui->moveLeft,  &QToolButton::pressed,  this, [=](){mTelescope->move(90, speed());});
+	QObject::connect(ui->moveLeft,  &QToolButton::released, this, [=](){mTelescope->move(90, 0);});
 }
 
 INDIControlWidget::~INDIControlWidget()
diff --git a/plugins/TelescopeControl/src/INDI/INDIControlWidget.ui b/plugins/TelescopeControl/src/INDI/INDIControlWidget.ui
index ab1a934972978..b8b098b1c63bb 100644
--- a/plugins/TelescopeControl/src/INDI/INDIControlWidget.ui
+++ b/plugins/TelescopeControl/src/INDI/INDIControlWidget.ui
@@ -21,15 +21,9 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0" columnminimumwidth="0,0,0">
-     <item row="1" column="0">
-      <widget class="QPushButton" name="westButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
+    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
+     <item row="0" column="1">
+      <widget class="QToolButton" name="moveUp">
        <property name="toolTip">
         <string/>
        </property>
@@ -38,12 +32,12 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources/TelescopeControl.qrc">
-         <normaloff>:/telescopeControl/nv_spinleft.png</normaloff>:/telescopeControl/nv_spinleft.png</iconset>
+         <normaloff>:/telescopeControl/nv_spinup.png</normaloff>:/telescopeControl/nv_spinup.png</iconset>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QPushButton" name="southButton">
+     <item row="1" column="2">
+      <widget class="QToolButton" name="moveRight">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -58,12 +52,12 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources/TelescopeControl.qrc">
-         <normaloff>:/telescopeControl/nv_spindown.png</normaloff>:/telescopeControl/nv_spindown.png</iconset>
+         <normaloff>:/telescopeControl/nv_spinright.png</normaloff>:/telescopeControl/nv_spinright.png</iconset>
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
-      <widget class="QPushButton" name="eastButton">
+     <item row="2" column="1">
+      <widget class="QToolButton" name="moveDown">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -78,15 +72,18 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources/TelescopeControl.qrc">
-         <normaloff>:/telescopeControl/nv_spinright.png</normaloff>:/telescopeControl/nv_spinright.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
+         <normaloff>:/telescopeControl/nv_spindown.png</normaloff>:/telescopeControl/nv_spindown.png</iconset>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="northButton">
+     <item row="1" column="0">
+      <widget class="QToolButton" name="moveLeft">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="toolTip">
         <string/>
        </property>
@@ -95,7 +92,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources/TelescopeControl.qrc">
-         <normaloff>:/telescopeControl/nv_spinup.png</normaloff>:/telescopeControl/nv_spinup.png</iconset>
+         <normaloff>:/telescopeControl/nv_spinleft.png</normaloff>:/telescopeControl/nv_spinleft.png</iconset>
        </property>
       </widget>
      </item>
@@ -108,40 +105,83 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>217</width>
+       <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
-    <widget class="QSlider" name="speedSlider">
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>4</number>
-     </property>
-     <property name="singleStep">
-      <number>1</number>
-     </property>
-     <property name="pageStep">
-      <number>1</number>
-     </property>
-     <property name="value">
-      <number>2</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Max</string>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Min</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Max</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QSlider" name="speedSlider">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>4</number>
+       </property>
+       <property name="singleStep">
+        <number>1</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="value">
+        <number>2</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
@@ -158,13 +198,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Min</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
index bc156607b0b8b..967bf127fa8de 100644
--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
@@ -25,7 +25,7 @@
 
 #include "StelCore.hpp"
 #include "StelUtils.hpp"
-#include "libindi/inditelescope.h"
+#include <libs/indibase/inditelescope.h>
 #include "INDIControlWidget.hpp"
 
 TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString &params):
@@ -54,7 +54,7 @@ TelescopeClientINDI::~TelescopeClientINDI()
 	mConnection.disconnectServer();
 }
 
-Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore*) const
+Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore* core) const
 {
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 
@@ -63,9 +63,7 @@ Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore*) const
 
 	Vec3d posJNow;
 	StelUtils::spheToRect(longitudeRad, latitudeRad, posJNow);
-	const StelCore* core = StelApp::getInstance().getCore();
-	Vec3d posJ2000 = core->equinoxEquToJ2000(posJNow, StelCore::RefractionOff);
-	return posJ2000;
+	return core->equinoxEquToJ2000(posJNow, StelCore::RefractionOff);
 }
 
 void TelescopeClientINDI::telescopeGoto(const Vec3d &positionJ2000, StelObjectP selectObject)
@@ -82,7 +80,6 @@ void TelescopeClientINDI::telescopeGoto(const Vec3d &positionJ2000, StelObjectP
 	double longitudeRad = posJ2000[0] * 12.0 / M_PI;
 	double latitudeRad = posJ2000[1] * 180.0 / M_PI;
 
-
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 	positionJNow.RA = longitudeRad;
 	positionJNow.DEC = latitudeRad;
@@ -107,7 +104,6 @@ void TelescopeClientINDI::telescopeSync(const Vec3d &positionJ2000, StelObjectP
 	double longitudeRad = posJ2000[0] * 12.0 / M_PI;
 	double latitudeRad = posJ2000[1] * 180.0 / M_PI;
 
-
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 	positionJNow.RA = longitudeRad;
 	positionJNow.DEC = latitudeRad;
diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
index ca7b7e0c40a75..e9466521bd537 100644
--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
@@ -20,9 +20,10 @@
 
 #include <limits>
 #include <cmath>
+#include <string>
 
 #include "INDIConnection.hpp"
-#include "libindi/basedevice.h"
+#include <libs/indidevice/basedevice.h>
 
 void TestINDIConnection::deafultCoordinates()
 {
@@ -54,6 +55,8 @@ void TestINDIConnection::setPositionNotConnected()
     QVERIFY(instance.position() == INDIConnection::Coordinates());
 }
 
+/*
+ * FIXME: this unit test is broken for INDI 2.0+
 void TestINDIConnection::listDevices()
 {
     INDIConnection instance;
@@ -62,11 +65,12 @@ void TestINDIConnection::listDevices()
     INDI::BaseDevice device;
     device.setDeviceName("dummy");
 
-    instance.newDevice(&device);
+    instance.newDevice(device);
     QVERIFY(instance.devices().size() == 1);
-    instance.removeDevice(&device);
+    instance.removeDevice(device);
     QVERIFY(instance.devices().empty());
 }
+*/
 
 QTEST_MAIN(TestINDIConnection)
 
diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.hpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.hpp
index bf8ff51bdc262..c5d15fa631029 100644
--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.hpp
+++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.hpp
@@ -30,7 +30,7 @@ private slots:
     void defaultPosition();
     void initialConnectionStatus();
     void setPositionNotConnected();
-    void listDevices();
+    //void listDevices();
 };
 
 #endif // TESTINDICONNECTION_HPP
diff --git a/plugins/TelescopeControl/src/TelescopeClient.cpp b/plugins/TelescopeControl/src/TelescopeClient.cpp
index d0116d4f62fcc..6132aaa016073 100644
--- a/plugins/TelescopeControl/src/TelescopeClient.cpp
+++ b/plugins/TelescopeControl/src/TelescopeClient.cpp
@@ -28,7 +28,6 @@
 #include "Rts2/TelescopeClientJsonRts2.hpp"
 #include "Lx200/TelescopeClientDirectLx200.hpp"
 #include "NexStar/TelescopeClientDirectNexStar.hpp"
-#include "INDI/TelescopeClientINDI.hpp"
 #include "StelTranslator.hpp"
 #include "StelCore.hpp"
 #include "StelMainView.hpp"
@@ -45,11 +44,12 @@
 #include <QMessageBox>
 
 #if defined(Q_OS_WIN)
-#if QT_VERSION<QT_VERSION_CHECK(6,0,0)
+	#if QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	#include "ASCOM/TelescopeClientASCOM.hpp"
-#endif
+	#endif
 	#include <Windows.h> // GetSystemTimeAsFileTime()
 #else
+	#include "INDI/TelescopeClientINDI.hpp"
 	#include <sys/time.h>
 #endif
 
@@ -101,10 +101,12 @@ TelescopeClient *TelescopeClient::create(const QString &url)
 	{
 		newTelescope= new TelescopeClientDirectNexStar(name, params, eq);
 	}
+	#ifndef Q_OS_WIN
 	else if (type == "INDI")
 	{
 		newTelescope = new TelescopeClientINDI(name, params);
 	}
+	#endif
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	else if (type == "ASCOM")
 	{
diff --git a/plugins/TelescopeControl/src/TelescopeClient.hpp b/plugins/TelescopeControl/src/TelescopeClient.hpp
index e8a767fb21c3f..cc4cf0efd00e9 100644
--- a/plugins/TelescopeControl/src/TelescopeClient.hpp
+++ b/plugins/TelescopeControl/src/TelescopeClient.hpp
@@ -101,7 +101,7 @@ class TelescopeClient : public QObject, public StelObject
 
 	//!
 	//! \brief move
-	//! \param angle [0,360). 0=South, 90=West, 180=North, 270=East
+	//! \param angle [0,360). 180=Down/South, 270=Right/West, 0=Up/North, 90=Left/East
 	//! \param speed [0,1]
 	//! The default implementation does nothing but emit a warning.
 	virtual void move(double angle, double speed);
diff --git a/plugins/TelescopeControl/src/gui/CMakeLists.txt b/plugins/TelescopeControl/src/gui/CMakeLists.txt
index 1e1bdc4f4cced..528d0b91f077e 100644
--- a/plugins/TelescopeControl/src/gui/CMakeLists.txt
+++ b/plugins/TelescopeControl/src/gui/CMakeLists.txt
@@ -31,9 +31,14 @@ target_link_libraries(TelescopeControl_gui
     Qt${QT_VERSION_MAJOR}::Network
     Qt${QT_VERSION_MAJOR}::Gui
     TelescopeControl_common
-    TelescopeControl_INDI    
     )
 
+IF(NOT WIN32)
+target_link_libraries(TelescopeControl_gui
+    TelescopeControl_INDI
+    )
+ENDIF()
+
 if(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
 target_link_libraries(TelescopeControl_gui
     TelescopeControl_ASCOM
diff --git a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp
index f3bce7397bf48..30c244bac86ef 100644
--- a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp
+++ b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp
@@ -142,6 +142,13 @@ void TelescopeConfigurationDialog::createDialogContent()
 	}
 	#endif
 
+	#ifndef Q_OS_WIN
+	indiWidget = new TelescopeClientINDIWidget(ui->scrollAreaWidgetContents);
+	ui->INDILayout->addWidget(indiWidget);
+	#else
+	ui->radioButtonTelescopeINDI->hide();
+	#endif
+
 	// Inherited connect
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
 	connect(ui->titleBar, &TitleBar::closeClicked, this, &TelescopeConfigurationDialog::buttonDiscardPressed);
@@ -153,16 +160,18 @@ void TelescopeConfigurationDialog::createDialogContent()
 	connect(ui->radioButtonTelescopeConnection, SIGNAL(toggled(bool)), this, SLOT(toggleTypeConnection(bool)));
 	connect(ui->radioButtonTelescopeVirtual, SIGNAL(toggled(bool)), this, SLOT(toggleTypeVirtual(bool)));
 	connect(ui->radioButtonTelescopeRTS2, SIGNAL(toggled(bool)), this, SLOT(toggleTypeRTS2(bool)));
+	#ifndef Q_OS_WIN
 	connect(ui->radioButtonTelescopeINDI, SIGNAL(toggled(bool)), this, SLOT(toggleTypeINDI(bool)));
+	#endif
 	#ifdef Q_OS_WIN
-	#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
+		#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
 		ui->radioButtonTelescopeASCOM->setToolTip(q_("Disabled due to apparent incompatibility. Please use the Qt5-based build of Stellarium."));
 		ui->radioButtonTelescopeASCOM->setDisabled(true);
-	#else
+		#else
 		connect(ui->radioButtonTelescopeASCOM, SIGNAL(toggled(bool)), this, SLOT(toggleTypeASCOM(bool)));
-	#endif
+		#endif
 	#else
-	ui->radioButtonTelescopeASCOM->hide();
+		ui->radioButtonTelescopeASCOM->hide();
 	#endif
 
 	connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(buttonSavePressed()));
@@ -197,7 +206,9 @@ void TelescopeConfigurationDialog::initConfigurationDialog()
 	ui->groupBoxConnectionSettings->hide();
 	ui->groupBoxDeviceSettings->hide();
 	ui->groupBoxRTS2Settings->hide();
-	ui->INDIProperties->hide();
+	#ifndef Q_OS_WIN
+	indiWidget->hide();
+	#endif
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	ascomWidget->hide();
 	#endif
@@ -345,13 +356,15 @@ void TelescopeConfigurationDialog::initExistingTelescopeConfiguration(int slot)
 		ui->lineEditRTS2Password->setText(rts2Password);
 		ui->doubleSpinBoxRTS2Refresh->setValue(SECONDS_FROM_MICROSECONDS(rts2Refresh));
 	}
+	#ifndef Q_OS_WIN
 	else if (connectionType == TelescopeControl::ConnectionINDI)
 	{
 		ui->radioButtonTelescopeINDI->setChecked(true);
-		ui->INDIProperties->setHost(host);
-		ui->INDIProperties->setPort(portTCP);
-		ui->INDIProperties->setSelectedDevice(deviceModelName);
+		indiWidget->setHost(host);
+		indiWidget->setPort(portTCP);
+		indiWidget->setSelectedDevice(deviceModelName);
 	}
+	#endif
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	else if (connectionType == TelescopeControl::ConnectionASCOM)
 	{
@@ -456,10 +469,12 @@ void TelescopeConfigurationDialog::toggleTypeRTS2(bool isChecked)
 	}
 }
 
+#ifndef Q_OS_WIN
 void TelescopeConfigurationDialog::toggleTypeINDI(bool enabled)
 {
-	ui->INDIProperties->setVisible(enabled);
+	indiWidget->setVisible(enabled);
 }
+#endif
 
 #if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 void TelescopeConfigurationDialog::toggleTypeASCOM(bool enabled)
@@ -544,12 +559,13 @@ void TelescopeConfigurationDialog::buttonSavePressed()
 		  ui->lineEditRTS2Username->text(), ui->lineEditRTS2Password->text(),
 		  qRound(MICROSECONDS_FROM_SECONDS(ui->doubleSpinBoxRTS2Refresh->value())));
 	}
+	#ifndef Q_OS_WIN
 	else if (ui->radioButtonTelescopeINDI->isChecked())
 	{
 		type = TelescopeControl::ConnectionINDI;
-		telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, ui->INDIProperties->host(),
-		  ui->INDIProperties->port(), delay, connectAtStartup, circles, ui->INDIProperties->selectedDevice());
+		telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, indiWidget->host(), indiWidget->port(), delay, connectAtStartup, circles, indiWidget->selectedDevice());
 	}
+	#endif
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	else if (ui->radioButtonTelescopeASCOM->isChecked())
 	{
diff --git a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp
index 5e906c68b6556..d2b201b662319 100644
--- a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp
+++ b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp
@@ -33,6 +33,10 @@
 #include "../ASCOM/TelescopeClientASCOMWidget.hpp"
 #endif
 
+#ifndef Q_OS_WIN
+#include "../INDI/TelescopeClientINDIWidget.hpp"
+#endif
+
 class Ui_telescopeConfigurationDialog;
 class StelStyle;
 
@@ -67,7 +71,9 @@ private slots:
 	void toggleTypeConnection(bool);
 	void toggleTypeVirtual(bool);
 	void toggleTypeRTS2(bool);
+	#ifndef Q_OS_WIN
 	void toggleTypeINDI(bool enabled);
+	#endif
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	void toggleTypeASCOM(bool enabled);
 	#endif
@@ -90,6 +96,10 @@ private slots:
 	#if defined(Q_OS_WIN) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
 	TelescopeClientASCOMWidget* ascomWidget;
 	#endif
+
+	#ifndef Q_OS_WIN
+	TelescopeClientINDIWidget* indiWidget;
+	#endif
 	
 	int configuredSlot;
 	
diff --git a/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui b/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui
index 2eadc1c38c167..ea959edc8ccf4 100644
--- a/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui
+++ b/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui
@@ -385,7 +385,20 @@
         </widget>
        </item>
        <item>
-        <widget class="TelescopeClientINDIWidget" name="INDIProperties" native="true"/>
+        <layout class="QVBoxLayout" name="INDILayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+        </layout>
        </item>
        <item>
         <layout class="QVBoxLayout" name="ASCOMLayout">
@@ -873,12 +886,6 @@
    <header>Dialog.hpp</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>TelescopeClientINDIWidget</class>
-   <extends>QWidget</extends>
-   <header>TelescopeClientINDIWidget.hpp</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>StelCloseButton</class>
    <extends>QPushButton</extends>
diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
index 86fb617049d2a..42a74ac19f473 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -73,10 +73,10 @@ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
 IF(USE_BUNDLED_QTCOMPRESS)
     # QtCompress library under LGPL 2.1
     set(qtcompress_SRCS
-        qtcompress/qzip.cpp
-        qtcompress/qzipreader.h
-        qtcompress/qzipwriter.h
-        )
+	qtcompress/qzip.cpp
+	qtcompress/qzipreader.h
+	qtcompress/qzipwriter.h
+	)
     add_library(qtcompress_stel STATIC EXCLUDE_FROM_ALL ${qtcompress_SRCS})
     target_include_directories(qtcompress_stel PUBLIC qtcompress)
     #this can use the system zlib, or our zlib
@@ -87,100 +87,118 @@ IF(USE_BUNDLED_QTCOMPRESS)
 ENDIF()
 
 ################################# INDI ################################
-IF(USE_PLUGIN_TELESCOPECONTROL)
-    SET(PREFER_SYSTEM_INDILIB 1 CACHE BOOL
-        "Use system-provided INDI instead of the bundled version")
+IF(USE_PLUGIN_TELESCOPECONTROL AND NOT WIN32)
+    SET(PREFER_SYSTEM_INDILIB 1 CACHE BOOL "Use system-provided INDI instead of the bundled version")
     find_library(INDICLIENT_LIB indiclient)
     if(INDICLIENT_LIB AND PREFER_SYSTEM_INDILIB)
         MESSAGE(STATUS "Using system-provided indiclient at ${INDICLIENT_LIB}")
         add_library(indiclient UNKNOWN IMPORTED GLOBAL)
-        set_target_properties(indiclient PROPERTIES
-            IMPORTED_LOCATION "${INDICLIENT_LIB}")
+	set_target_properties(indiclient PROPERTIES IMPORTED_LOCATION "${INDICLIENT_LIB}")
     else()
+        include(CheckSymbolExists)
+        check_symbol_exists(mremap sys/mman.h HAVE_MREMAP)
+        check_symbol_exists(timespec_get time.h HAVE_TIMESPEC_GET)
+        check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
+
         # Git repo is large, limit download to archive
         # Included CMakeLists.txt contains unrelated targets and dependencies of
         # them, therefore DOWNLOAD_ONLY and all the code below
         CPMAddPackage(NAME indiclient
-            URL https://github.com/indilib/indi/archive/v1.8.5.zip
-            URL_HASH SHA256=57b78afe6d338533e35725e94cf6a9e302e22348ab418811bd41997cddf13fd6
-            VERSION 1.8.5
-            DOWNLOAD_ONLY YES)
+		URL https://github.com/indilib/indi/archive/v2.1.0.zip
+		URL_HASH SHA256=551d23f8ea68b37c9b6504b6e5e55d32319d7605f2a63d78cfc73c2d95cee8f2
+		VERSION 2.1.0
+		DOWNLOAD_ONLY YES)
+
+        # First, fix a missing include
+	file(READ ${indiclient_SOURCE_DIR}/libs/indicore/indidevapi.h INDIDEVAPI_H)
+	string(REGEX REPLACE "#include .lilxml.h." "#include \"lilxml.h\"\n#include <stdarg.h>" INDIDEVAPI_H "${INDIDEVAPI_H}")
+	file(WRITE ${indiclient_SOURCE_DIR}/libs/indicore/indidevapi.h.new "${INDIDEVAPI_H}")
+	configure_file(${indiclient_SOURCE_DIR}/libs/indicore/indidevapi.h.new ${indiclient_SOURCE_DIR}/libs/indicore/indidevapi.h COPYONLY)
 
-        # Installed version has /usr/include/libindi, move these headers to
-        # such directory for a consistent #include
-        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libindi)
-        file(GLOB INDI_HEADERS "${indiclient_SOURCE_DIR}/libs/indibase/*.h")
-        file(COPY ${INDI_HEADERS}
-            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libindi)
+        # libastro.h doesn't need libnova/utility.h
+	file(READ ${indiclient_SOURCE_DIR}/libs/indicore/libastro.h LIBASTRO_H)
+        string(REGEX REPLACE "#include <libnova/utility.h>" "" LIBASTRO_H "${LIBASTRO_H}")
+	file(WRITE ${indiclient_SOURCE_DIR}/libs/indicore/libastro.h.new "${LIBASTRO_H}")
+	configure_file(${indiclient_SOURCE_DIR}/libs/indicore/libastro.h.new ${indiclient_SOURCE_DIR}/libs/indicore/libastro.h COPYONLY)
 
         # Avoid bundling libnova too
-        file(READ
-            ${indiclient_SOURCE_DIR}/libs/indibase/inditelescope.h
-            INDITELESCOPE_H)
-        string(REGEX REPLACE
-            "#include <libnova/julian_day.h>" "struct ln_date;"
-            INDITELESCOPE_H "${INDITELESCOPE_H}")
-        string(REGEX REPLACE
-            "ln_lnlat_posn lnobserver { 0, 0 };" ""
-            INDITELESCOPE_H "${INDITELESCOPE_H}")
-        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libindi/inditelescope.h.new
-            "${INDITELESCOPE_H}")
-        configure_file(${CMAKE_CURRENT_BINARY_DIR}/libindi/inditelescope.h.new
-            ${CMAKE_CURRENT_BINARY_DIR}/libindi/inditelescope.h COPYONLY)
+	file(READ ${indiclient_SOURCE_DIR}/libs/indibase/inditelescope.h INDITELESCOPE_H)
+	string(REGEX REPLACE "#include <libnova/julian_day.h>" "struct ln_date;" INDITELESCOPE_H "${INDITELESCOPE_H}")
+	string(REGEX REPLACE "ln_lnlat_posn lnobserver { 0, 0 };" "" INDITELESCOPE_H "${INDITELESCOPE_H}")
+	file(WRITE ${indiclient_SOURCE_DIR}/inditelescope.h.new "${INDITELESCOPE_H}")
+	configure_file(${indiclient_SOURCE_DIR}/inditelescope.h.new ${indiclient_SOURCE_DIR}/libs/indibase/inditelescope.h COPYONLY)
 
         # Fix build in windows
-        file(READ
-            ${indiclient_SOURCE_DIR}/libs/indibase/indilogger.h
-            INDILOGGER_H)
-        string(REGEX REPLACE "#include <sys/time.h>"
-            "#ifdef Q_OS_WIN\n#include <windows.h>\n#else\n#include <sys/time.h>\n#endif"
-            INDILOGGER_H "${INDILOGGER_H}")
-        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libindi/indilogger.h.new
-            "${INDILOGGER_H}")
-        configure_file(${CMAKE_CURRENT_BINARY_DIR}/libindi/indilogger.h.new
-            ${CMAKE_CURRENT_BINARY_DIR}/libindi/indilogger.h COPYONLY)
+	file(READ ${indiclient_SOURCE_DIR}/libs/indibase/indilogger.h INDILOGGER_H)
+	string(REGEX REPLACE "#include <sys/time.h>" "#ifdef Q_OS_WIN\n#include <windows.h>\n#else\n#include <sys/time.h>\n#endif" INDILOGGER_H "${INDILOGGER_H}")
+	file(WRITE ${indiclient_SOURCE_DIR}/indilogger.h.new "${INDILOGGER_H}")
+	configure_file(${indiclient_SOURCE_DIR}/indilogger.h.new ${indiclient_SOURCE_DIR}/libs/indibase/indilogger.h COPYONLY)
 
-        # https://devblogs.microsoft.com/cppblog/msvc-preprocessor-progress-towards-conformance/
-        # This patch is upstreamed at
-        # https://github.com/indilib/indi/pull/1728 so after version 1.9.8
-        # shouldn't be needed
-        file(GLOB INDILOCALE_H ${indiclient_SOURCE_DIR}/libs/locale_compat.h)
-        if (INDILOCALE_H)
-            file(READ ${indiclient_SOURCE_DIR}/libs/locale_compat.h INDILOCALE_H)
-            string(REGEX REPLACE "L#s" "L\"\"#s" INDILOCALE_H "${INDILOCALE_H}")
-            file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libindi/locale_compat.h.new
-                "${INDILOCALE_H}")
-            configure_file(${CMAKE_CURRENT_BINARY_DIR}/libindi/locale_compat.h.new
-                ${CMAKE_CURRENT_BINARY_DIR}/libindi/locale_compat.h COPYONLY)
-            file(RENAME ${indiclient_SOURCE_DIR}/libs/locale_compat.h
-                ${indiclient_SOURCE_DIR}/libs/locale_compat.h.bak)
-        endif()
-
-        set(INDI_SOVERSION "1")
-        set(CMAKE_INDI_VERSION_MAJOR 1)
-        set(CMAKE_INDI_VERSION_MINOR 8)
-        set(CMAKE_INDI_VERSION_RELEASE 5)
+        set(INDI_SOVERSION "2")
+        set(CMAKE_INDI_VERSION_MAJOR 2)
+	set(CMAKE_INDI_VERSION_MINOR 1)
+	set(CMAKE_INDI_VERSION_RELEASE 0)
         set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
         set(INDI_VERSION ${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE})
         set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/")
-        configure_file(${indiclient_SOURCE_DIR}/config.h.cmake
-            ${CMAKE_CURRENT_BINARY_DIR}/libindi/config.h )
-        add_library(indiclient STATIC
-            ${indiclient_SOURCE_DIR}/libs/lilxml.c
-            ${indiclient_SOURCE_DIR}/base64.c
-            ${indiclient_SOURCE_DIR}/libs/indibase/basedevice.cpp
-            ${indiclient_SOURCE_DIR}/libs/indibase/baseclient.cpp
-            ${indiclient_SOURCE_DIR}/libs/indibase/indiproperty.cpp
-            ${indiclient_SOURCE_DIR}/libs/indibase/indistandardproperty.cpp
-            ${indiclient_SOURCE_DIR}/libs/indicom.c)
+	configure_file(${indiclient_SOURCE_DIR}/config.h.cmake ${indiclient_SOURCE_DIR}/config.h )
+
+	configure_file(${indiclient_SOURCE_DIR}/libs/indicore/indiapi.h.in ${indiclient_SOURCE_DIR}/libs/indiapi.h)
+        list(APPEND INDILIB_SOURCES
+                ${indiclient_SOURCE_DIR}/libs/indicore/lilxml.cpp
+                ${indiclient_SOURCE_DIR}/libs/indicore/base64.c
+                ${indiclient_SOURCE_DIR}/libs/indicore/indidevapi.c
+                ${indiclient_SOURCE_DIR}/libs/indicore/indicom.c
+                ${indiclient_SOURCE_DIR}/libs/indicore/userio.c
+                ${indiclient_SOURCE_DIR}/libs/indicore/indiuserio.c
+                ${indiclient_SOURCE_DIR}/libs/indiabstractclient/abstractbaseclient.cpp
+                ${indiclient_SOURCE_DIR}/libs/indiclient/baseclient.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/basedevice.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/indibase.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/indistandardproperty.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/parentdevice.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/watchdeviceproperty.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indiproperties.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertybasic.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertyblob.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indiproperty.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertylight.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertynumber.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertyswitch.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertytext.cpp
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property/indipropertyview.cpp
+                ${indiclient_SOURCE_DIR}/libs/sockets/tcpsocket.cpp
+                )
+        if(WIN32)
+            list(APPEND INDILIB_SOURCES ${indiclient_SOURCE_DIR}/libs/sockets/tcpsocket_win.cpp)
+        else()
+            list(APPEND INDILIB_SOURCES ${indiclient_SOURCE_DIR}/libs/sockets/tcpsocket_unix.cpp)
+        endif()
+
+        add_library(indiclient STATIC ${INDILIB_SOURCES})
+
+        target_compile_definitions(indiclient
+          PUBLIC
+            $<$<BOOL:${HAVE_TIMESPEC_GET}>:HAVE_TIMESPEC_GET>
+            $<$<BOOL:${HAVE_CLOCK_GETTIME}>:HAVE_CLOCK_GETTIME>
+        )
+
         target_include_directories(indiclient
-            PRIVATE
-            ${CMAKE_CURRENT_BINARY_DIR}/libindi
-            PUBLIC
-            ${CMAKE_CURRENT_BINARY_DIR}
-            ${indiclient_SOURCE_DIR}
-            ${indiclient_SOURCE_DIR}/libs)
+                PRIVATE
+                ${CMAKE_CURRENT_BINARY_DIR}/libindi
+                ${indiclient_SOURCE_DIR}/libindi
+                ${indiclient_SOURCE_DIR}/libs
+                PUBLIC
+                ${CMAKE_CURRENT_BINARY_DIR}
+                ${indiclient_SOURCE_DIR}
+                ${indiclient_SOURCE_DIR}/libs/sockets
+                ${indiclient_SOURCE_DIR}/libs/indiabstractclient
+                ${indiclient_SOURCE_DIR}/libs/indibase
+                ${indiclient_SOURCE_DIR}/libs/indicore
+                ${indiclient_SOURCE_DIR}/libs/indiclient
+                ${indiclient_SOURCE_DIR}/libs/indidevice
+                ${indiclient_SOURCE_DIR}/libs/indidevice/property
+                ${indiclient_SOURCE_DIR}/libs)
         target_link_libraries(indiclient ${ZLIB_LIBRARIES})
     endif()
 ENDIF()
-