diff --git a/images/readme/editor.png b/images/readme/editor.png
index 0ec5176..969046e 100644
Binary files a/images/readme/editor.png and b/images/readme/editor.png differ
diff --git a/images/readme/entry_list.png b/images/readme/entry_list.png
index 4a77981..bf6c7d3 100644
Binary files a/images/readme/entry_list.png and b/images/readme/entry_list.png differ
diff --git a/images/readme/main_menu.png b/images/readme/main_menu.png
index 1f59495..ca3d781 100644
Binary files a/images/readme/main_menu.png and b/images/readme/main_menu.png differ
diff --git a/images/readme/pixels.png b/images/readme/pixels.png
index 4412153..6e89a1e 100644
Binary files a/images/readme/pixels.png and b/images/readme/pixels.png differ
diff --git a/images/readme/statistics.png b/images/readme/statistics.png
index 98708b7..5bf0a10 100644
Binary files a/images/readme/statistics.png and b/images/readme/statistics.png differ
diff --git a/src/core/internalmanager.cpp b/src/core/internalmanager.cpp
index a175780..75c0ccb 100644
--- a/src/core/internalmanager.cpp
+++ b/src/core/internalmanager.cpp
@@ -136,21 +136,21 @@ void InternalManager::start_update_theme()
 void InternalManager::set_light_palette()
 {
     set_colour(td::ColourRole::Unknown, QStringLiteral("#C9C9CF"));
-    set_colour(td::ColourRole::VeryBad, QStringLiteral("#7b1fa2"));
-    set_colour(td::ColourRole::Bad, QStringLiteral("#5e35b1"));
-    set_colour(td::ColourRole::Ok, QStringLiteral("#1976d2"));
-    set_colour(td::ColourRole::Good, QStringLiteral("#0097a7"));
-    set_colour(td::ColourRole::VeryGood, QStringLiteral("#4caf50"));
+    set_colour(td::ColourRole::VeryBad, QStringLiteral("#C43F31"));
+    set_colour(td::ColourRole::Bad, QStringLiteral("#E07F16"));
+    set_colour(td::ColourRole::Ok, QStringLiteral("#FFD30F"));
+    set_colour(td::ColourRole::Good, QStringLiteral("#5EA10E"));
+    set_colour(td::ColourRole::VeryGood, QStringLiteral("#118f17"));
     set_colour(td::ColourRole::Text, QStringLiteral("#1D1D20"));
 }
 
 void InternalManager::set_dark_palette()
 {
     set_colour(td::ColourRole::Unknown, QStringLiteral("#2F2F32"));
-    set_colour(td::ColourRole::VeryBad, QStringLiteral("#7b1fa2"));
-    set_colour(td::ColourRole::Bad, QStringLiteral("#5e35b1"));
-    set_colour(td::ColourRole::Ok, QStringLiteral("#1976d2"));
-    set_colour(td::ColourRole::Good, QStringLiteral("#0097a7"));
-    set_colour(td::ColourRole::VeryGood, QStringLiteral("#4caf50"));
+    set_colour(td::ColourRole::VeryBad, QStringLiteral("#C43F31"));
+    set_colour(td::ColourRole::Bad, QStringLiteral("#DB9837"));
+    set_colour(td::ColourRole::Ok, QStringLiteral("#F0C400"));
+    set_colour(td::ColourRole::Good, QStringLiteral("#608A22"));
+    set_colour(td::ColourRole::VeryGood, QStringLiteral("#1F8023"));
     set_colour(td::ColourRole::Text, QStringLiteral("#CACBCE"));
 }
diff --git a/src/gui/diaryeditor.cpp b/src/gui/diaryeditor.cpp
index 25d86d6..644f979 100644
--- a/src/gui/diaryeditor.cpp
+++ b/src/gui/diaryeditor.cpp
@@ -20,6 +20,7 @@
 #include "../core/diaryholder.h"
 #include "../util/custommessageboxes.h"
 #include "../util/misc.h"
+#include "mainwindow.h"
 #include "ui_diaryeditor.h"
 
 DiaryEditor::DiaryEditor(QDate const &date, QWidget *parent) : QWidget(parent), ui(new Ui::DiaryEditor)
@@ -27,9 +28,10 @@ DiaryEditor::DiaryEditor(QDate const &date, QWidget *parent) : QWidget(parent),
     ui->setupUi(this);
     ui->alert_text->setText("");
     ui->alert_text->update();
+    setup_buttons();
 
     current_month_offset = 0;
-    last_selected_day = 0;
+    current_date = date;
     last_entry_snapshot = td::Entry{false, td::Rating::Unknown, "", 0};
 
     // Ctrl S to save the diary.
@@ -47,17 +49,12 @@ DiaryEditor::DiaryEditor(QDate const &date, QWidget *parent) : QWidget(parent),
     connect(ui->prev_month, &QPushButton::clicked, this, &DiaryEditor::prev_month, Qt::QueuedConnection);
 
     // Info pane actions.
-    connect(
-        ui->update_button, &QPushButton::clicked, this, [&]() { update_day(false); }, Qt::QueuedConnection);
+    connect(MainWindow::instance(), &MainWindow::sig_update_diary, this, &DiaryEditor::update_day);
+    connect(ui->update_button, &QPushButton::clicked, this, &DiaryEditor::update_day, Qt::QueuedConnection);
     connect(ui->delete_button, &QPushButton::clicked, this, &DiaryEditor::delete_day, Qt::QueuedConnection);
     connect(ui->reset_button, &QPushButton::clicked, this, &DiaryEditor::reset_day, Qt::QueuedConnection);
 
-    connect(InternalManager::instance(), &InternalManager::update_theme, this, &DiaryEditor::update_theme,
-        Qt::QueuedConnection);
-    update_theme();
-
     // Render current month.
-    auto current_date = date;
     change_month(current_date);
 
     // The diary editor DOES NOT USE internal_diary_changed. It implements its own change detection system!!!
@@ -69,103 +66,116 @@ DiaryEditor::~DiaryEditor()
     delete save_shortcut;
 }
 
-void DiaryEditor::update_theme()
-{
-    // When this function is run in the constructor, no buttons should exist yet.
-    emit sig_re_render_buttons(
-        td::CalendarButtonData{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt});
-}
-
-DiaryCalendarButton *DiaryEditor::create_button(const td::CalendarButtonData &&d)
+void DiaryEditor::setup_buttons()
 {
-    auto ptr = new DiaryCalendarButton(d);
-
-    connect(this, &DiaryEditor::sig_re_render_buttons, ptr, &DiaryCalendarButton::re_render, Qt::QueuedConnection);
-    connect(ptr, &DiaryCalendarButton::sig_clicked, this, &DiaryEditor::date_clicked, Qt::QueuedConnection);
-
-    return ptr;
+    for (int row = 0; row < 6; ++row) {
+        for (int col = 0; col < 7; ++col) {
+            auto ptr = new DiaryCalendarButton(td::CalendarButtonData{std::optional(-1), std::optional(false),
+                std::optional(td::Rating::Unknown), std::optional(false), std::optional(false)});
+            connect(ptr, &DiaryCalendarButton::sig_clicked, this, &DiaryEditor::date_clicked, Qt::QueuedConnection);
+            ui->dates->addWidget(ptr, row, col, 1, 1, Qt::AlignCenter);
+        }
+    }
 }
 
-// Note for future me and any other readers:
-// There is probably some way to make this function more readable but really this was a write once and never touch again
-// thing because of how hard it is to keep track of all the changing variables.
-void DiaryEditor::render_month(QDate const &date, std::optional<td::YearMap::iterator> const &opt)
+void DiaryEditor::render_month(std::optional<td::YearMap::iterator> const &opt)
 {
-    // Note that the YearMap iterator actually contains a month map which holds all the days of the month.
     auto irl_current_day = QDate::currentDate();
+    int counter = 1;
 
-    // Render spacers for first row padding.
-    for (int i = 0; i < current_month_offset; ++i)
-        ui->dates->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum), 0, i, 1, 1);
-
-    int days_added = 0;
-    int row = 1;
-    int current_row_length = 0;
+    if (!opt) {
+        // Render the first row.
+        for (int day = 0; day < 7; ++day) {
+            auto button = qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(0, day)->widget());
 
-    // Render rest of first row.
-    for (int i = current_month_offset; i < 7; ++i, ++days_added) {
-        // Render the day if it has a corresponding entry.
-        // There are 2 entirely separate flows here simply because there are 2 checks required to see if the entry is
-        // present. I could use goto but that's kind of messy and harder to keep track of compared to plain old copy
-        // pasting.
-
-        auto current = irl_current_day == QDate(date.year(), date.month(), i - current_month_offset + 1);
-
-        if (opt) {
-            auto const &monthmap = (*opt)->second;
-            auto const &entry_iter = monthmap.find(i - current_month_offset + 1);
-
-            if (entry_iter != monthmap.end()) {
-                auto const &[important, rating, dummy, d2] = entry_iter->second;
+            if (day < current_month_offset) {
+                button->setVisible(false);
+            }
+            else {
+                auto current_cond = irl_current_day == QDate(current_date.year(), current_date.month(), counter);
+                button->render(td::CalendarButtonData{std::optional(counter++), std::optional(false),
+                    std::optional(td::Rating::Unknown), std::optional(false), std::optional(current_cond)});
+                button->setVisible(true);
+            }
+        }
 
-                auto ptr = create_button(td::CalendarButtonData{std::optional(i - current_month_offset + 1),
-                    std::optional(important), std::optional(rating), std::optional(false), std::optional(current)});
-                ui->dates->addWidget(ptr, 0, i, 1, 1, Qt::AlignCenter);
-                continue;
+        // Render the rest of the rows.
+        for (int row = 1; row < 6; ++row) {
+            for (int col = 0; col < 7; ++col) {
+                auto button = qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(row, col)->widget());
+
+                if (counter > current_date.daysInMonth()) {
+                    button->setVisible(false);
+                }
+                else {
+                    auto current_cond = irl_current_day == QDate(current_date.year(), current_date.month(), counter);
+                    button->render(td::CalendarButtonData{std::optional(counter++), std::optional(false),
+                        std::optional(td::Rating::Unknown), std::optional(false), std::optional(current_cond)});
+                    button->setVisible(true);
+                }
             }
         }
 
-        auto ptr = create_button(td::CalendarButtonData{std::optional(i - current_month_offset + 1),
-            std::optional(false), std::optional(td::Rating::Unknown), std::optional(false), std::optional(current)});
-        ui->dates->addWidget(ptr, 0, i, 1, 1, Qt::AlignCenter);
+        return;
     }
 
-    // Render rest of month.
-    for (int i = days_added; i < date.daysInMonth(); ++i, ++current_row_length) {
-        if (7 == current_row_length) {
-            ++row;
-            current_row_length = 0;
-        }
+    auto const &monthmap = (*opt)->second;
 
-        // 2 passes required here as well which means 2 kind of same declarations.
+    // Render the first row.
+    for (int day = 0; day < 7; ++day) {
+        auto button = qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(0, day)->widget());
 
-        auto current = irl_current_day == QDate(date.year(), date.month(), i + 1);
-
-        if (opt) {
-            auto const &monthmap = (*opt)->second;
-            auto const &entry_iter = monthmap.find(i + 1);
+        if (day < current_month_offset) {
+            button->setVisible(false);
+        }
+        else {
+            auto const &entry_iter = monthmap.find(counter);
+            auto current_cond = irl_current_day == QDate(current_date.year(), current_date.month(), counter);
 
-            if (entry_iter != monthmap.end()) {
+            if (entry_iter == monthmap.end()) {
+                button->render(td::CalendarButtonData{std::optional(counter++), std::optional(false),
+                    std::optional(td::Rating::Unknown), std::optional(false), std::optional(current_cond)});
+            }
+            else {
                 auto const &[important, rating, dummy, d2] = entry_iter->second;
 
-                auto ptr = create_button(td::CalendarButtonData{std::optional(i + 1), std::optional(important),
-                    std::optional(rating), std::optional(false), std::optional(current)});
-                ui->dates->addWidget(ptr, row, current_row_length, 1, 1, Qt::AlignCenter);
-                continue;
+                button->render(td::CalendarButtonData{std::optional(counter++), std::optional(important),
+                    std::optional(rating), std::optional(false), std::optional(current_cond)});
             }
-        }
 
-        auto ptr = create_button(td::CalendarButtonData{std::optional(i + 1), std::optional(false),
-            std::optional(td::Rating::Unknown), std::optional(false), std::optional(current)});
-        ui->dates->addWidget(ptr, row, current_row_length, 1, 1, Qt::AlignCenter);
+            button->setVisible(true);
+        }
     }
 
-    // Fill in last row with spacers if necessary. There is a vertical spacer beneath the whole grid of buttons to push
-    // them up so they don't expand downwards.
-    while (current_row_length < 7)
-        ui->dates->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum), row, current_row_length++, 1, 1);
+    // Render the rest of the rows.
+    for (int row = 1; row < 6; ++row) {
+        for (int col = 0; col < 7; ++col) {
+            auto button = qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(row, col)->widget());
 
-    qDebug() << "Rendered month editor (first day of month):" << date;
+            if (counter > current_date.daysInMonth()) {
+                button->setVisible(false);
+            }
+            else {
+                auto const &entry_iter = monthmap.find(counter);
+                auto current_cond = irl_current_day == QDate(current_date.year(), current_date.month(), counter);
+
+                if (entry_iter == monthmap.end()) {
+                    button->render(td::CalendarButtonData{std::optional(counter++), std::optional(false),
+                        std::optional(td::Rating::Unknown), std::optional(false), std::optional(current_cond)});
+                }
+                else {
+                    auto const &[important, rating, dummy, d2] = entry_iter->second;
+
+                    button->render(td::CalendarButtonData{std::optional(counter++), std::optional(important),
+                        std::optional(rating), std::optional(false), std::optional(current_cond)});
+                }
+
+                button->setVisible(true);
+            }
+        }
+    }
+
+    qDebug() << "Rendered month for current date:" << current_date;
 }
 
 // Returns true if equal, false if not equal.
@@ -183,20 +193,13 @@ void DiaryEditor::change_month(QDate const &date)
         if (QMessageBox::Cancel == res)
             return;
 
-        if (QMessageBox::Save == res)
-            update_day(true);
-
-        // Remove everything from current grid.
-        QLayoutItem *child;
-        while ((child = ui->dates->takeAt(0)) != 0) {
-            delete child->widget();
-            delete child;
-        }
+        if (QMessageBox::Save == res && !update_day())
+            return;
 
+        current_date = date;
         QDate const first_day(date.year(), date.month(), 1);
         // dayOfWeek() returns a number from 1 to 7.
         current_month_offset = first_day.dayOfWeek() - 1;
-        last_selected_day = date.day();
 
         // Set the calendar widget UI (not the info pane).
         ui->month_dropdown->blockSignals(true);
@@ -209,15 +212,16 @@ void DiaryEditor::change_month(QDate const &date)
         ui->year_edit->blockSignals(false);
 
         // Render current month.
-        render_month(first_day, DiaryHolder::instance()->get_monthmap(date));
+        render_month(DiaryHolder::instance()->get_monthmap(date));
 
-        // Render current day.
+        // Render current day with selection outline.
+        // This is not done within the render_month function since not just the rendering has to be done.
         td::CalendarButtonData const d{
             std::optional(date.day()), std::nullopt, std::nullopt, std::optional(true), std::nullopt};
         render_day(d, true);
 
+        qDebug() << "Changed month in editor and broadcasting update_data:" << date;
         emit InternalManager::instance()->update_data(date);
-        qDebug() << "Changed month in editor and broadcasted update_data:" << date;
     };
 
     if (!compare_snapshots())
@@ -232,28 +236,28 @@ void DiaryEditor::render_day(td::CalendarButtonData const &d, bool const set_inf
     int const x = (*d.day + current_month_offset - 1) % 7;
     int const y = static_cast<int>((*d.day + current_month_offset - 1) / 7);
 
-    auto const &button = qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(y, x)->widget());
-    button->re_render(d);
+    qobject_cast<DiaryCalendarButton *>(ui->dates->itemAtPosition(y, x)->widget())->render(d);
 
-    if (set_info_pane) {
-        auto const &new_date = QDate(ui->year_edit->date().year(), ui->month_dropdown->currentIndex() + 1, *d.day);
-        auto const &opt = DiaryHolder::instance()->get_entry(new_date);
+    if (!set_info_pane)
+        return;
 
-        if (opt) {
-            last_entry_snapshot = (*opt)->second;
-            update_info_pane(new_date, (*opt)->second);
-        }
-        else {
-            auto default_entry = td::Entry{false, td::Rating::Unknown, "", 0};
-            last_entry_snapshot = default_entry;
-            update_info_pane(new_date, default_entry);
-        }
+    auto const &new_date = QDate(current_date.year(), current_date.month(), *d.day);
+    auto const &opt = DiaryHolder::instance()->get_entry(new_date);
+
+    if (opt) {
+        last_entry_snapshot = (*opt)->second;
+        update_info_pane(new_date, (*opt)->second);
+    }
+    else {
+        auto default_entry = td::Entry{false, td::Rating::Unknown, "", 0};
+        last_entry_snapshot = default_entry;
+        update_info_pane(new_date, default_entry);
     }
 }
 
 void DiaryEditor::next_month()
 {
-    QDate &&next = ui->year_edit->date().addMonths(1);
+    QDate &&next = current_date.addMonths(1);
     next.setDate(next.year(), next.month(), 1);
     if (next.isValid())
         change_month(next);
@@ -261,7 +265,7 @@ void DiaryEditor::next_month()
 
 void DiaryEditor::prev_month()
 {
-    QDate &&prev = ui->year_edit->date().addMonths(-1);
+    QDate &&prev = current_date.addMonths(-1);
     prev.setDate(prev.year(), prev.month(), 1);
     if (prev.isValid())
         change_month(prev);
@@ -285,18 +289,18 @@ void DiaryEditor::date_clicked(int const day)
     ui->alert_text->update();
 
     // Don't respond to spam clicks on same button.
-    if (day == last_selected_day)
+    if (day == current_date.day())
         return;
 
     auto cb = [this, day](int const res) {
         if (QMessageBox::Cancel == res)
             return;
 
-        if (QMessageBox::Yes == res)
-            update_day(true); // Suppress entry saved message so it doesn't appear on new date.
+        if (QMessageBox::Yes == res && !update_day(false))
+            return;
 
         td::CalendarButtonData const old{
-            std::optional(last_selected_day), std::nullopt, std::nullopt, std::optional(false), std::nullopt};
+            std::optional(current_date.day()), std::nullopt, std::nullopt, std::optional(false), std::nullopt};
         td::CalendarButtonData const n{
             std::optional(day), std::nullopt, std::nullopt, std::optional(true), std::nullopt};
         // Remove selected border from old calendar button.
@@ -304,7 +308,7 @@ void DiaryEditor::date_clicked(int const day)
         // Add selected border to new calendar button.
         render_day(n, true);
 
-        last_selected_day = day;
+        current_date = QDate(current_date.year(), current_date.month(), day);
     };
 
     if (!compare_snapshots())
@@ -341,6 +345,7 @@ void DiaryEditor::update_info_pane(QDate const &date, td::Entry const &entry)
     ui->rating_dropdown->setCurrentIndex(static_cast<int>(entry.rating));
     ui->special_box->setChecked(entry.important);
     ui->entry_edit->setPlainText(entry.message.data());
+    //    ui->entry_edit->setPlainText("PLACEHOLDER");
 
     ui->rating_dropdown->blockSignals(false);
     ui->special_box->blockSignals(false);
@@ -352,26 +357,27 @@ void DiaryEditor::update_info_pane(QDate const &date, td::Entry const &entry)
 // The suppress_error parameter stops the save error box from popping up.
 // This is useful when locking the diary as typically the user is AFK.
 // The app shouldn't get stuck on the save error dialog as then it wouldn't be able to lock itself properly.
-void DiaryEditor::update_day(bool const suppress_error)
+bool DiaryEditor::update_day(bool const suppress_error)
 {
     AppBusyLock lock;
 
     // Add the entry to the in memory map.
-    auto const &new_date =
-        QDate(ui->year_edit->date().year(), ui->month_dropdown->currentIndex() + 1, last_selected_day);
     td::Entry const e{ui->special_box->isChecked(), static_cast<td::Rating>(ui->rating_dropdown->currentIndex()),
         ui->entry_edit->toPlainText().toStdString(), QDateTime::currentSecsSinceEpoch()};
 
-    DiaryHolder::instance()->create_entry(new_date, e);
+    DiaryHolder::instance()->create_entry(current_date, e);
 
     // Actually try and save the diary.
-    if (!DiaryHolder::instance()->save() && suppress_error)
-        return cmb::display_local_diary_save_error(this);
+    if (!DiaryHolder::instance()->save() && suppress_error) {
+        cmb::display_local_diary_save_error(this);
+        return false;
+    }
 
-    td::CalendarButtonData const d{std::optional(last_selected_day), std::optional(ui->special_box->isChecked()),
-        std::optional(static_cast<td::Rating>(ui->rating_dropdown->currentIndex())), std::nullopt, std::nullopt};
+    td::CalendarButtonData const d{std::optional(current_date.day()), std::optional(ui->special_box->isChecked()),
+        std::optional(static_cast<td::Rating>(ui->rating_dropdown->currentIndex())), std::optional(true), std::nullopt};
     // This updates the day button in the calendar widget.
     render_day(d, false);
+    last_entry_snapshot = e;
 
     // The last edited field is the only one that needs updating in this instance.
     QDateTime last_edited;
@@ -379,13 +385,14 @@ void DiaryEditor::update_day(bool const suppress_error)
     // Thanks stackoverflow ;)
     ui->last_edited->setText("Last edited " + last_edited.toString("dd MMM ''yy 'at' h:mm ap"));
     ui->last_edited->setToolTip(
-        last_edited.toString("dddd MMMM d%1 yyyy 'at' h:mm:ss ap").arg(misc::get_day_suffix(new_date.day())));
+        last_edited.toString("dddd MMMM d%1 yyyy 'at' h:mm:ss ap").arg(misc::get_day_suffix(current_date.day())));
     ui->last_edited->update();
     ui->alert_text->setText("Updated entry.");
     ui->alert_text->update();
 
-    InternalManager::instance()->update_data(new_date);
-    qDebug() << "Updated entry and broadcasted update_data:" << new_date;
+    InternalManager::instance()->update_data(current_date);
+    qDebug() << "Updated entry and broadcasted update_data:" << current_date;
+    return true;
 }
 
 void DiaryEditor::delete_day()
@@ -397,9 +404,7 @@ void DiaryEditor::delete_day()
         AppBusyLock lock;
 
         // Remove the entry from the in memory map.
-        auto const &new_date =
-            QDate(ui->year_edit->date().year(), ui->month_dropdown->currentIndex() + 1, last_selected_day);
-        DiaryHolder::instance()->delete_entry(new_date);
+        DiaryHolder::instance()->delete_entry(current_date);
 
         // Actually try and save the diary.
         if (!DiaryHolder::instance()->save())
@@ -408,14 +413,15 @@ void DiaryEditor::delete_day()
         ui->alert_text->setText("Deleted entry.");
         ui->alert_text->update();
 
-        update_info_pane(new_date, td::Entry{false, td::Rating::Unknown, "", 0});
-
-        td::CalendarButtonData const d{std::optional(last_selected_day), std::optional(false),
-            std::optional(static_cast<td::Rating>(td::Rating::Unknown)), std::nullopt, std::nullopt};
-        render_day(d, false);
+        render_day(td::CalendarButtonData{std::optional(current_date.day()), std::optional(false),
+                       std::optional(td::Rating::Unknown), std::optional(true), std::nullopt},
+            false);
+        auto empty = td::Entry{false, td::Rating::Unknown, "", 0};
+        update_info_pane(current_date, empty);
+        last_entry_snapshot = empty;
 
-        InternalManager::instance()->update_data(new_date);
-        qDebug() << "Deleted entry and broadcasted update_data:" << new_date;
+        InternalManager::instance()->update_data(current_date);
+        qDebug() << "Deleted entry and broadcasted update_data:" << current_date;
     };
 
     // Shift click bypasses confirmation dialog.
diff --git a/src/gui/diaryeditor.h b/src/gui/diaryeditor.h
index 34af02c..581daa5 100644
--- a/src/gui/diaryeditor.h
+++ b/src/gui/diaryeditor.h
@@ -33,25 +33,20 @@ class DiaryEditor;
 class DiaryEditor : public QWidget {
     Q_OBJECT
 
-signals:
-    void sig_re_render_buttons(td::CalendarButtonData const &data);
-    void sig_re_render(QDate const &date, bool const ignore_month_check);
-
 public:
     explicit DiaryEditor(QDate const &date, QWidget *parent = nullptr);
     ~DiaryEditor();
 
+    QDate current_date;
     int current_month_offset;
-    int last_selected_day;
     QShortcut *save_shortcut;
     // Saves the state of the entry when it was first loaded. Used to decide if the save prompt needs showing.
     td::Entry last_entry_snapshot;
 
 public slots:
-    void update_theme();
-
     // Calendar widget.
-    void render_month(QDate const &date, std::optional<td::YearMap::iterator> const &iter);
+    void setup_buttons();
+    void render_month(std::optional<td::YearMap::iterator> const &iter);
     void change_month(QDate const &date);
     void render_day(td::CalendarButtonData const &d, bool const set_info_pane);
     void next_month();
@@ -62,14 +57,13 @@ public slots:
 
     // Info pane.
     void update_info_pane(QDate const &date, td::Entry const &entry);
-    void update_day(bool const suppress_error);
+    bool update_day(bool const suppress_error = false);
     void delete_day();
     void reset_day();
 
 private:
     Ui::DiaryEditor *ui;
 
-    DiaryCalendarButton *create_button(td::CalendarButtonData const &&d);
     bool compare_snapshots();
 };
 
diff --git a/src/gui/diaryeditor.ui b/src/gui/diaryeditor.ui
index 23fe493..435c789 100644
--- a/src/gui/diaryeditor.ui
+++ b/src/gui/diaryeditor.ui
@@ -58,148 +58,16 @@
      </property>
      <item row="1" column="0">
       <layout class="QGridLayout" name="gridLayout_7">
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
        <property name="horizontalSpacing">
         <number>20</number>
        </property>
        <property name="verticalSpacing">
         <number>10</number>
        </property>
-       <item row="2" column="1">
-        <widget class="QPlainTextEdit" name="entry_edit">
-         <property name="toolTip">
-          <string>Message for this entry.</string>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Rating</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" alignment="Qt::AlignTop">
-        <widget class="QLabel" name="label_10">
-         <property name="text">
-          <string>Entry</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <layout class="QGridLayout" name="gridLayout_11">
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="special_box">
-           <property name="toolTip">
-            <string>Whether or not to mark this entry with a star.</string>
-           </property>
-           <property name="text">
-            <string>Important?</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="0" column="1">
-        <layout class="QGridLayout" name="gridLayout_10">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QComboBox" name="rating_dropdown">
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>Determines the colour associated with this entry.</string>
-           </property>
-           <item>
-            <property name="text">
-             <string>None</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Very bad</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Bad</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>OK</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Good</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Very good</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <spacer name="horizontalSpacer_8">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
        <item row="4" column="1">
         <layout class="QGridLayout" name="gridLayout_13">
-         <property name="topMargin">
-          <number>15</number>
-         </property>
-         <property name="bottomMargin">
-          <number>15</number>
-         </property>
          <property name="horizontalSpacing">
-          <number>15</number>
-         </property>
-         <property name="verticalSpacing">
-          <number>0</number>
+          <number>8</number>
          </property>
          <item row="0" column="3">
           <spacer name="horizontalSpacer_7">
@@ -267,6 +135,66 @@
          </item>
         </layout>
        </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="special_box">
+         <property name="toolTip">
+          <string>Whether or not to mark this entry with a star.</string>
+         </property>
+         <property name="text">
+          <string>Important?</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" alignment="Qt::AlignTop">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Entry</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" alignment="Qt::AlignLeft">
+        <widget class="QComboBox" name="rating_dropdown">
+         <property name="minimumSize">
+          <size>
+           <width>120</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>Determines the colour associated with this entry.</string>
+         </property>
+         <item>
+          <property name="text">
+           <string>None</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Very bad</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Bad</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>OK</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Good</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Very good</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item row="3" column="1">
         <widget class="QLabel" name="alert_text">
          <property name="font">
@@ -279,17 +207,28 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="1">
+        <widget class="QPlainTextEdit" name="entry_edit">
+         <property name="toolTip">
+          <string>Message for this entry.</string>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Rating</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item row="0" column="0">
       <layout class="QGridLayout" name="gridLayout_4">
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="horizontalSpacing">
-        <number>0</number>
-       </property>
-       <property name="verticalSpacing">
+       <property name="bottomMargin">
         <number>10</number>
        </property>
        <item row="0" column="0">
@@ -316,22 +255,6 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </item>
     </layout>
@@ -772,8 +695,6 @@
   <tabstop>month_dropdown</tabstop>
   <tabstop>year_edit</tabstop>
   <tabstop>next_month</tabstop>
-  <tabstop>rating_dropdown</tabstop>
-  <tabstop>special_box</tabstop>
   <tabstop>entry_edit</tabstop>
   <tabstop>update_button</tabstop>
   <tabstop>delete_button</tabstop>
diff --git a/src/gui/diaryentryviewer.cpp b/src/gui/diaryentryviewer.cpp
index ef85463..d602f26 100644
--- a/src/gui/diaryentryviewer.cpp
+++ b/src/gui/diaryentryviewer.cpp
@@ -64,7 +64,6 @@ DiaryEntryViewer::DiaryEntryViewer(QWidget *parent) : QWidget(parent), ui(new Ui
         Qt::QueuedConnection);
     connect(InternalManager::instance(), &InternalManager::update_theme, this, &DiaryEntryViewer::update_theme,
         Qt::QueuedConnection);
-    update_theme();
 
     // current_date is initialised by &InternalManager::change_month signal.
 }
@@ -122,6 +121,11 @@ void DiaryEntryViewer::change_month(QDate const &date)
                 .arg(generate_base64_icon(i.first, rating, important),
                     last_edited.toString("dddd MMMM d%1 yyyy 'at' h:mm:ss ap").arg(misc::get_day_suffix(i.first)),
                     misc::sanitise_html(misc::trim(copy))));
+        //        html.append(
+        //            QString(SINGLE_ROW)
+        //                .arg(generate_base64_icon(i.first, rating, important),
+        //                    last_edited.toString("dddd MMMM d%1 yyyy 'at' h:mm:ss
+        //                    ap").arg(misc::get_day_suffix(i.first)), "PLACEHOLDER"));
         html.append(HR_ROW);
 
         ++row_counter;
@@ -202,8 +206,8 @@ QPixmap DiaryEntryViewer::generate_background(td::Rating const rating)
         QPainter p(&pixmap);
         p.setRenderHint(QPainter::Antialiasing);
 
-        if (InternalManager::instance()->get_theme() == td::Theme::Light)
-            p.setOpacity(0.8);
+        //        if (InternalManager::instance()->get_theme() == td::Theme::Light)
+        //            p.setOpacity(0.8);
 
         p.setPen(Qt::transparent);
         p.setBrush(QBrush(colour));
diff --git a/src/gui/diarypixels.cpp b/src/gui/diarypixels.cpp
index 4d5228e..a35a84f 100644
--- a/src/gui/diarypixels.cpp
+++ b/src/gui/diarypixels.cpp
@@ -29,13 +29,13 @@ int const LABEL_SIZE = 36;
 DiaryPixels::DiaryPixels(QWidget *parent) : QWidget(parent), ui(new Ui::DiaryPixels)
 {
     ui->setupUi(this);
+    setup_grid();
     ui->year_edit->setDate(QDate::currentDate());
 
     connect(InternalManager::instance(), &InternalManager::update_data, this, &DiaryPixels::render_grid,
         Qt::QueuedConnection);
-    connect(ui->render_button, &QPushButton::clicked, this, &DiaryPixels::render_button_clicked, Qt::QueuedConnection);
+    connect(ui->year_edit, &QDateEdit::dateChanged, this, &DiaryPixels::render_grid, Qt::QueuedConnection);
     connect(ui->export_img_button, &QPushButton::clicked, this, &DiaryPixels::export_image, Qt::QueuedConnection);
-
     // current_date is initialised by &InternalManager::change_month signal.
 }
 
@@ -84,34 +84,12 @@ void DiaryPixels::render_button_clicked()
     render_grid(ui->year_edit->date());
 }
 
-void DiaryPixels::render_grid(QDate const &new_date)
+void DiaryPixels::setup_grid()
 {
-    // Remove everything from current grid.
-    QLayoutItem *child;
-    while ((child = ui->grid->takeAt(0)) != 0) {
-        delete child->widget();
-        delete child;
-    }
-
-    current_date = new_date;
-    auto const &opt = DiaryHolder::instance()->get_yearmap(current_date);
-
-    // Set new grid.
-    if (!opt) {
-        auto label = new QLabel("It seems there are no entries yet for this year...", this);
-        auto f = label->font();
-        f.setPointSize(11);
-        label->setFont(f);
-
-        return ui->grid->addWidget(label, 0, 0, 1, 1, Qt::AlignCenter);
-    }
-
-    auto &&tmp_date = QDate::currentDate();
-    auto const year = current_date.year();
     auto const size = calculate_size();
 
-    for (int month = 0; month < 12; ++month) {
-        auto label = new QLabel(QString(MONTH_LETTERS[month]), this);
+    for (int month = 1; month < 13; ++month) {
+        auto label = new QLabel(QString(MONTH_LETTERS[month - 1]), this);
         QFont f = label->font();
         f.setPointSize(14);
         f.setBold(true);
@@ -119,51 +97,84 @@ void DiaryPixels::render_grid(QDate const &new_date)
         label->setFixedHeight(LABEL_SIZE);
         label->setFixedWidth(LABEL_SIZE);
         label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-        ui->grid->addWidget(label, month, 0);
+        ui->grid->addWidget(label, month - 1, 0);
 
-        int days = QDate(current_date.year(), month + 1, 1).daysInMonth();
+        for (int day = 1; day < 32; ++day) {
+            auto ptr = new DiaryPixelLabel(td::Rating::Unknown, false, month, day, size, this);
+            connect(this, &DiaryPixels::sig_changed_size, ptr, &DiaryPixelLabel::resize, Qt::QueuedConnection);
 
-        // This block runs if the month doesn't exist at all.
-        auto const &monthmap = (*opt)->second;
-        auto const &iter = monthmap.find(month + 1 /* Month is index 1 based */);
-        if (iter == monthmap.end()) {
-            for (int day = 0; day < days; ++day) {
-                tmp_date.setDate(year, month + 1, day + 1);
+            ui->grid->addWidget(ptr, month - 1, day);
+        }
+    }
 
-                auto ptr = new DiaryPixelLabel(td::Rating::Unknown, false, tmp_date, size, this);
-                connect(this, &DiaryPixels::sig_changed_size, ptr, &DiaryPixelLabel::resize, Qt::QueuedConnection);
+    qDebug() << "Rendered pixel grid.";
+}
 
-                ui->grid->addWidget(
-                    ptr, month, day + 1 /* +1 here because of the month label added at the start of each row */);
-            }
+void DiaryPixels::render_grid(QDate const &new_date)
+{
+    current_date = new_date;
+    ui->year_edit->blockSignals(true);
+    ui->year_edit->setDate(new_date);
+    ui->year_edit->blockSignals(false);
+    auto const &opt = DiaryHolder::instance()->get_yearmap(current_date);
 
-            continue;
-        }
+    for (int month = 1; month < 13; ++month) {
+        int days = QDate(current_date.year(), month, 1).daysInMonth();
 
-        // This code runs if some/all dates in a month exist.
-        for (int day = 0; day < days; ++day) {
-            auto const &entrymap = iter->second;
-            auto const &iter2 = entrymap.find(day + 1 /* day is index 1 based */);
+        auto placeholder = [this, month, days]() {
+            for (int day = 1; day < 32; ++day) {
+                auto pixel = qobject_cast<DiaryPixelLabel *>(ui->grid->itemAtPosition(month - 1, day)->widget());
 
-            tmp_date.setDate(year, month + 1, day + 1);
-            if (iter2 == entrymap.end()) {
-                auto ptr = new DiaryPixelLabel(td::Rating::Unknown, false, tmp_date, size, this);
-                connect(this, &DiaryPixels::sig_changed_size, ptr, &DiaryPixelLabel::resize, Qt::QueuedConnection);
+                if (day > days)
+                    pixel->setVisible(false);
+                else
+                    pixel->setVisible(true);
 
-                ui->grid->addWidget(ptr, month, day + 1);
+                pixel->rating = td::Rating::Unknown;
+                pixel->special = false;
+                pixel->update();
             }
-            else {
-                auto const &[important, rating, dummy, d2] = iter2->second;
+        };
 
-                auto ptr = new DiaryPixelLabel(rating, important, tmp_date, size, this);
-                connect(this, &DiaryPixels::sig_changed_size, ptr, &DiaryPixelLabel::resize, Qt::QueuedConnection);
+        if (opt) {
+            auto const &monthmap = (*opt)->second;
+            auto const &iter = monthmap.find(month);
 
-                ui->grid->addWidget(ptr, month, day + 1);
+            if (iter == monthmap.end()) {
+                placeholder();
             }
+            else {
+                auto const &entrymap = iter->second;
+
+                for (int day = 1; day < 32; ++day) {
+                    auto pixel = qobject_cast<DiaryPixelLabel *>(ui->grid->itemAtPosition(month - 1, day)->widget());
+                    auto const &iter2 = entrymap.find(day);
+
+                    if (day > days)
+                        pixel->setVisible(false);
+                    else
+                        pixel->setVisible(true);
+
+                    if (iter2 == entrymap.end()) {
+                        pixel->rating = td::Rating::Unknown;
+                        pixel->special = false;
+                    }
+                    else {
+                        auto const &[important, rating, dummy, d2] = iter2->second;
+                        pixel->rating = rating;
+                        pixel->special = important;
+                    }
+
+                    pixel->update();
+                }
+            }
+        }
+        else {
+            placeholder();
         }
     }
 
-    qDebug() << "Rendered pixels grid" << current_date;
+    qDebug() << "Updated pixels grid" << current_date;
 }
 
 void DiaryPixels::export_image()
diff --git a/src/gui/diarypixels.h b/src/gui/diarypixels.h
index 23a4eb9..e565603 100644
--- a/src/gui/diarypixels.h
+++ b/src/gui/diarypixels.h
@@ -39,6 +39,7 @@ class DiaryPixels : public QWidget {
     ~DiaryPixels();
 
     void resizeEvent(QResizeEvent *);
+    void setup_grid();
     int calculate_size();
 
     QDate current_date;
diff --git a/src/gui/diarypixels.ui b/src/gui/diarypixels.ui
index 8e6535a..f596de0 100644
--- a/src/gui/diarypixels.ui
+++ b/src/gui/diarypixels.ui
@@ -64,6 +64,19 @@
      <property name="verticalSpacing">
       <number>0</number>
      </property>
+     <item row="0" column="4">
+      <spacer name="horizontalSpacer">
+       <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 row="0" column="1">
       <widget class="QDateEdit" name="year_edit">
        <property name="font">
@@ -79,20 +92,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="5">
-      <spacer name="horizontalSpacer">
-       <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 row="0" column="3">
+     <item row="0" column="2">
       <widget class="QPushButton" name="export_img_button">
        <property name="toolTip">
         <string>Export the diary pixel grid.</string>
@@ -102,19 +102,6 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2" alignment="Qt::AlignHCenter">
-      <widget class="QPushButton" name="render_button">
-       <property name="toolTip">
-        <string>Re-render the pixel grid.</string>
-       </property>
-       <property name="text">
-        <string>Render</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
@@ -128,7 +115,7 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="4">
+     <item row="0" column="3">
       <widget class="QCheckBox" name="add_year_checkbox">
        <property name="toolTip">
         <string>Whether or not to add the current year as text above the exported image.</string>
@@ -144,7 +131,6 @@
  </widget>
  <tabstops>
   <tabstop>year_edit</tabstop>
-  <tabstop>render_button</tabstop>
   <tabstop>export_img_button</tabstop>
  </tabstops>
  <resources/>
diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui
index fe5d3f5..2185aab 100644
--- a/src/gui/mainmenu.ui
+++ b/src/gui/mainmenu.ui
@@ -20,43 +20,121 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="7" column="1">
-    <spacer name="verticalSpacer_4">
+   <item row="0" column="0">
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>9</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>30</height>
-      </size>
+   <item row="1" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="spacing">
+      <number>0</number>
      </property>
-    </spacer>
+     <item row="0" column="1">
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>150</width>
+         <height>150</height>
+        </size>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>1</width>
+         <height>1</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../../images/images.qrc">:/linux_icons/scalable/theoreticaldiary.svg</pixmap>
+       </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <spacer name="horizontalSpacer_5">
+       <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 row="0" column="2">
+      <layout class="QGridLayout" name="gridLayout_4">
+       <property name="horizontalSpacing">
+        <number>0</number>
+       </property>
+       <property name="verticalSpacing">
+        <number>10</number>
+       </property>
+       <item row="0" column="0" alignment="Qt::AlignLeft|Qt::AlignBottom">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Welcome back to</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" alignment="Qt::AlignLeft|Qt::AlignVCenter">
+        <widget class="QLabel" name="app_name">
+         <property name="font">
+          <font>
+           <pointsize>36</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>&lt;b&gt;Theoretical Diary&lt;/b&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
+        <widget class="QLabel" name="version">
+         <property name="text">
+          <string>Version placeholder</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="0">
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="1">
-    <spacer name="verticalSpacer_5">
+   <item row="5" column="0">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -68,11 +146,114 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="1">
+   <item row="4" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout_7">
+     <property name="horizontalSpacing">
+      <number>8</number>
+     </property>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="options_button">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Open the settings menu.</string>
+       </property>
+       <property name="text">
+        <string>Settings</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="quit_button">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Exit the application.</string>
+       </property>
+       <property name="text">
+        <string>Quit</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <spacer name="horizontalSpacer_3">
+       <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 row="0" column="0">
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" rowspan="2" colspan="2">
     <layout class="QGridLayout" name="gridLayout_6">
      <property name="spacing">
       <number>0</number>
      </property>
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer">
+       <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 row="0" column="1">
+      <widget class="QLabel" name="label_2">
+       <property name="font">
+        <font>
+         <pointsize>16</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>&lt;b&gt;Open diary&lt;/b&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <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 row="1" column="1">
       <widget class="QGroupBox" name="groupBox">
        <property name="minimumSize">
@@ -143,8 +324,8 @@
           <property name="topMargin">
            <number>0</number>
           </property>
-          <property name="spacing">
-           <number>6</number>
+          <property name="horizontalSpacing">
+           <number>8</number>
           </property>
           <item row="0" column="0">
            <widget class="QPushButton" name="decrypt_button">
@@ -215,214 +396,8 @@
        </layout>
       </widget>
      </item>
-     <item row="0" column="2">
-      <spacer name="horizontalSpacer">
-       <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 row="0" column="1">
-      <widget class="QLabel" name="label_2">
-       <property name="font">
-        <font>
-         <pointsize>16</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>&lt;b&gt;Open diary&lt;/b&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <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>
     </layout>
    </item>
-   <item row="8" column="1" alignment="Qt::AlignHCenter|Qt::AlignTop">
-    <widget class="QFrame" name="frame3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_11">
-      <item row="0" column="2" alignment="Qt::AlignRight">
-       <widget class="QPushButton" name="options_button">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Open the settings menu.</string>
-        </property>
-        <property name="text">
-         <string>Settings</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" alignment="Qt::AlignLeft">
-       <widget class="QPushButton" name="quit_button">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Exit the application.</string>
-        </property>
-        <property name="text">
-         <string>Quit</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="1" alignment="Qt::AlignHCenter|Qt::AlignBottom">
-    <widget class="QFrame" name="frame1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>150</width>
-          <height>150</height>
-         </size>
-        </property>
-        <property name="sizeIncrement">
-         <size>
-          <width>1</width>
-          <height>1</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../../images/images.qrc">:/linux_icons/scalable/theoreticaldiary.svg</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <layout class="QGridLayout" name="gridLayout_4">
-        <property name="horizontalSpacing">
-         <number>0</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>10</number>
-        </property>
-        <item row="4" column="0">
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="2" column="0" alignment="Qt::AlignLeft|Qt::AlignVCenter">
-         <widget class="QLabel" name="app_name">
-          <property name="font">
-           <font>
-            <pointsize>36</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>&lt;b&gt;Theoretical Diary&lt;/b&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0" alignment="Qt::AlignLeft|Qt::AlignVCenter">
-         <widget class="QLabel" name="version">
-          <property name="text">
-           <string>Version placeholder</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="0" alignment="Qt::AlignLeft">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Welcome back to</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="9" column="1">
-    <spacer name="verticalSpacer_6">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -441,8 +416,6 @@
   <tabstop>decrypt_button</tabstop>
   <tabstop>new_button</tabstop>
   <tabstop>import_button</tabstop>
-  <tabstop>options_button</tabstop>
-  <tabstop>quit_button</tabstop>
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 5a31456..070fd87 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -209,9 +209,7 @@ void MainWindow::lock_diary()
         return;
     }
 
-    emit sig_update_diary();
-    if (InternalManager::instance()->internal_diary_changed)
-        DiaryHolder::instance()->save(); // Ignore any errors.
+    emit sig_update_diary(true);
 
     qDebug() << "Locking diary.";
     exit_diary_to_main_menu(true);
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 02781f0..0163bf6 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -31,7 +31,7 @@ class MainWindow : public QMainWindow {
     Q_OBJECT
 
 signals:
-    void sig_update_diary();
+    void sig_update_diary(bool const);
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
diff --git a/src/gui/optionsmenu.ui b/src/gui/optionsmenu.ui
index 03a20b1..aa656e2 100644
--- a/src/gui/optionsmenu.ui
+++ b/src/gui/optionsmenu.ui
@@ -64,7 +64,7 @@
       <number>0</number>
      </property>
      <property name="horizontalSpacing">
-      <number>10</number>
+      <number>8</number>
      </property>
      <item row="0" column="0">
       <spacer name="horizontalSpacer_10">
diff --git a/src/util/diarycalendarbutton.h b/src/util/diarycalendarbutton.h
index bfec597..3760097 100644
--- a/src/util/diarycalendarbutton.h
+++ b/src/util/diarycalendarbutton.h
@@ -49,8 +49,6 @@ class DiaryCalendarButton : public QAbstractButton {
         setFixedSize(QSize(override::SIZE, override::SIZE));
         data = d;
         mouse_down = false;
-
-        update();
     }
 
     ~DiaryCalendarButton() {}
@@ -59,8 +57,11 @@ class DiaryCalendarButton : public QAbstractButton {
     bool mouse_down;
 
 public slots:
-    void re_render(td::CalendarButtonData const &d)
+    void render(td::CalendarButtonData const &d)
     {
+        if (d.day)
+            data.day = d.day;
+
         if (d.important)
             data.important = d.important;
 
@@ -70,6 +71,9 @@ public slots:
         if (d.selected)
             data.selected = d.selected;
 
+        if (d.current_day)
+            data.current_day = d.current_day;
+
         update();
     }
 
@@ -135,8 +139,8 @@ public slots:
             path.addRoundedRect(
                 QRect(topleft_offset, topleft_offset, adjusted_size, adjusted_size), ROUNDNESS, ROUNDNESS);
 
-            if (InternalManager::instance()->get_theme() == td::Theme::Light)
-                p.setOpacity(0.8);
+            //            if (InternalManager::instance()->get_theme() == td::Theme::Light)
+            //                p.setOpacity(0.8);
 
             // Set background color.
             QColor color = misc::rating_to_colour(*data.rating);
diff --git a/src/util/diarycomparisonlabel.h b/src/util/diarycomparisonlabel.h
index 8929045..07def02 100644
--- a/src/util/diarycomparisonlabel.h
+++ b/src/util/diarycomparisonlabel.h
@@ -96,8 +96,8 @@ class DiaryComparisonLabel : public QLabel {
             QPainter p(&bkg);
             p.setRenderHint(QPainter::Antialiasing);
 
-            if (InternalManager::instance()->get_theme() == td::Theme::Light)
-                p.setOpacity(0.8);
+            //            if (InternalManager::instance()->get_theme() == td::Theme::Light)
+            //                p.setOpacity(0.8);
 
             p.setPen(bkg_color);
             p.setBrush(QBrush(bkg_color));
diff --git a/src/util/diarypixellabel.h b/src/util/diarypixellabel.h
index c9ffc88..0ad4caf 100644
--- a/src/util/diarypixellabel.h
+++ b/src/util/diarypixellabel.h
@@ -24,12 +24,17 @@
 #include "../core/internalmanager.h"
 #include "misc.h"
 
+namespace override {
+static char const *MONTHS[] = {"January", "February", "March", "April", "May", "June", "July", "August", "September",
+    "October", "November", "December"};
+}
+
 class DiaryPixelLabel : public QLabel {
     Q_OBJECT
 
 public:
     explicit DiaryPixelLabel(
-        td::Rating const r, bool const s, QDate const &date, int const size, QWidget *parent = nullptr)
+        td::Rating const r, bool const s, int const month, int const day, int const size, QWidget *parent = nullptr)
         : QLabel(parent)
     {
         special = s;
@@ -38,8 +43,8 @@ class DiaryPixelLabel : public QLabel {
         setFixedHeight(size);
         setFixedWidth(size);
 
-        setToolTip(QString("%1 %2%3").arg(
-            date.toString("MMMM"), QString::number(date.day()), misc::get_day_suffix(date.day())));
+        setToolTip(
+            QString("%1 %2%3").arg(override::MONTHS[month - 1], QString::number(day), misc::get_day_suffix(day)));
     }
 
     ~DiaryPixelLabel() {}
@@ -92,8 +97,8 @@ public slots:
         QPainter p(&bkg);
         p.setRenderHint(QPainter::Antialiasing);
 
-        if (InternalManager::instance()->get_theme() == td::Theme::Light)
-            p.setOpacity(0.8);
+        //        if (InternalManager::instance()->get_theme() == td::Theme::Light)
+        //            p.setOpacity(0.8);
 
         p.setPen(bkg_colour);
         p.setBrush(QBrush(bkg_colour));
diff --git a/src/util/misc.cpp b/src/util/misc.cpp
index c2c7795..e17afd7 100644
--- a/src/util/misc.cpp
+++ b/src/util/misc.cpp
@@ -131,10 +131,10 @@ td::Theme rating_to_theme(const td::Rating rating)
     case td::Rating::VeryBad:
     case td::Rating::Bad:
     case td::Rating::Ok:
-        return td::Theme::Light;
     case td::Rating::Good:
-    case td::Rating::VeryGood:
         return td::Theme::Dark;
+    case td::Rating::VeryGood:
+        return td::Theme::Light;
     }
 
     // This can never happen, it's only here to shut down the compiler warning.
diff --git a/text/VERSION.txt b/text/VERSION.txt
index 53c4a94..bc4abe8 100644
--- a/text/VERSION.txt
+++ b/text/VERSION.txt
@@ -1 +1 @@
-2.3.67
+2.3.8