diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4769478ae150..33795925ca00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 8.0.0-rc.3
+
+### Important Changes
+
+- **feat(bun): Add Bun Global Unhandled Handlers (#11960)**
+
+The Bun SDK will now capture global unhandled errors.
+
+### Other Changes
+
+- feat(node): Log process and thread info on initialisation (#11972)
+- fix(aws-serverless): Include ESM artifacts in package (#11973)
+- fix(browser): Only start `http.client` spans if there is an active parent span (#11974)
+- fix(feedback): Improve CSS theme variable names and layout (#11964)
+- fix(node): Ensure `execArgv` are not sent to worker threads (#11963)
+- ref(feedback): Simplify feedback function params (#11957)
+
 ## 8.0.0-rc.2
 
 ### Important Changes
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-instrument.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-instrument.js
new file mode 100644
index 000000000000..0b39efcfd8db
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-instrument.js
@@ -0,0 +1,8 @@
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  includeLocalVariables: true,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-no-sentry.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-no-sentry.js
new file mode 100644
index 000000000000..08636175fa7b
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-no-sentry.js
@@ -0,0 +1,31 @@
+/* eslint-disable no-unused-vars */
+process.on('uncaughtException', () => {
+  // do nothing - this will prevent the Error below from closing this process
+});
+
+class Some {
+  two(name) {
+    throw new Error('Enough!');
+  }
+}
+
+function one(name) {
+  const arr = [1, '2', null];
+  const obj = {
+    name,
+    num: 5,
+  };
+  const bool = false;
+  const num = 0;
+  const str = '';
+  const something = undefined;
+  const somethingElse = null;
+
+  const ty = new Some();
+
+  ty.two(name);
+}
+
+setTimeout(() => {
+  one('some name');
+}, 1000);
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
index e2aa6c405773..61b9fc3064a4 100644
--- a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
@@ -59,6 +59,16 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
       .start(done);
   });
 
+  test('Should include local variables when instrumenting via --require', done => {
+    const requirePath = path.resolve(__dirname, 'local-variables-instrument.js');
+
+    createRunner(__dirname, 'local-variables-no-sentry.js')
+      .withFlags(`--require=${requirePath}`)
+      .ignore('session')
+      .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
+      .start(done);
+  });
+
   test('Should include local variables with ESM', done => {
     createRunner(__dirname, 'local-variables-caught.mjs')
       .ignore('session')
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index b3214c0c3d75..ad4b2163df3f 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -11,6 +11,7 @@
   },
   "files": [
     "cjs",
+    "esm",
     "types",
     "types-ts3.8",
     "import-hook.mjs",
diff --git a/packages/browser/src/tracing/request.ts b/packages/browser/src/tracing/request.ts
index 673cff9e5474..89b87ba6b757 100644
--- a/packages/browser/src/tracing/request.ts
+++ b/packages/browser/src/tracing/request.ts
@@ -7,6 +7,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SentryNonRecordingSpan,
+  getActiveSpan,
   getClient,
   getCurrentScope,
   getDynamicSamplingContextFromClient,
@@ -324,20 +325,23 @@ export function xhrCallback(
   const fullUrl = getFullURL(sentryXhrData.url);
   const host = fullUrl ? parseUrl(fullUrl).host : undefined;
 
-  const span = shouldCreateSpanResult
-    ? startInactiveSpan({
-        name: `${sentryXhrData.method} ${sentryXhrData.url}`,
-        attributes: {
-          type: 'xhr',
-          'http.method': sentryXhrData.method,
-          'http.url': fullUrl,
-          url: sentryXhrData.url,
-          'server.address': host,
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser',
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',
-        },
-      })
-    : new SentryNonRecordingSpan();
+  const hasParent = !!getActiveSpan();
+
+  const span =
+    shouldCreateSpanResult && hasParent
+      ? startInactiveSpan({
+          name: `${sentryXhrData.method} ${sentryXhrData.url}`,
+          attributes: {
+            type: 'xhr',
+            'http.method': sentryXhrData.method,
+            'http.url': fullUrl,
+            url: sentryXhrData.url,
+            'server.address': host,
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser',
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',
+          },
+        })
+      : new SentryNonRecordingSpan();
 
   xhr.__sentry_xhr_span_id__ = span.spanContext().spanId;
   spans[xhr.__sentry_xhr_span_id__] = span;
@@ -348,9 +352,10 @@ export function xhrCallback(
     addTracingHeadersToXhrRequest(
       xhr,
       client,
-      // If performance is disabled (TWP), we do not want to use the span as base for the trace headers,
+      // If performance is disabled (TWP) or there's no active root span (pageload/navigation/interaction),
+      // we do not want to use the span as base for the trace headers,
       // which means that the headers will be generated from the scope and the sampling decision is deferred
-      hasTracingEnabled() ? span : undefined,
+      hasTracingEnabled() && hasParent ? span : undefined,
     );
   }
 
diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
index e9aabf5dae79..f299c8119985 100644
--- a/packages/bun/src/sdk.ts
+++ b/packages/bun/src/sdk.ts
@@ -12,6 +12,8 @@ import {
   modulesIntegration,
   nativeNodeFetchIntegration,
   nodeContextIntegration,
+  onUncaughtExceptionIntegration,
+  onUnhandledRejectionIntegration,
 } from '@sentry/node';
 import type { Integration, Options } from '@sentry/types';
 
@@ -33,9 +35,9 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
     consoleIntegration(),
     httpIntegration(),
     nativeNodeFetchIntegration(),
-    // Global Handlers # TODO (waiting for https://github.com/oven-sh/bun/issues/5091)
-    // new NodeIntegrations.OnUncaughtException(),
-    // new NodeIntegrations.OnUnhandledRejection(),
+    // Global Handlers
+    onUncaughtExceptionIntegration(),
+    onUnhandledRejectionIntegration(),
     // Event Info
     contextLinesIntegration(),
     nodeContextIntegration(),
diff --git a/packages/core/src/fetch.ts b/packages/core/src/fetch.ts
index 9a8ff09f1f50..9b9d2ece836b 100644
--- a/packages/core/src/fetch.ts
+++ b/packages/core/src/fetch.ts
@@ -17,7 +17,7 @@ import {
 } from './tracing';
 import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
 import { hasTracingEnabled } from './utils/hasTracingEnabled';
-import { spanToTraceHeader } from './utils/spanUtils';
+import { getActiveSpan, spanToTraceHeader } from './utils/spanUtils';
 
 type PolymorphicRequestHeaders =
   | Record<string, string | undefined>
@@ -70,20 +70,23 @@ export function instrumentFetchRequest(
   const fullUrl = getFullURL(url);
   const host = fullUrl ? parseUrl(fullUrl).host : undefined;
 
-  const span = shouldCreateSpanResult
-    ? startInactiveSpan({
-        name: `${method} ${url}`,
-        attributes: {
-          url,
-          type: 'fetch',
-          'http.method': method,
-          'http.url': fullUrl,
-          'server.address': host,
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: spanOrigin,
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',
-        },
-      })
-    : new SentryNonRecordingSpan();
+  const hasParent = !!getActiveSpan();
+
+  const span =
+    shouldCreateSpanResult && hasParent
+      ? startInactiveSpan({
+          name: `${method} ${url}`,
+          attributes: {
+            url,
+            type: 'fetch',
+            'http.method': method,
+            'http.url': fullUrl,
+            'server.address': host,
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: spanOrigin,
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',
+          },
+        })
+      : new SentryNonRecordingSpan();
 
   handlerData.fetchData.__span = span.spanContext().spanId;
   spans[span.spanContext().spanId] = span;
@@ -102,9 +105,10 @@ export function instrumentFetchRequest(
       client,
       scope,
       options,
-      // If performance is disabled (TWP), we do not want to use the span as base for the trace headers,
+      // If performance is disabled (TWP) or there's no active root span (pageload/navigation/interaction),
+      // we do not want to use the span as base for the trace headers,
       // which means that the headers will be generated from the scope and the sampling decision is deferred
-      hasTracingEnabled() ? span : undefined,
+      hasTracingEnabled() && hasParent ? span : undefined,
     );
   }
 
diff --git a/packages/feedback/src/constants/index.ts b/packages/feedback/src/constants/index.ts
index fe4683b5ee17..a8794ed663b0 100644
--- a/packages/feedback/src/constants/index.ts
+++ b/packages/feedback/src/constants/index.ts
@@ -9,9 +9,10 @@ export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
 export const DOCUMENT = WINDOW.document;
 export const NAVIGATOR = WINDOW.navigator;
 
-export const ACTOR_LABEL = 'Report a Bug';
+export const TRIGGER_LABEL = 'Report a Bug';
 export const CANCEL_BUTTON_LABEL = 'Cancel';
 export const SUBMIT_BUTTON_LABEL = 'Send Bug Report';
+export const CONFIRM_BUTTON_LABEL = 'Confirm';
 export const FORM_TITLE = 'Report a Bug';
 export const EMAIL_PLACEHOLDER = 'your.email@example.org';
 export const EMAIL_LABEL = 'Email';
@@ -20,7 +21,9 @@ export const MESSAGE_LABEL = 'Description';
 export const NAME_PLACEHOLDER = 'Your Name';
 export const NAME_LABEL = 'Name';
 export const SUCCESS_MESSAGE_TEXT = 'Thank you for your report!';
-export const IS_REQUIRED_TEXT = '(required)';
+export const IS_REQUIRED_LABEL = '(required)';
+export const ADD_SCREENSHOT_LABEL = 'Add a screenshot';
+export const REMOVE_SCREENSHOT_LABEL = 'Remove screenshot';
 
 export const FEEDBACK_WIDGET_SOURCE = 'widget';
 export const FEEDBACK_API_SOURCE = 'api';
diff --git a/packages/feedback/src/constants/theme.ts b/packages/feedback/src/constants/theme.ts
index 26398b74d1b2..ba8193afd9d0 100644
--- a/packages/feedback/src/constants/theme.ts
+++ b/packages/feedback/src/constants/theme.ts
@@ -1,44 +1,44 @@
-const LIGHT_BACKGROUND = '#ffffff';
 const INHERIT = 'inherit';
-const SUBMIT_COLOR = 'rgba(108, 95, 199, 1)';
+const PURPLE = 'rgba(88, 74, 192, 1)';
+const PURPLE_HOVER = 'rgba(108, 95, 199, 1)';
 
 export const LIGHT_THEME = {
-  fontFamily: "system-ui, 'Helvetica Neue', Arial, sans-serif",
-  fontSize: '14px',
-
   foreground: '#2b2233',
-  background: LIGHT_BACKGROUND,
-  success: '#268d75',
-  error: '#df3338',
-
-  zIndex: 100000,
+  successForeground: '#268d75',
+  errorForeground: '#df3338',
+  background: '#ffffff',
   border: '1.5px solid rgba(41, 35, 47, 0.13)',
   boxShadow: '0px 4px 24px 0px rgba(43, 34, 51, 0.12)',
 
-  backgroundHover: '#f6f6f7',
-  borderRadius: '25px',
-
-  formBorderRadius: '20px',
-  formContentBorderRadius: '6px',
-
-  submitForeground: LIGHT_BACKGROUND,
-  submitBackground: 'rgba(88, 74, 192, 1)',
-  submitForegroundHover: LIGHT_BACKGROUND,
-  submitBackgroundHover: SUBMIT_COLOR,
-  submitBorder: SUBMIT_COLOR,
+  inputForeground: INHERIT,
+  inputBackground: INHERIT,
+  inputBackgroundHover: INHERIT,
+  inputBackgroundFocus: INHERIT,
+  inputBorder: 'var(--border)',
+  inputBorderRadius: '6px',
+  inputOutlineFocus: PURPLE_HOVER,
+
+  buttonForeground: INHERIT,
+  buttonForegroundHover: INHERIT,
+  buttonBackground: 'var(--background)',
+  buttonBackgroundHover: '#f6f6f7',
+  buttonBorder: 'var(--border)',
+  buttonOutlineFocus: 'var(--input-outline-focus)',
+
+  submitForeground: '#ffffff',
+  submitForegroundHover: '#ffffff',
+  submitBackground: PURPLE,
+  submitBackgroundHover: PURPLE_HOVER,
+  submitBorder: PURPLE_HOVER,
+  submitBorderRadius: 'var(--button-border-radius)',
   submitOutlineFocus: '#29232f',
 
-  cancelForeground: 'var(--foreground)',
-  cancelBackground: 'transparent',
-  cancelForegroundHover: 'var(--foreground)',
-  cancelBackgroundHover: 'var(--background-hover)',
-  cancelBorder: 'var(--border)',
-  cancelOutlineFocus: 'var(--input-outline-focus)',
+  triggerBackground: 'var(--background)',
+  triggerBackgroundHover: 'var(--button-background-hover)',
+  triggerBorderRadius: '1.7em/50%',
 
-  inputBackground: INHERIT,
-  inputForeground: INHERIT,
-  inputBorder: 'var(--border)',
-  inputOutlineFocus: SUBMIT_COLOR,
+  dialogBackground: 'var(--background)',
+  dialogBorderRadius: '20px',
 };
 
 export const DEFAULT_THEME = {
@@ -46,12 +46,13 @@ export const DEFAULT_THEME = {
   dark: {
     ...LIGHT_THEME,
 
-    background: '#29232f',
-    backgroundHover: '#352f3b',
     foreground: '#ebe6ef',
-    border: '1.5px solid rgba(235, 230, 239, 0.15)',
+    successForeground: '#2da98c',
+    errorForeground: '#f55459',
+    background: '#29232f',
+    border: '1.5px solid rgba(235, 230, 239, 0.5)',
+    boxShadow: '0px 4px 24px 0px rgba(43, 34, 51, 0.12)',
 
-    success: '#2da98c',
-    error: '#f55459',
+    buttonBackgroundHover: '#352f3b',
   },
 };
diff --git a/packages/feedback/src/core/components/Actor.css.ts b/packages/feedback/src/core/components/Actor.css.ts
index ea80921b3744..3daa58d09a99 100644
--- a/packages/feedback/src/core/components/Actor.css.ts
+++ b/packages/feedback/src/core/components/Actor.css.ts
@@ -9,7 +9,7 @@ export function createActorStyles(): HTMLStyleElement {
 .widget__actor {
   position: fixed;
   z-index: var(--z-index);
-  margin: 0;
+  margin: var(--page-margin);
   inset: var(--actor-inset);
 
   display: flex;
@@ -20,14 +20,15 @@ export function createActorStyles(): HTMLStyleElement {
   font-family: inherit;
   font-size: var(--font-size);
   font-weight: 600;
-  line-height: 16px;
+  line-height: 1.14em;
   text-decoration: none;
 
-  background-color: var(--background);
-  border-radius: var(--border-radius);
+  background-color: var(--trigger-background);
+  border-radius: var(--trigger-border-radius);
   border: var(--border);
   box-shadow: var(--box-shadow);
   color: var(--foreground);
+  fill: var(--foreground);
   cursor: pointer;
   opacity: 1;
   transition: transform 0.2s ease-in-out;
@@ -41,12 +42,12 @@ export function createActorStyles(): HTMLStyleElement {
 }
 
 .widget__actor:hover {
-  background-color: var(--background-hover);
+  background-color: var(--trigger-background-hover);
 }
 
 .widget__actor svg {
-  width: 16px;
-  height: 16px;
+  width: 1.14em;
+  height: 1.14em;
 }
 
 @media (max-width: 600px) {
diff --git a/packages/feedback/src/core/components/Actor.ts b/packages/feedback/src/core/components/Actor.ts
index ac62fad4957e..6b2469e0313c 100644
--- a/packages/feedback/src/core/components/Actor.ts
+++ b/packages/feedback/src/core/components/Actor.ts
@@ -3,7 +3,7 @@ import { createActorStyles } from './Actor.css';
 import { FeedbackIcon } from './FeedbackIcon';
 
 export interface ActorProps {
-  buttonLabel: string;
+  triggerLabel: string;
   shadow: ShadowRoot;
 }
 
@@ -22,16 +22,16 @@ export interface ActorComponent {
 /**
  * The sentry-provided button to open the feedback modal
  */
-export function Actor({ buttonLabel, shadow }: ActorProps): ActorComponent {
+export function Actor({ triggerLabel, shadow }: ActorProps): ActorComponent {
   const el = DOCUMENT.createElement('button');
   el.type = 'button';
   el.className = 'widget__actor';
   el.ariaHidden = 'false';
-  el.ariaLabel = buttonLabel;
+  el.ariaLabel = triggerLabel;
   el.appendChild(FeedbackIcon());
-  if (buttonLabel) {
+  if (triggerLabel) {
     const label = DOCUMENT.createElement('span');
-    label.appendChild(DOCUMENT.createTextNode(buttonLabel));
+    label.appendChild(DOCUMENT.createTextNode(triggerLabel));
     el.appendChild(label);
   }
 
diff --git a/packages/feedback/src/core/createMainStyles.ts b/packages/feedback/src/core/createMainStyles.ts
index 92763cacdd93..b60bba37b6e3 100644
--- a/packages/feedback/src/core/createMainStyles.ts
+++ b/packages/feedback/src/core/createMainStyles.ts
@@ -3,73 +3,45 @@ import { DOCUMENT } from '../constants';
 
 function getThemedCssVariables(theme: FeedbackInternalOptions['themeLight']): string {
   return `
-  --background: ${theme.background};
-  --background-hover: ${theme.backgroundHover};
   --foreground: ${theme.foreground};
-  --error: ${theme.error};
-  --success: ${theme.success};
+  --success-foreground: ${theme.successForeground};
+  --error-foreground: ${theme.errorForeground};
+  --background: ${theme.background};
   --border: ${theme.border};
-  --border-radius: ${theme.borderRadius};
   --box-shadow: ${theme.boxShadow};
 
-  --submit-background: ${theme.submitBackground};
-  --submit-background-hover: ${theme.submitBackgroundHover};
-  --submit-border: ${theme.submitBorder};
-  --submit-outline-focus: ${theme.submitOutlineFocus};
-  --submit-foreground: ${theme.submitForeground};
-  --submit-foreground-hover: ${theme.submitForegroundHover};
-
-  --cancel-background: ${theme.cancelBackground};
-  --cancel-background-hover: ${theme.cancelBackgroundHover};
-  --cancel-border: ${theme.cancelBorder};
-  --cancel-outline-focus: ${theme.cancelOutlineFocus};
-  --cancel-foreground: ${theme.cancelForeground};
-  --cancel-foreground-hover: ${theme.cancelForegroundHover};
-
-  --input-background: ${theme.inputBackground};
-  --input-foreground: ${theme.inputForeground};
-  --input-border: ${theme.inputBorder};
-  --input-outline-focus: ${theme.inputOutlineFocus};
+  --button-foreground: ${theme.buttonForeground};
+  --button-foreground-hover: ${theme.buttonForegroundHover};
+  --button-background: ${theme.buttonBackground};
+  --button-background-hover: ${theme.buttonBackgroundHover};
+  --button-border: ${theme.buttonBorder};
+  --button-outline-focus: ${theme.buttonOutlineFocus};
 
-  --form-border-radius: ${theme.formBorderRadius};
-  --form-content-border-radius: ${theme.formContentBorderRadius};
+  --trigger-background: ${theme.triggerBackground};
+  --trigger-background-hover: ${theme.triggerBackgroundHover};
+  --trigger-border-radius: ${theme.triggerBorderRadius};
   `;
 }
 
 /**
  * Creates <style> element for widget actor (button that opens the dialog)
  */
-export function createMainStyles(
-  colorScheme: 'system' | 'dark' | 'light',
-  themes: Pick<FeedbackInternalOptions, 'themeLight' | 'themeDark'>,
-): HTMLStyleElement {
+export function createMainStyles({ colorScheme, themeDark, themeLight }: FeedbackInternalOptions): HTMLStyleElement {
   const style = DOCUMENT.createElement('style');
   style.textContent = `
 :host {
-  --z-index: ${themes.themeLight.zIndex};
-  --font-family: ${themes.themeLight.fontFamily};
-  --font-size: ${themes.themeLight.fontSize};
-
-  font-family: var(--font-family);
-  font-size: var(--font-size);
+  --font-family: system-ui, 'Helvetica Neue', Arial, sans-serif;
+  --font-size: 14px;
+  --z-index: 100000;
 
   --page-margin: 16px;
-  --actor-inset: auto var(--page-margin) var(--page-margin) auto;
+  --inset: auto 0 0 auto;
+  --actor-inset: var(--inset);
 
-  --dialog-inset: auto var(--page-margin) var(--page-margin) auto;
-  --dialog-padding: 24px;
-
-  .brand-link path {
-    fill: ${colorScheme === 'dark' ? '#fff' : '#362d59'};
-  }
-  @media (prefers-color-scheme: dark)
-  {
-    path: {
-      fill: '#fff';
-    }
-  }
+  font-family: var(--font-family);
+  font-size: var(--font-size);
 
-  ${getThemedCssVariables(colorScheme === 'dark' ? themes.themeDark : themes.themeLight)}
+  ${getThemedCssVariables(colorScheme === 'dark' ? themeDark : themeLight)}
 }
 
 ${
@@ -77,12 +49,13 @@ ${
     ? `
 @media (prefers-color-scheme: dark) {
   :host {
-    ${getThemedCssVariables(themes.themeDark)}
+    ${getThemedCssVariables(themeDark)}
   }
 }`
     : ''
 }
-}`;
+}
+`;
 
   return style;
 }
diff --git a/packages/feedback/src/core/integration.ts b/packages/feedback/src/core/integration.ts
index 32cce8b83fe7..9247f36b6990 100644
--- a/packages/feedback/src/core/integration.ts
+++ b/packages/feedback/src/core/integration.ts
@@ -9,20 +9,23 @@ import type {
 } from '@sentry/types';
 import { isBrowser, logger } from '@sentry/utils';
 import {
-  ACTOR_LABEL,
+  ADD_SCREENSHOT_LABEL,
   CANCEL_BUTTON_LABEL,
+  CONFIRM_BUTTON_LABEL,
   DEFAULT_THEME,
   DOCUMENT,
   EMAIL_LABEL,
   EMAIL_PLACEHOLDER,
   FORM_TITLE,
-  IS_REQUIRED_TEXT,
+  IS_REQUIRED_LABEL,
   MESSAGE_LABEL,
   MESSAGE_PLACEHOLDER,
   NAME_LABEL,
   NAME_PLACEHOLDER,
+  REMOVE_SCREENSHOT_LABEL,
   SUBMIT_BUTTON_LABEL,
   SUCCESS_MESSAGE_TEXT,
+  TRIGGER_LABEL,
 } from '../constants';
 import { DEBUG_BUILD } from '../util/debug-build';
 import { isScreenshotSupported } from '../util/isScreenshotSupported';
@@ -66,7 +69,7 @@ export const buildFeedbackIntegration = ({
     autoInject = true,
     showEmail = true,
     showName = true,
-    showScreenshot = true,
+    enableScreenshot = true,
     useSentryUser = {
       email: 'email',
       name: 'username',
@@ -80,18 +83,21 @@ export const buildFeedbackIntegration = ({
     themeDark,
 
     // FeedbackTextConfiguration
-    buttonLabel = ACTOR_LABEL,
+    addScreenshotButtonLabel = ADD_SCREENSHOT_LABEL,
     cancelButtonLabel = CANCEL_BUTTON_LABEL,
-    submitButtonLabel = SUBMIT_BUTTON_LABEL,
-    formTitle = FORM_TITLE,
+    confirmButtonLabel = CONFIRM_BUTTON_LABEL,
     emailLabel = EMAIL_LABEL,
     emailPlaceholder = EMAIL_PLACEHOLDER,
+    formTitle = FORM_TITLE,
+    isRequiredLabel = IS_REQUIRED_LABEL,
     messageLabel = MESSAGE_LABEL,
     messagePlaceholder = MESSAGE_PLACEHOLDER,
     nameLabel = NAME_LABEL,
     namePlaceholder = NAME_PLACEHOLDER,
+    removeScreenshotButtonLabel = REMOVE_SCREENSHOT_LABEL,
+    submitButtonLabel = SUBMIT_BUTTON_LABEL,
     successMessageText = SUCCESS_MESSAGE_TEXT,
-    isRequiredText = IS_REQUIRED_TEXT,
+    triggerLabel = TRIGGER_LABEL,
 
     // FeedbackCallbacks
     onFormOpen,
@@ -108,7 +114,7 @@ export const buildFeedbackIntegration = ({
       isNameRequired,
       showEmail,
       showName,
-      showScreenshot,
+      enableScreenshot,
       useSentryUser,
 
       colorScheme,
@@ -121,9 +127,10 @@ export const buildFeedbackIntegration = ({
         ...themeLight,
       },
 
-      buttonLabel,
+      triggerLabel,
       cancelButtonLabel,
       submitButtonLabel,
+      confirmButtonLabel,
       formTitle,
       emailLabel,
       emailPlaceholder,
@@ -132,7 +139,9 @@ export const buildFeedbackIntegration = ({
       nameLabel,
       namePlaceholder,
       successMessageText,
-      isRequiredText,
+      isRequiredLabel,
+      addScreenshotButtonLabel,
+      removeScreenshotButtonLabel,
 
       onFormClose,
       onFormOpen,
@@ -154,7 +163,7 @@ export const buildFeedbackIntegration = ({
         DOCUMENT.body.appendChild(host);
 
         _shadow = host.attachShadow({ mode: 'open' });
-        _shadow.appendChild(createMainStyles(options.colorScheme, options));
+        _shadow.appendChild(createMainStyles(options));
       }
       return _shadow as ShadowRoot;
     };
@@ -176,7 +185,7 @@ export const buildFeedbackIntegration = ({
     };
 
     const _loadAndRenderDialog = async (options: FeedbackInternalOptions): Promise<FeedbackDialog> => {
-      const screenshotRequired = options.showScreenshot && isScreenshotSupported();
+      const screenshotRequired = options.enableScreenshot && isScreenshotSupported();
       const [modalIntegration, screenshotIntegration] = await Promise.all([
         _findIntegration<FeedbackModalIntegration>('FeedbackModal', getModalIntegration, 'feedbackModalIntegration'),
         screenshotRequired
@@ -250,7 +259,7 @@ export const buildFeedbackIntegration = ({
 
     const _createActor = (optionOverrides: OverrideFeedbackConfiguration = {}): ActorComponent => {
       const shadow = _createShadow(_options);
-      const actor = Actor({ buttonLabel: _options.buttonLabel, shadow });
+      const actor = Actor({ triggerLabel: _options.triggerLabel, shadow });
       const mergedOptions = mergeOptions(_options, {
         ...optionOverrides,
         onFormOpen() {
diff --git a/packages/feedback/src/modal/components/Dialog.css.ts b/packages/feedback/src/modal/components/Dialog.css.ts
index 4d01aae84309..8e280e6df4da 100644
--- a/packages/feedback/src/modal/components/Dialog.css.ts
+++ b/packages/feedback/src/modal/components/Dialog.css.ts
@@ -1,3 +1,4 @@
+import type { FeedbackInternalOptions } from '@sentry/types';
 import { DOCUMENT } from '../../constants';
 
 const DIALOG = `
@@ -5,6 +6,7 @@ const DIALOG = `
   position: fixed;
   z-index: var(--z-index);
   margin: 0;
+  inset: 0;
 
   display: flex;
   align-items: center;
@@ -13,6 +15,8 @@ const DIALOG = `
   height: 100vh;
   width: 100vw;
 
+  color: var(--foreground);
+  fill: var(--foreground);
   line-height: 1.75em;
 
   background-color: rgba(0, 0, 0, 0.05);
@@ -22,6 +26,26 @@ const DIALOG = `
   transition: opacity 0.2s ease-in-out;
 }
 
+.dialog__position {
+  position: fixed;
+  z-index: var(--z-index);
+  inset: var(--dialog-inset);
+  padding: var(--page-margin);
+  display: flex;
+  max-height: calc(100vh - (2 * var(--page-margin)));
+}
+@media (max-width: 600px) {
+  .dialog__position {
+    inset: var(--page-margin);
+    padding: 0;
+  }
+}
+
+.dialog__position:has(.editor) {
+  inset: var(--page-margin);
+  padding: 0;
+}
+
 .dialog:not([open]) {
   opacity: 0;
   pointer-events: none;
@@ -32,34 +56,22 @@ const DIALOG = `
 }
 
 .dialog__content {
-  position: fixed;
-  inset: var(--dialog-inset);
-
   display: flex;
   flex-direction: column;
   gap: 16px;
   padding: var(--dialog-padding);
   max-width: 100%;
-  max-height: calc(100% - (2 * var(--page-margin)) - (2 * var(--dialog-padding)));
+  width: 100%;
+  max-height: 100%;
   overflow: auto;
 
-  background-color: var(--background);
-  border-radius: var(--form-border-radius);
+  background-color: var(--dialog-background);
+  border-radius: var(--dialog-border-radius);
   border: var(--border);
   box-shadow: var(--box-shadow);
-  color: var(--foreground);
   transform: translate(0, 0) scale(1);
   transition: transform 0.2s ease-in-out;
 }
-
-.dialog__content:has(.editor) {
-  inset: var(--page-margin);
-}
-@media (max-width: 600px) {
-  .dialog__content {
-    inset: var(--page-margin);
-  }
-}
 `;
 
 const DIALOG_HEADER = `
@@ -74,6 +86,9 @@ const DIALOG_HEADER = `
 .brand-link {
   display: inline-flex;
 }
+.brand-link:focus-visible {
+  outline: 1px auto var(--input-outline-focus);
+}
 `;
 
 const FORM = `
@@ -108,7 +123,8 @@ const FORM = `
 }
 
 .form__error-container {
-  color: var(--error);
+  color: var(--error-foreground);
+  fill: var(--error-foreground);
 }
 
 .form__label {
@@ -134,8 +150,9 @@ const FORM = `
   background-color: var(--input-background);
   box-sizing: border-box;
   border: var(--input-border);
-  border-radius: var(--form-content-border-radius);
+  border-radius: var(--input-border-radius);
   color: var(--input-foreground);
+  fill: var(--input-foreground);
   font-size: var(--font-size);
   font-weight: 500;
   padding: 6px 12px;
@@ -156,7 +173,8 @@ const FORM = `
 }
 
 .error {
-  color: var(--error);
+  color: var(--error-foreground);
+  fill: var(--error-foreground);
 }
 `;
 
@@ -182,47 +200,55 @@ const BUTTON = `
 }
 
 .btn--primary {
-  background-color: var(--submit-background);
-  border-color: var(--submit-border);
   color: var(--submit-foreground);
+  fill: var(--submit-foreground);
+  background-color: var(--submit-background);
+  border: var(--submit-border);
+  border-radius: var(--input-border-radius);
+  font-weight: 500;
 }
 .btn--primary:hover {
-  background-color: var(--submit-background-hover);
   color: var(--submit-foreground-hover);
+  fill: var(--submit-foreground-hover);
+  background-color: var(--submit-background-hover);
 }
 .btn--primary:focus-visible {
   outline: 1px auto var(--submit-outline-focus);
 }
 
 .btn--default {
-  background-color: var(--cancel-background);
-  color: var(--cancel-foreground);
+  color: var(--button-foreground);
+  fill: var(--button-foreground);
+  background-color: var(--button-background);
+  border: var(--button-border);
+  border-radius: var(--input-border-radius);
   font-weight: 500;
 }
 .btn--default:hover {
-  background-color: var(--cancel-background-hover);
-  color: var(--cancel-foreground-hover);
+  color: var(--button-foreground-hover);
+  fill: var(--button-foreground-hover);
+  background-color: var(--button-background-hover);
 }
 .btn--default:focus-visible {
-  outline: 1px auto var(--cancel-outline-focus);
+  outline: 1px auto var(--button-outline-focus);
 }
 `;
 
 const SUCCESS = `
-.success-message {
+.success__position {
   position: fixed;
-  left: var(--left);
-  right: var(--right);
-  bottom: var(--bottom);
-  top: var(--top);
+  inset: var(--dialog-inset);
+  padding: var(--page-margin);
   z-index: var(--z-index);
-
-  background-color: var(--background);
+}
+.success__content {
+  background-color: var(--trigger-background);
   border: var(--border);
-  border-radius: var(--border-radius);
+  border-radius: var(--trigger-border-radius);
   box-shadow: var(--box-shadow);
   font-weight: 600;
-  color: var(--success);
+  color: var(--success-foreground);
+  fill: var(--success-foreground);
   padding: 12px 24px;
   line-height: 25px;
   display: grid;
@@ -232,24 +258,64 @@ const SUCCESS = `
   cursor: default;
 }
 
-.success-icon {
+.success__icon {
   display: flex;
 }
 `;
 
+function getThemedCssVariables(theme: FeedbackInternalOptions['themeLight']): string {
+  return `
+  --input-border-radius: ${theme.inputBorderRadius};
+  --input-background: ${theme.inputBackground};
+  --input-background-hover: ${theme.inputBackgroundHover};
+  --input-background-focus: ${theme.inputBackgroundFocus};
+  --input-foreground: ${theme.inputForeground};
+  --input-border: ${theme.inputBorder};
+  --input-outline-focus: ${theme.inputOutlineFocus};
+
+  --submit-foreground: ${theme.submitForeground};
+  --submit-foreground-hover: ${theme.submitForegroundHover};
+  --submit-background: ${theme.submitBackground};
+  --submit-background-hover: ${theme.submitBackgroundHover};
+  --submit-border: ${theme.submitBorder};
+  --submit-outline-focus: ${theme.submitOutlineFocus};
+
+  --dialog-background: ${theme.dialogBackground};
+  --dialog-border-radius: ${theme.dialogBorderRadius};
+  `;
+}
+
 /**
  * Creates <style> element for widget dialog
  */
-export function createDialogStyles(): HTMLStyleElement {
+export function createDialogStyles({ colorScheme, themeDark, themeLight }: FeedbackInternalOptions): HTMLStyleElement {
   const style = DOCUMENT.createElement('style');
 
   style.textContent = `
-    ${DIALOG}
-    ${DIALOG_HEADER}
-    ${FORM}
-    ${BUTTON}
-    ${SUCCESS}
-  `;
+:host {
+  --dialog-inset: var(--inset);
+  --dialog-padding: 24px;
+
+  ${getThemedCssVariables(colorScheme === 'dark' ? themeDark : themeLight)}
+}
+
+${
+  colorScheme === 'system'
+    ? `
+@media (prefers-color-scheme: dark) {
+  :host {
+    ${getThemedCssVariables(themeDark)}
+  }
+}`
+    : ''
+}
+
+${DIALOG}
+${DIALOG_HEADER}
+${FORM}
+${BUTTON}
+${SUCCESS}
+`;
 
   return style;
 }
diff --git a/packages/feedback/src/modal/components/Dialog.tsx b/packages/feedback/src/modal/components/Dialog.tsx
index fddb2cc0448e..d691d0bd18c8 100644
--- a/packages/feedback/src/modal/components/Dialog.tsx
+++ b/packages/feedback/src/modal/components/Dialog.tsx
@@ -1,4 +1,4 @@
-import type { FeedbackFormData } from '@sentry/types';
+import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types';
 // biome-ignore lint/nursery/noUnusedImports: reason
 import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import type { VNode } from 'preact';
@@ -11,12 +11,13 @@ import { Form } from './Form';
 import { SuccessIcon } from './SuccessIcon';
 
 interface Props extends HeaderProps, FormProps {
-  successMessageText: string;
   onFormSubmitted: () => void;
   open: boolean;
+  options: FeedbackInternalOptions;
 }
 
-export function Dialog({ open, onFormSubmitted, successMessageText, ...props }: Props): VNode {
+export function Dialog({ open, onFormSubmitted, ...props }: Props): VNode {
+  const options = props.options;
   const successIconHtml = useMemo(() => ({ __html: SuccessIcon().outerHTML }), []);
 
   const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout | null>(null);
@@ -45,21 +46,25 @@ export function Dialog({ open, onFormSubmitted, successMessageText, ...props }:
   return (
     <Fragment>
       {timeoutId ? (
-        <div class="success-message" onClick={handleOnSuccessClick}>
-          {successMessageText}
-          <span class="success-icon" dangerouslySetInnerHTML={successIconHtml} />
+        <div class="success__position" onClick={handleOnSuccessClick}>
+          <div class="success__content">
+            {options.successMessageText}
+            <span class="success__icon" dangerouslySetInnerHTML={successIconHtml} />
+          </div>
         </div>
       ) : (
-        <dialog class="dialog" onClick={props.onFormClose} open={open}>
-          <div
-            class="dialog__content"
-            onClick={e => {
-              // Stop event propagation so clicks on content modal do not propagate to dialog (which will close dialog)
-              e.stopPropagation();
-            }}
-          >
-            <DialogHeader {...props} />
-            <Form {...props} onSubmitSuccess={onSubmitSuccess} />
+        <dialog class="dialog" onClick={options.onFormClose} open={open}>
+          <div class="dialog__position">
+            <div
+              class="dialog__content"
+              onClick={e => {
+                // Stop event propagation so clicks on content modal do not propagate to dialog (which will close dialog)
+                e.stopPropagation();
+              }}
+            >
+              <DialogHeader options={options} />
+              <Form {...props} onSubmitSuccess={onSubmitSuccess} />
+            </div>
           </div>
         </dialog>
       )}
diff --git a/packages/feedback/src/modal/components/DialogHeader.tsx b/packages/feedback/src/modal/components/DialogHeader.tsx
index b4190a10e787..44d29af629f6 100644
--- a/packages/feedback/src/modal/components/DialogHeader.tsx
+++ b/packages/feedback/src/modal/components/DialogHeader.tsx
@@ -6,17 +6,16 @@ import { useMemo } from 'preact/hooks';
 import { SentryLogo } from './SentryLogo';
 
 export interface Props {
-  formTitle: FeedbackInternalOptions['formTitle'];
-  showBranding: FeedbackInternalOptions['showBranding'];
+  options: FeedbackInternalOptions;
 }
 
-export function DialogHeader({ formTitle, showBranding }: Props): VNode {
+export function DialogHeader({ options }: Props): VNode {
   const logoHtml = useMemo(() => ({ __html: SentryLogo().outerHTML }), []);
 
   return (
     <h2 class="dialog__header">
-      {formTitle}
-      {showBranding ? (
+      {options.formTitle}
+      {options.showBranding ? (
         <a
           class="brand-link"
           target="_blank"
diff --git a/packages/feedback/src/modal/components/Form.tsx b/packages/feedback/src/modal/components/Form.tsx
index 15d3bcb3ef91..788512cb192b 100644
--- a/packages/feedback/src/modal/components/Form.tsx
+++ b/packages/feedback/src/modal/components/Form.tsx
@@ -13,23 +13,8 @@ import { FEEDBACK_WIDGET_SOURCE } from '../../constants';
 import { DEBUG_BUILD } from '../../util/debug-build';
 import { getMissingFields } from '../../util/validate';
 
-export interface Props
-  extends Pick<
-    FeedbackInternalOptions,
-    | 'cancelButtonLabel'
-    | 'emailLabel'
-    | 'emailPlaceholder'
-    | 'isEmailRequired'
-    | 'isNameRequired'
-    | 'messageLabel'
-    | 'messagePlaceholder'
-    | 'nameLabel'
-    | 'namePlaceholder'
-    | 'showEmail'
-    | 'showName'
-    | 'submitButtonLabel'
-    | 'isRequiredText'
-  > {
+export interface Props extends Pick<FeedbackInternalOptions, 'showEmail' | 'showName'> {
+  options: FeedbackInternalOptions;
   defaultEmail: string;
   defaultName: string;
   onFormClose: () => void;
@@ -48,27 +33,33 @@ function retrieveStringValue(formData: FormData, key: string): string {
 }
 
 export function Form({
-  cancelButtonLabel,
+  options,
   defaultEmail,
   defaultName,
-  emailLabel,
-  emailPlaceholder,
-  isEmailRequired,
-  isNameRequired,
-  messageLabel,
-  messagePlaceholder,
-  nameLabel,
-  namePlaceholder,
+
   onFormClose,
   onSubmit,
   onSubmitSuccess,
   onSubmitError,
   showEmail,
   showName,
-  submitButtonLabel,
-  isRequiredText,
   screenshotInput,
 }: Props): VNode {
+  const {
+    addScreenshotButtonLabel,
+    removeScreenshotButtonLabel,
+    cancelButtonLabel,
+    emailLabel,
+    emailPlaceholder,
+    isEmailRequired,
+    isNameRequired,
+    messageLabel,
+    messagePlaceholder,
+    nameLabel,
+    namePlaceholder,
+    submitButtonLabel,
+    isRequiredLabel,
+  } = options;
   // TODO: set a ref on the form, and whenever an input changes call proceessForm() and setError()
   const [error, setError] = useState<null | string>(null);
 
@@ -159,7 +150,7 @@ export function Form({
 
           {showName ? (
             <label for="name" class="form__label">
-              <LabelText label={nameLabel} isRequiredText={isRequiredText} isRequired={isNameRequired} />
+              <LabelText label={nameLabel} isRequiredLabel={isRequiredLabel} isRequired={isNameRequired} />
               <input
                 class="form__input"
                 defaultValue={defaultName}
@@ -176,7 +167,7 @@ export function Form({
 
           {showEmail ? (
             <label for="email" class="form__label">
-              <LabelText label={emailLabel} isRequiredText={isRequiredText} isRequired={isEmailRequired} />
+              <LabelText label={emailLabel} isRequiredLabel={isRequiredLabel} isRequired={isEmailRequired} />
               <input
                 class="form__input"
                 defaultValue={defaultEmail}
@@ -184,7 +175,7 @@ export function Form({
                 name="email"
                 placeholder={emailPlaceholder}
                 required={isEmailRequired}
-                type="text"
+                type="email"
               ></input>
             </label>
           ) : (
@@ -192,7 +183,7 @@ export function Form({
           )}
 
           <label for="message" class="form__label">
-            <LabelText label={messageLabel} isRequiredText={isRequiredText} isRequired />
+            <LabelText label={messageLabel} isRequiredLabel={isRequiredLabel} isRequired />
             <textarea
               autoFocus
               class="form__input form__input--textarea"
@@ -206,8 +197,6 @@ export function Form({
 
           {ScreenshotInputComponent ? (
             <label for="screenshot" class="form__label">
-              <span class="form__label__text">Screenshot</span>
-
               <button
                 class="btn btn--default"
                 type="button"
@@ -216,7 +205,7 @@ export function Form({
                   setShowScreenshotInput(prev => !prev);
                 }}
               >
-                {showScreenshotInput ? 'Remove' : 'Add'}
+                {showScreenshotInput ? removeScreenshotButtonLabel : addScreenshotButtonLabel}
               </button>
               {screenshotError ? <div class="form__error-container">{screenshotError.message}</div> : null}
             </label>
@@ -238,12 +227,12 @@ export function Form({
 function LabelText({
   label,
   isRequired,
-  isRequiredText,
-}: { label: string; isRequired: boolean; isRequiredText: string }): VNode {
+  isRequiredLabel,
+}: { label: string; isRequired: boolean; isRequiredLabel: string }): VNode {
   return (
     <span class="form__label__text">
       {label}
-      {isRequired && <span class="form__label__text--required">{isRequiredText}</span>}
+      {isRequired && <span class="form__label__text--required">{isRequiredLabel}</span>}
     </span>
   );
 }
diff --git a/packages/feedback/src/modal/components/SentryLogo.ts b/packages/feedback/src/modal/components/SentryLogo.ts
index eabdcdf8d9b1..8a3c338d341e 100644
--- a/packages/feedback/src/modal/components/SentryLogo.ts
+++ b/packages/feedback/src/modal/components/SentryLogo.ts
@@ -13,7 +13,7 @@ export function SentryLogo(): SVGElement {
     width: '32',
     height: '30',
     viewBox: '0 0 72 66',
-    fill: 'none',
+    fill: 'inherit',
   });
 
   const path = setAttributesNS(createElementNS('path'), {
diff --git a/packages/feedback/src/modal/components/SuccessIcon.ts b/packages/feedback/src/modal/components/SuccessIcon.ts
index 279938bced49..fe76c6d0ecfa 100644
--- a/packages/feedback/src/modal/components/SuccessIcon.ts
+++ b/packages/feedback/src/modal/components/SuccessIcon.ts
@@ -15,7 +15,7 @@ export function SuccessIcon(): SVGElement {
     width: `${WIDTH}`,
     height: `${HEIGHT}`,
     viewBox: `0 0 ${WIDTH} ${HEIGHT}`,
-    fill: 'var(--success)',
+    fill: 'inherit',
   });
 
   const g = setAttributesNS(createElementNS('g'), {
diff --git a/packages/feedback/src/modal/integration.tsx b/packages/feedback/src/modal/integration.tsx
index cf5048c53619..a92b9cad356c 100644
--- a/packages/feedback/src/modal/integration.tsx
+++ b/packages/feedback/src/modal/integration.tsx
@@ -1,5 +1,11 @@
 import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
-import type { CreateDialogProps, FeedbackFormData, FeedbackModalIntegration, IntegrationFn } from '@sentry/types';
+import type {
+  CreateDialogProps,
+  FeedbackDialog,
+  FeedbackFormData,
+  FeedbackModalIntegration,
+  IntegrationFn,
+} from '@sentry/types';
 import { h, render } from 'preact';
 import { DOCUMENT } from '../constants';
 import { Dialog } from './components/Dialog';
@@ -16,10 +22,10 @@ export const feedbackModalIntegration = ((): FeedbackModalIntegration => {
       const user = getCurrentScope().getUser() || getIsolationScope().getUser() || getGlobalScope().getUser();
 
       const el = DOCUMENT.createElement('div');
-      const style = createDialogStyles();
+      const style = createDialogStyles(options);
 
       let originalOverflow = '';
-      const dialog = {
+      const dialog: FeedbackDialog = {
         get el() {
           return el;
         },
@@ -45,30 +51,17 @@ export const feedbackModalIntegration = ((): FeedbackModalIntegration => {
         },
       };
 
-      const screenshotInput = screenshotIntegration && screenshotIntegration.createInput(h, dialog);
+      const screenshotInput = screenshotIntegration && screenshotIntegration.createInput(h, dialog, options);
 
       const renderContent = (open: boolean): void => {
         render(
           <Dialog
+            options={options}
             screenshotInput={screenshotInput}
-            showBranding={options.showBranding}
             showName={options.showName || options.isNameRequired}
             showEmail={options.showEmail || options.isEmailRequired}
-            isNameRequired={options.isNameRequired}
-            isEmailRequired={options.isEmailRequired}
-            formTitle={options.formTitle}
-            cancelButtonLabel={options.cancelButtonLabel}
-            submitButtonLabel={options.submitButtonLabel}
-            emailLabel={options.emailLabel}
-            emailPlaceholder={options.emailPlaceholder}
-            messageLabel={options.messageLabel}
-            messagePlaceholder={options.messagePlaceholder}
-            nameLabel={options.nameLabel}
-            namePlaceholder={options.namePlaceholder}
             defaultName={(userKey && user && user[userKey.name]) || ''}
             defaultEmail={(userKey && user && user[userKey.email]) || ''}
-            successMessageText={options.successMessageText}
-            isRequiredText={options.isRequiredText}
             onFormClose={() => {
               renderContent(false);
               options.onFormClose && options.onFormClose();
diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
index 0287b647ece0..c06fc0b9e58a 100644
--- a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
+++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
@@ -1,4 +1,4 @@
-import type { FeedbackDialog } from '@sentry/types';
+import type { FeedbackDialog, FeedbackInternalOptions } from '@sentry/types';
 /* eslint-disable max-lines */
 import type { ComponentType, VNode, h as hType } from 'preact';
 // biome-ignore lint: needed for preact
@@ -17,6 +17,7 @@ interface FactoryParams {
   h: typeof hType;
   imageBuffer: HTMLCanvasElement;
   dialog: FeedbackDialog;
+  options: FeedbackInternalOptions;
 }
 
 interface Props {
@@ -61,8 +62,7 @@ const getContainedSize = (img: HTMLCanvasElement): Box => {
   return { startX: x, startY: y, endX: width + x, endY: height + y };
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: FactoryParams): ComponentType<Props> {
+export function makeScreenshotEditorComponent({ imageBuffer, dialog, options }: FactoryParams): ComponentType<Props> {
   return function ScreenshotEditor({ onError }: Props): VNode {
     const styles = useMemo(() => ({ __html: createScreenshotInputStyles().innerText }), []);
 
@@ -298,7 +298,7 @@ export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: Factor
                 }}
                 class="btn btn--default"
               >
-                Cancel
+                {options.cancelButtonLabel}
               </button>
               <button
                 onClick={e => {
@@ -308,7 +308,7 @@ export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: Factor
                 }}
                 class="btn btn--primary"
               >
-                Confirm
+                {options.confirmButtonLabel}
               </button>
             </div>
           </div>
diff --git a/packages/feedback/src/screenshot/integration.ts b/packages/feedback/src/screenshot/integration.ts
index f4d8a287ad96..6edb1ce6a246 100644
--- a/packages/feedback/src/screenshot/integration.ts
+++ b/packages/feedback/src/screenshot/integration.ts
@@ -1,4 +1,9 @@
-import type { FeedbackDialog, FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/types';
+import type {
+  FeedbackDialog,
+  FeedbackInternalOptions,
+  FeedbackScreenshotIntegration,
+  IntegrationFn,
+} from '@sentry/types';
 import type { Attachment } from '@sentry/types';
 import type { h as hType } from 'preact';
 import { DOCUMENT } from '../constants';
@@ -9,12 +14,12 @@ export const feedbackScreenshotIntegration = ((): FeedbackScreenshotIntegration
     name: 'FeedbackScreenshot',
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     setupOnce() {},
-    createInput: (h: unknown, dialog: FeedbackDialog) => {
+    createInput: (h: unknown, dialog: FeedbackDialog, options: FeedbackInternalOptions) => {
       const imageBuffer = DOCUMENT.createElement('canvas');
 
       return {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        input: makeScreenshotEditorComponent({ h: h as typeof hType, imageBuffer, dialog }) as any,
+        input: makeScreenshotEditorComponent({ h: h as typeof hType, imageBuffer, dialog, options }) as any,
 
         value: async () => {
           const blob = await new Promise<Parameters<BlobCallback>[0]>(resolve => {
diff --git a/packages/node/src/integrations/anr/index.ts b/packages/node/src/integrations/anr/index.ts
index 2cf32289f082..9d6382de45da 100644
--- a/packages/node/src/integrations/anr/index.ts
+++ b/packages/node/src/integrations/anr/index.ts
@@ -156,6 +156,8 @@ async function _startWorker(
 
   const worker = new Worker(new URL(`data:application/javascript;base64,${base64WorkerScript}`), {
     workerData: options,
+    // We don't want any Node args to be passed to the worker
+    execArgv: [],
   });
 
   process.on('exit', () => {
diff --git a/packages/node/src/integrations/local-variables/local-variables-async.ts b/packages/node/src/integrations/local-variables/local-variables-async.ts
index b8e827909ea8..24667b3a57e3 100644
--- a/packages/node/src/integrations/local-variables/local-variables-async.ts
+++ b/packages/node/src/integrations/local-variables/local-variables-async.ts
@@ -84,6 +84,8 @@ export const localVariablesAsyncIntegration = defineIntegration(((
   function startWorker(options: LocalVariablesWorkerArgs): void {
     const worker = new Worker(new URL(`data:application/javascript;base64,${base64WorkerScript}`), {
       workerData: options,
+      // We don't want any Node args to be passed to the worker
+      execArgv: [],
     });
 
     process.on('exit', () => {
diff --git a/packages/node/src/sdk/client.ts b/packages/node/src/sdk/client.ts
index b2d23ea31cc2..8658ebf3e918 100644
--- a/packages/node/src/sdk/client.ts
+++ b/packages/node/src/sdk/client.ts
@@ -4,6 +4,8 @@ import { trace } from '@opentelemetry/api';
 import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import type { ServerRuntimeClientOptions } from '@sentry/core';
 import { SDK_VERSION, ServerRuntimeClient, applySdkMetadata } from '@sentry/core';
+import { logger } from '@sentry/utils';
+import { isMainThread, threadId } from 'worker_threads';
 import type { NodeClientOptions } from '../types';
 
 /** A client for using Sentry with Node & OpenTelemetry. */
@@ -21,6 +23,10 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 
     applySdkMetadata(clientOptions, 'node');
 
+    logger.log(
+      `Initializing Sentry: process: ${process.pid}, thread: ${isMainThread ? 'main' : `worker-${threadId}`}.`,
+    );
+
     super(clientOptions);
   }
 
diff --git a/packages/types/src/feedback/config.ts b/packages/types/src/feedback/config.ts
index 97c0465b7392..e6f92e65d52e 100644
--- a/packages/types/src/feedback/config.ts
+++ b/packages/types/src/feedback/config.ts
@@ -45,7 +45,7 @@ export interface FeedbackGeneralConfiguration {
    * Should the screen shots field be included?
    * Screen shots cannot be marked as required
    */
-  showScreenshot: boolean;
+  enableScreenshot: boolean;
 
   /**
    * Fill in email/name input fields with Sentry user context if it exists.
@@ -84,7 +84,7 @@ export interface FeedbackTextConfiguration {
   /**
    * The label for the Feedback widget button that opens the dialog
    */
-  buttonLabel: string;
+  triggerLabel: string;
 
   /**
    * The label for the Feedback form cancel button that closes dialog
@@ -96,6 +96,11 @@ export interface FeedbackTextConfiguration {
    */
   submitButtonLabel: string;
 
+  /**
+   * The label for the Screenshot editor cancel buttons
+   */
+  confirmButtonLabel: string;
+
   /**
    * The title of the Feedback form
    */
@@ -139,7 +144,17 @@ export interface FeedbackTextConfiguration {
   /**
    * Text which indicates that a field is required
    */
-  isRequiredText: string;
+  isRequiredLabel: string;
+
+  /**
+   * The label for the button that adds a screeshot and renders the image editor
+   */
+  addScreenshotButtonLabel: string;
+
+  /**
+   * The label for the button that removes a screenshot and hides the image editor
+   */
+  removeScreenshotButtonLabel: string;
 }
 
 /**
diff --git a/packages/types/src/feedback/index.ts b/packages/types/src/feedback/index.ts
index 477ae46d8f92..aa34d1a574b7 100644
--- a/packages/types/src/feedback/index.ts
+++ b/packages/types/src/feedback/index.ts
@@ -69,6 +69,7 @@ export interface FeedbackScreenshotIntegration extends Integration {
   createInput: (
     h: HType,
     dialog: FeedbackDialog,
+    options: FeedbackInternalOptions,
   ) => {
     /**
      * The preact component
diff --git a/packages/types/src/feedback/theme.ts b/packages/types/src/feedback/theme.ts
index c9e0b91908f0..68bd3b25f0d7 100644
--- a/packages/types/src/feedback/theme.ts
+++ b/packages/types/src/feedback/theme.ts
@@ -1,18 +1,18 @@
 interface BaseStyles {
   /**
-   * Font family for widget
+   * Foreground color (i.e. text color)
    */
-  fontFamily: string;
+  foreground: string;
 
   /**
-   * Font size for widget
+   * Success color
    */
-  fontSize: string;
+  successForeground: string;
 
   /**
-   * Foreground color (i.e. text color)
+   * Error color
    */
-  foreground: string;
+  errorForeground: string;
 
   /**
    * Background color for actor and dialog
@@ -20,148 +20,144 @@ interface BaseStyles {
   background: string;
 
   /**
-   * Success color
+   * Border styling for actor and dialog
    */
-  success: string;
+  border: string;
 
   /**
-   * Error color
+   * Box shadow for actor and dialog
    */
-  error: string;
+  boxShadow: string;
 }
 
-interface ActorAndModal {
+interface Input {
   /**
-   * z-index of the floating Actor or Modal
+   * Foreground color for form inputs
    */
-  zIndex: number;
+  inputForeground: string;
 
   /**
-   * Border styling for actor and dialog
+   * Background color for form inputs
    */
-  border: string;
+  inputBackground: string;
 
   /**
-   * Box shadow for actor and dialog
+   * Background color for form inputs, in the hover state
    */
-  boxShadow: string;
-}
+  inputBackgroundHover: string;
 
-interface ActorButton {
   /**
-   * Background color on hover
+   * Background color for form inputs, in the focus state
    */
-  backgroundHover: string;
+  inputBackgroundFocus: string;
 
   /**
-   * Border radius styling for actor
+   * Border styles for form inputs
    */
-  borderRadius: string;
-}
+  inputBorder: string;
 
-interface Modal {
   /**
-   * Border radius for dialog
+   * Border radius for form inputs
    */
-  formBorderRadius: string;
+  inputBorderRadius: string;
 
   /**
-   * Border radius for form inputs
+   * Border styles for form inputs when focused
    */
-  formContentBorderRadius: string;
+  inputOutlineFocus: string;
 }
 
-interface SubmitButton {
+interface Button {
   /**
-   * Foreground color for the submit button
+   * Foreground color for buttons
    */
-  submitForeground: string;
+  buttonForeground: string;
 
   /**
-   * Background color for the submit button
+   * Foreground color for buttons, in the hover state
    */
-  submitBackground: string;
+  buttonForegroundHover: string;
 
   /**
-   * Foreground color for the submit button, in the hover state
+   * Background color for buttons
    */
-  submitForegroundHover: string;
+  buttonBackground: string;
 
   /**
-   * Background color when hovering over the submit button
+   * Background color when hovering over buttons
    */
-  submitBackgroundHover: string;
+  buttonBackgroundHover: string;
 
   /**
-   * Border style for the submit button
+   * Border style for buttons
    */
-  submitBorder: string;
+  buttonBorder: string;
 
   /**
-   * Border style for the submit button, in the focued state
+   * Border style for buttons, in the focued state
    */
-  submitOutlineFocus: string;
+  buttonOutlineFocus: string;
 }
 
-interface CancelButton {
+interface SubmitButton {
   /**
-   * Foreground color for the cancel button
+   * Foreground color for submit buttons
    */
-  cancelForeground: string;
+  submitForeground: string;
 
   /**
-   * Background color for the cancel button
+   * Foreground color for submit buttons, in the hover state
    */
-  cancelBackground: string;
+  submitForegroundHover: string;
 
   /**
-   * Foreground color for the cancel button, in the hover state
+   * Background color for submit buttons
    */
-  cancelForegroundHover: string;
+  submitBackground: string;
 
   /**
-   * Background color when hovering over the cancel button
+   * Background color when hovering over submit buttons
    */
-  cancelBackgroundHover: string;
+  submitBackgroundHover: string;
 
   /**
-   * Border style for the cancel button
+   * Border style for submit buttons
    */
-  cancelBorder: string;
+  submitBorder: string;
 
   /**
-   * Border style for the cancel button, in the focued state
+   * Border style for submit buttons, in the focued state
    */
-  cancelOutlineFocus: string;
+  submitOutlineFocus: string;
 }
 
-interface Input {
+interface Trigger {
   /**
-   * Background color for form inputs
+   * Background color of the actor button
    */
-  inputBackground: string;
+  triggerBackground: string;
 
   /**
-   * Foreground color for form inputs
+   * Background color on hover
    */
-  inputForeground: string;
+  triggerBackgroundHover: string;
 
   /**
-   * Border styles for form inputs
+   * Border radius styling for actor
    */
-  inputBorder: string;
+  triggerBorderRadius: string;
+}
 
+interface Dialog {
   /**
-   * Border styles for form inputs when focused
+   * Background color of the open dialog
    */
-  inputOutlineFocus: string;
+  dialogBackground: string;
+
+  /**
+   * Border radius for dialog
+   */
+  dialogBorderRadius: string;
 }
 
-export interface FeedbackTheme
-  extends BaseStyles,
-    ActorAndModal,
-    ActorButton,
-    Modal,
-    SubmitButton,
-    CancelButton,
-    Input {}
+export interface FeedbackTheme extends BaseStyles, Input, Button, SubmitButton, Trigger, Dialog {}