diff -Nru kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/debian/changelog kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/debian/changelog
--- kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/debian/changelog	2023-03-02 22:18:35.000000000 +0000
+++ kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/debian/changelog	2023-04-05 19:34:06.000000000 +0000
@@ -1,8 +1,8 @@
-kstars-bleeding (6:3.6.3+202303022218~ubuntu20.04.1) focal; urgency=low
+kstars-bleeding (6:3.6.3+202304051934~ubuntu20.04.1) focal; urgency=low
 
   * Auto build.
 
- -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Thu, 02 Mar 2023 22:18:35 +0000
+ -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Wed, 05 Apr 2023 19:34:06 +0000
 
 kstars-bleeding (6:3.6.3) jammy; urgency=medium
 
diff -Nru kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/debian/git-build-recipe.manifest kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/debian/git-build-recipe.manifest
--- kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/debian/git-build-recipe.manifest	2023-03-02 22:18:35.000000000 +0000
+++ kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/debian/git-build-recipe.manifest	2023-04-05 19:34:06.000000000 +0000
@@ -1,3 +1,3 @@
-# git-build-recipe format 0.4 deb-version {debversion}+202303022218
-lp:~mutlaqja/kstars-bleeding/+git/kstars-master git-commit:289054de7d335f39b223ca89e25130f4001f9ff7
-nest-part packaging lp:~mutlaqja/kstars-bleeding/+git/kstars-master packaging/linux/debian debian git-commit:289054de7d335f39b223ca89e25130f4001f9ff7
+# git-build-recipe format 0.4 deb-version {debversion}+202304051934
+lp:~mutlaqja/kstars-bleeding/+git/kstars-master git-commit:b7a88d7ef2bce8846b8f6487e7fb93de14502ff2
+nest-part packaging lp:~mutlaqja/kstars-bleeding/+git/kstars-master packaging/linux/debian debian git-commit:b7a88d7ef2bce8846b8f6487e7fb93de14502ff2
diff -Nru kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.cpp kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.cpp
--- kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.cpp	2023-03-02 22:18:30.000000000 +0000
+++ kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.cpp	2023-04-05 19:33:56.000000000 +0000
@@ -266,9 +266,9 @@
                 double diffMap = std::fabs(map["duration"].toDouble() - duration);
                 double diffBest = std::fabs(bestCandidate["duration"].toDouble() - duration);
                 if (diffMap < diffBest)
-                    thisMapScore += 2;
+                    thisMapScore += 5;
                 else if (diffBest < diffMap)
-                    bestCandidateScore += 2;
+                    bestCandidateScore += 5;
             }
 
             // More recent has a higher score than older.
@@ -277,9 +277,9 @@
                 int64_t diffMap  = map["timestamp"].toDateTime().secsTo(now);
                 int64_t diffBest = bestCandidate["timestamp"].toDateTime().secsTo(now);
                 if (diffMap < diffBest)
-                    thisMapScore += 2;
+                    thisMapScore++;
                 else if (diffBest < diffMap)
-                    bestCandidateScore += 2;
+                    bestCandidateScore++;
             }
 
             // Find candidate with closest time in case we have multiple defect maps
@@ -450,11 +450,15 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 bool DarkLibrary::cacheDarkFrameFromFile(const QString &filename)
 {
-    QFuture<bool> rc = m_CurrentDarkFrame->loadFromFile(filename);
+    QSharedPointer<FITSData> data;
+    data.reset(new FITSData(FITS_CALIBRATE), &QObject::deleteLater);
+    QFuture<bool> rc = data->loadFromFile(filename);
 
     rc.waitForFinished();
     if (rc.result())
-        m_CachedDarkFrames[filename] = m_CurrentDarkFrame;
+    {
+        m_CachedDarkFrames[filename] = data;
+    }
     else
     {
         emit newLog(i18n("Failed to load dark frame file %1", filename));
@@ -1378,7 +1382,7 @@
 
     auto memoryMB = KSUtils::getAvailableRAM() / 1e6;
     if (memoryMB > CACHE_MEMORY_LIMIT)
-        m_CachedDarkFrames[path] = data;
+        cacheDarkFrameFromFile(data->filename());
 
     QVariantMap map;
     map["ccd"]         = metadata["camera"].toString();
diff -Nru kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.ui kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.ui
--- kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.ui	2023-03-02 22:18:30.000000000 +0000
+++ kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/auxiliary/darklibrary.ui	2023-04-05 19:33:56.000000000 +0000
@@ -1158,7 +1158,7 @@
                 <double>0.100000000000000</double>
                </property>
                <property name="value">
-                <double>0.100000000000000</double>
+                <double>1.000000000000000</double>
                </property>
               </widget>
              </item>
diff -Nru kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/scheduler/framingassistant.ui kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/scheduler/framingassistant.ui
--- kstars-bleeding-3.6.3+202303022218~ubuntu20.04.1/kstars/ekos/scheduler/framingassistant.ui	2023-03-02 22:18:30.000000000 +0000
+++ kstars-bleeding-3.6.3+202304051934~ubuntu20.04.1/kstars/ekos/scheduler/framingassistant.ui	2023-04-05 19:33:56.000000000 +0000
@@ -1396,7 +1396,7 @@
           <item row="7" column="2" colspan="2">
            <widget class="QSpinBox" name="alignEvery">
             <property name="toolTip">
-             <string>Perform autofocus every N jobs.</string>
+             <string>Perform alignment every N jobs.</string>
             </property>
             <property name="suffix">
              <string/>