diff --git a/daily.cpp b/daily.cpp
index 96879cdf..ed55ca16 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -471,12 +471,21 @@ void Daily::UpdateCalendarDay(QDate date)
     QTextCharFormat bold;
     QTextCharFormat cpapcol;
     QTextCharFormat normal;
+    QTextCharFormat oxiday;
     bold.setFontWeight(QFont::Bold);
     cpapcol.setForeground(QBrush(Qt::blue, Qt::SolidPattern));
     cpapcol.setFontWeight(QFont::Bold);
+    oxiday.setForeground(QBrush(Qt::red, Qt::SolidPattern));
+    oxiday.setFontWeight(QFont::Bold);
+    bool hascpap=profile->GetDay(date,MT_CPAP)!=NULL;
+    bool hasoxi=profile->GetDay(date,MT_OXIMETER)!=NULL;
 
-    if (profile->GetDay(date,MT_CPAP)) {
-        ui->calendar->setDateTextFormat(date,cpapcol);
+    if (hascpap) {
+        if (hasoxi) {
+            ui->calendar->setDateTextFormat(date,oxiday);
+        } else {
+            ui->calendar->setDateTextFormat(date,cpapcol);
+        }
     } else if (profile->GetDay(date)) {
         ui->calendar->setDateTextFormat(date,bold);
     } else {
diff --git a/mainwindow.ui b/mainwindow.ui
index 4c9afe98..b39aa9d5 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -589,6 +589,9 @@
    <property name="text">
     <string>&amp;Import Data</string>
    </property>
+   <property name="shortcut">
+    <string>Shift+F2</string>
+   </property>
   </action>
   <action name="action_Preferences">
    <property name="text">
@@ -609,16 +612,25 @@
    <property name="text">
     <string>View &amp;Daily</string>
    </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
   </action>
   <action name="actionView_Overview">
    <property name="text">
     <string>View &amp;Overview</string>
    </property>
+   <property name="shortcut">
+    <string>F6</string>
+   </property>
   </action>
   <action name="actionView_Welcome">
    <property name="text">
     <string>View &amp;Welcome</string>
    </property>
+   <property name="shortcut">
+    <string>F4</string>
+   </property>
   </action>
   <action name="action_2">
    <property name="text">
@@ -653,6 +665,9 @@
    <property name="text">
     <string>&amp;Fullscreen Toggle</string>
    </property>
+   <property name="shortcut">
+    <string>F11</string>
+   </property>
   </action>
   <action name="action_Noon_Date_Split">
    <property name="checkable">