diff --git a/src/components/codeHighlight.ts b/src/components/codeHighlight.ts
index 3cb8fb6..6ab683a 100644
--- a/src/components/codeHighlight.ts
+++ b/src/components/codeHighlight.ts
@@ -34,7 +34,7 @@ export function getCodeHighlightStyles(): string {
       border-radius: 6px;
       padding: 12px;
       overflow-x: auto;
-      margin: 12px 0;
+      margin: 52px 0 12px 0;
       position: relative;
       white-space: pre;
     }
diff --git a/src/views/messageStyles.ts b/src/views/messageStyles.ts
index 19b5e6c..aad9372 100644
--- a/src/views/messageStyles.ts
+++ b/src/views/messageStyles.ts
@@ -553,7 +553,7 @@ export function getMessageAreaStyles(): string {
       }
       .segment-question .question-option {
         padding: 8px 16px;
-        background: #3d3f41;
+        background: var(--vscode-textBlockQuote-background);
         color: var(--vscode-foreground);
         border: 1px solid #474747;
         border-radius: 6px;
@@ -563,13 +563,13 @@ export function getMessageAreaStyles(): string {
         letter-spacing: 0.5px;
       }
       .segment-question .question-option:hover {
-        background: #005a9e;
-        border-color: #005a9e;
+        background: var(--vscode-button-hoverBackground);
+        border-color: var(--vscode-button-hoverBackground);
       }
       .segment-question .question-option.selected {
-        background: #007ACC;
-        color: #ffffff;
-        border-color: #007ACC;
+        background: var(--vscode-button-background);
+        color: var(--vscode-button-foreground);
+        border-color: var(--vscode-button-background);
       }
       .segment-question.answered .question-option:not(.selected) {
         opacity: 0.5;