diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts
index 25dfe3b2..879e3626 100644
--- a/src/app/landing-page/schedule/schedule.component.ts
+++ b/src/app/landing-page/schedule/schedule.component.ts
@@ -85,11 +85,23 @@ export class ScheduleComponent implements OnInit, OnChanges {
     })
 
     tempSchedule.forEach(day => {
-      day.sessions.Workshop.all.sort((a, b) => {
-        a.date < b.date
+      day.sessions.Keynote.sort(function(a, b) {
+        if (a.date <= b.date) return -1;
+        else return 1;
       })
-      day.sessions.Presentation.all.sort((a, b) => {
-        a.date < b.date
+
+      day.sessions.Workshop.all.sort(function(a, b) {
+        if (a.date < b.date) return -1;
+        if (a.date > b.date) return 1;
+        // Dates are equal, sort by place
+        return a.place.localeCompare(b.place);
+      })
+
+      day.sessions.Presentation.all.sort(function(a, b) {
+        if (a.date < b.date) return -1;
+        if (a.date > b.date) return 1;
+        // Dates are equal, sort by place
+        return a.place.localeCompare(b.place);
       })
     })
 
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index e209e869..67845a34 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -18,6 +18,13 @@ export const environment = {
     '23-sinfo-conf': '23-sinfo'
   },
   themes: {
+    '31': [
+      'Software Engineering',
+      'Multimedia',
+      'AI',
+      'Games',
+      'Tech Insights'
+    ],
     '30-sinfo': [
       'Software Engineering',
       'Multimedia',
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 7d4aa1bf..7ed686b3 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -18,6 +18,13 @@ export const environment = {
     '23-sinfo-conf': '23-sinfo'
   },
   themes: {
+    '31': [
+      'Software Engineering',
+      'Multimedia',
+      'AI',
+      'Games',
+      'Tech Insights'
+    ],
     '30-sinfo': [
       'Software Engineering',
       'Multimedia',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 90f0dbd1..4bb46f27 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -21,6 +21,13 @@ export const environment = {
     '23-sinfo-conf': '23-sinfo'
   },
   themes: {
+    '31': [
+      'Software Engineering',
+      'Multimedia',
+      'AI',
+      'Games',
+      'Tech Insights'
+    ],
     '30-sinfo': [
       'Software Engineering',
       'Multimedia',