diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 2a94f7d..11f55ed 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -4,7 +4,7 @@ on:
     branches: [ "main" ]
 env:
   upstream_version: v0.10.3
-  etke_version: etke11
+  etke_version: etke12
   bunny_version: v0.1.0
   base_path: ./
 permissions:
diff --git a/README.md b/README.md
index 43de180..b0d6339 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ The following changes are already implemented:
 * [Display actual Synapse errors](https://github.com/etkecc/synapse-admin/pull/17)
 * [Fix base_url being undefined on unsuccessful login](https://github.com/etkecc/synapse-admin/pull/18)
 * [Put the version into manifest.json](https://github.com/Awesome-Technologies/synapse-admin/issues/507) (CI only)
+* [Federation page improvements](https://github.com/Awesome-Technologies/synapse-admin/pull/583) (using theme colors)
 
 _the list will be updated as new changes are added_
 
diff --git a/src/resources/destinations.tsx b/src/resources/destinations.tsx
index 8737e46..8790169 100644
--- a/src/resources/destinations.tsx
+++ b/src/resources/destinations.tsx
@@ -27,14 +27,19 @@ import {
   useNotify,
   useRefresh,
   useTranslate,
+  DateFieldProps,
 } from "react-admin";
 
 import { DATE_FORMAT } from "../components/date";
+import { get } from "lodash";
 
 const DestinationPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;
 
 const destinationRowSx = (record: RaRecord) => ({
-  backgroundColor: record.retry_last_ts > 0 ? "#ffcccc" : "white",
+  backgroundColor: record.retry_last_ts > 0 ? "warning.light" : "primary.contrastText",
+  "& .MuiButtonBase-root": {
+    color: "primary.dark",
+  },
 });
 
 const destinationFilters = [<SearchInput source="destination" alwaysOn />];
@@ -92,6 +97,14 @@ const DestinationTitle = () => {
   );
 };
 
+const RetryDateField = (props: DateFieldProps) => {
+  const record = useRecordContext(props);
+  if (props.source && get(record, props.source) === 0) {
+    return <DateField {...props} record={{ ...record, [props.source]: null }} />;
+  }
+  return <DateField {...props} />;
+};
+
 export const DestinationList = (props: ListProps) => {
   return (
     <List
@@ -103,7 +116,7 @@ export const DestinationList = (props: ListProps) => {
       <Datagrid rowSx={destinationRowSx} rowClick={id => `${id}/show/rooms`} bulkActionButtons={false}>
         <TextField source="destination" />
         <DateField source="failure_ts" showTime options={DATE_FORMAT} />
-        <DateField source="retry_last_ts" showTime options={DATE_FORMAT} />
+        <RetryDateField source="retry_last_ts" showTime options={DATE_FORMAT} />
         <TextField source="retry_interval" />
         <TextField source="last_successful_stream_ordering" />
         <DestinationReconnectButton />