diff --git a/stylesheets/_avatar.scss b/stylesheets/_avatar.scss
index 8ca4873f8..743cb203e 100644
--- a/stylesheets/_avatar.scss
+++ b/stylesheets/_avatar.scss
@@ -9,8 +9,7 @@
   img {
     object-fit: cover;
     border-radius: 50%;
-    // TODO Theming update
-    border: 1px solid var(--color-avatar-border-color);
+    border: 1px solid var(--avatar-border-color);
   }
 }
 
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index b74995e93..12539b210 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -18,21 +18,6 @@
   }
 }
 
-@keyframes pulseLight {
-  0% {
-    box-shadow: 0px 0px 0px 0px var(--danger-color);
-  }
-
-  // TODO Theming - Needs fixing
-  50% {
-    box-shadow: 0px 0px 12px 0px rgba(var(--color-destructive-alt-rgb), 1);
-  }
-
-  100% {
-    box-shadow: 0px 0px 0px 0px rgba(var(--color-destructive-alt-rgb), 1);
-  }
-}
-
 .conversation-item__options-pane {
   position: absolute;
   height: 100%;
diff --git a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
index c51fe3412..dee98804c 100644
--- a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
@@ -21,7 +21,7 @@ const sha512FromPubkey = async (pubkey: string): Promise<string> => {
 // key is the pubkey, value is the hash
 const cachedHashes = new Map<string, number>();
 
-const avatarPlaceholderColors = Object.values(COLORS.PRIMARY);
+const avatarPlaceholderColors: Array<string> = Object.values(COLORS.PRIMARY);
 
 function useHashBasedOnPubkey(pubkey: string) {
   const [hash, setHash] = useState<number | undefined>(undefined);
@@ -80,7 +80,6 @@ export const AvatarPlaceHolder = (props: Props) => {
 
   if (loading || !hash) {
     // return grey circle
-    // TODO Theming update
     return (
       <svg viewBox={viewBox}>
         <g id="UrTavla">
@@ -90,7 +89,7 @@ export const AvatarPlaceHolder = (props: Props) => {
             r={rWithoutBorder}
             fill="#d2d2d3"
             shapeRendering="geometricPrecision"
-            stroke={'var(--color-avatar-border-color)'}
+            stroke={'var(--avatar-border-color)'}
             strokeWidth="1"
           />
         </g>
@@ -106,7 +105,6 @@ export const AvatarPlaceHolder = (props: Props) => {
 
   const bgColor = avatarPlaceholderColors[bgColorIndex];
 
-  // TODO Theming Update
   return (
     <svg viewBox={viewBox}>
       <g id="UrTavla">
@@ -116,7 +114,7 @@ export const AvatarPlaceHolder = (props: Props) => {
           r={rWithoutBorder}
           fill={bgColor}
           shapeRendering="geometricPrecision"
-          stroke={'var(--color-avatar-border-color)'}
+          stroke={'var(--avatar-border-color)'}
           strokeWidth="1"
         />
         <text