diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 30b015fb..99ed65db 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -77,10 +77,6 @@ export {
   shockerShockerShareCodeUpdate,
   shockerShockerShareRemove,
   tokenDeleteDeleteToken,
-  tokensCreateToken,
-  tokensEditToken,
-  tokensListTokens,
-  tokensReportTokens,
   usersGetByName,
   usersGetSelf,
   versionGetBackendInfo,
@@ -121,8 +117,6 @@ export type {
   SharedShocker,
   ShockerResponse,
   ShockerWithDevice,
-  TokenCreatedResponse,
-  TokenResponse,
   UserNameBlacklistDto,
   WebhookDto,
 } from './internal/v1';
@@ -132,6 +126,13 @@ export {
   accountLoginV2,
   accountSignUpV2,
   devicesCreateDeviceV2,
+  tokensCreateTokenV2,
+  tokensEditTokenV2,
+  tokensGetTokenByIdV2,
+  tokensListTokensV2,
+  tokensReportTokens,
+  tokensSelfGetSelfTokenV2,
+  tokensSetTokenPaused,
   userSharesCreateShareInvite,
   userSharesDeleteOutgoingInvite,
   userSharesDenyIncomingInvite,
@@ -141,13 +142,22 @@ export {
   userSharesRedeemInvite,
 } from './internal/v2';
 
-export { UsernameAvailability, UsernameErrorType } from './internal/v2';
+export { ControlLimitMode, UsernameAvailability, UsernameErrorType } from './internal/v2';
 
 export type {
+  CreateTokenRequestV2,
+  DurationLimitSettings,
+  EditTokenRequestV2,
+  IntensityLimitSettings,
+  SetTokenPausedRequest,
   ShareInviteBaseDetails,
+  ShockerControlSettings,
   ShockerLimits,
   ShockerPermLimitPairWithIdAndName,
   ShockerPermissions,
+  TokenCreatedResponseV2,
+  TokenPausedResponse,
+  TokenResponseV2,
   UserShareInfo,
   UsernameCheckResponse,
   V2UserShares,
diff --git a/src/lib/api/internal/v2/index.ts b/src/lib/api/internal/v2/index.ts
index ce93712c..3bdb52c8 100644
--- a/src/lib/api/internal/v2/index.ts
+++ b/src/lib/api/internal/v2/index.ts
@@ -1,4 +1,4 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export { accountCheckUsername, accountLoginV2, accountPasswordResetInitiateV2, accountPasswordResetInitiateV2Legacy, accountSignUpV2, deviceGetLiveControlGatewayV2, devicesCreateDeviceV2, type Options, shockerSendControl, userSharesBulkPauseUserShareShockers, userSharesBulkRemoveUserShareShockers, userSharesBulkUserShareShockersUpdate, userSharesCreateShareInvite, userSharesDeleteOutgoingInvite, userSharesDenyIncomingInvite, userSharesGetIncomingInvitesList, userSharesGetOutgoingInvitesList, userSharesGetSharesByUsers, userSharesRedeemInvite } from './sdk.gen';
-export { type AccountCheckUsernameData, type AccountCheckUsernameResponse, type AccountCheckUsernameResponses, type AccountLoginV2Data, type AccountLoginV2Error, type AccountLoginV2Errors, type AccountLoginV2Response, type AccountLoginV2Responses, type AccountPasswordResetInitiateV2Data, type AccountPasswordResetInitiateV2Error, type AccountPasswordResetInitiateV2Errors, type AccountPasswordResetInitiateV2LegacyData, type AccountPasswordResetInitiateV2LegacyError, type AccountPasswordResetInitiateV2LegacyErrors, type AccountPasswordResetInitiateV2LegacyResponses, type AccountPasswordResetInitiateV2Responses, type AccountSignUpV2Data, type AccountSignUpV2Error, type AccountSignUpV2Errors, type AccountSignUpV2Responses, type BasicUserInfo, type BulkUserShareShockersUpdateRequest, type ChangeUsernameRequest, type ClientOptions, type Control, type ControlRequest, ControlType, type CreateShareRequest, type DeviceGetLiveControlGatewayV2Data, type DeviceGetLiveControlGatewayV2Error, type DeviceGetLiveControlGatewayV2Errors, type DeviceGetLiveControlGatewayV2Response, type DeviceGetLiveControlGatewayV2Responses, type DevicesCreateDeviceV2Data, type DevicesCreateDeviceV2Response, type DevicesCreateDeviceV2Responses, type HubCreateRequest, type LcgNodeResponseV2, type LegacyEmptyResponse, type LoginV2, type LoginV2OkResponse, type OpenShockProblem, type OpenShockProblemWritable, type PasswordResetRequestV2, type PauseUserShareShockersRequest, type PauseUserShareShockersResponse, type RemoveUserSharesResponse, RoleType, type ShareInviteBaseDetails, type ShockerLimits, type ShockerPermissions, type ShockerPermLimitPairWithId, type ShockerPermLimitPairWithIdAndName, type ShockerSendControlData, type ShockerSendControlError, type ShockerSendControlErrors, type ShockerSendControlResponse, type ShockerSendControlResponses, type SignUpV2, UsernameAvailability, type UsernameCheckResponse, type UsernameError, UsernameErrorType, type UserShareInfo, type UserSharesBulkPauseUserShareShockersData, type UserSharesBulkPauseUserShareShockersResponse, type UserSharesBulkPauseUserShareShockersResponses, type UserSharesBulkRemoveUserShareShockersData, type UserSharesBulkRemoveUserShareShockersResponse, type UserSharesBulkRemoveUserShareShockersResponses, type UserSharesBulkUserShareShockersUpdateData, type UserSharesBulkUserShareShockersUpdateError, type UserSharesBulkUserShareShockersUpdateErrors, type UserSharesBulkUserShareShockersUpdateResponses, type UserSharesCreateShareInviteData, type UserSharesCreateShareInviteError, type UserSharesCreateShareInviteErrors, type UserSharesCreateShareInviteResponse, type UserSharesCreateShareInviteResponses, type UserSharesDeleteOutgoingInviteData, type UserSharesDeleteOutgoingInviteError, type UserSharesDeleteOutgoingInviteErrors, type UserSharesDeleteOutgoingInviteResponses, type UserSharesDenyIncomingInviteData, type UserSharesDenyIncomingInviteError, type UserSharesDenyIncomingInviteErrors, type UserSharesDenyIncomingInviteResponses, type UserSharesGetIncomingInvitesListData, type UserSharesGetIncomingInvitesListResponse, type UserSharesGetIncomingInvitesListResponses, type UserSharesGetOutgoingInvitesListData, type UserSharesGetOutgoingInvitesListResponse, type UserSharesGetOutgoingInvitesListResponses, type UserSharesGetSharesByUsersData, type UserSharesGetSharesByUsersResponse, type UserSharesGetSharesByUsersResponses, type UserSharesRedeemInviteData, type UserSharesRedeemInviteError, type UserSharesRedeemInviteErrors, type UserSharesRedeemInviteResponse, type UserSharesRedeemInviteResponses, type V2UserShares, type V2UserSharesListItem } from './types.gen';
+export { accountCheckUsername, accountLoginV2, accountPasswordResetInitiateV2, accountPasswordResetInitiateV2Legacy, accountSignUpV2, deviceGetLiveControlGatewayV2, devicesCreateDeviceV2, type Options, shockerSendControl, tokensCreateTokenV2, tokensEditTokenV2, tokensGetTokenByIdV2, tokensListTokensV2, tokensReportTokens, tokensSelfGetSelfTokenV2, tokensSetTokenPaused, userSharesBulkPauseUserShareShockers, userSharesBulkRemoveUserShareShockers, userSharesBulkUserShareShockersUpdate, userSharesCreateShareInvite, userSharesDeleteOutgoingInvite, userSharesDenyIncomingInvite, userSharesGetIncomingInvitesList, userSharesGetOutgoingInvitesList, userSharesGetSharesByUsers, userSharesRedeemInvite } from './sdk.gen';
+export { type AccountCheckUsernameData, type AccountCheckUsernameResponse, type AccountCheckUsernameResponses, type AccountLoginV2Data, type AccountLoginV2Error, type AccountLoginV2Errors, type AccountLoginV2Response, type AccountLoginV2Responses, type AccountPasswordResetInitiateV2Data, type AccountPasswordResetInitiateV2Error, type AccountPasswordResetInitiateV2Errors, type AccountPasswordResetInitiateV2LegacyData, type AccountPasswordResetInitiateV2LegacyError, type AccountPasswordResetInitiateV2LegacyErrors, type AccountPasswordResetInitiateV2LegacyResponses, type AccountPasswordResetInitiateV2Responses, type AccountSignUpV2Data, type AccountSignUpV2Error, type AccountSignUpV2Errors, type AccountSignUpV2Responses, type BasicUserInfo, type BulkUserShareShockersUpdateRequest, type ChangeUsernameRequest, type ClientOptions, type Control, ControlLimitMode, type ControlRequest, ControlType, type CreateShareRequest, type CreateTokenRequestV2, type DeviceGetLiveControlGatewayV2Data, type DeviceGetLiveControlGatewayV2Error, type DeviceGetLiveControlGatewayV2Errors, type DeviceGetLiveControlGatewayV2Response, type DeviceGetLiveControlGatewayV2Responses, type DevicesCreateDeviceV2Data, type DevicesCreateDeviceV2Response, type DevicesCreateDeviceV2Responses, type DurationLimitSettings, type EditTokenRequestV2, type HubCreateRequest, type IntensityLimitSettings, type LcgNodeResponseV2, type LegacyEmptyResponse, type LoginV2, type LoginV2OkResponse, type OpenShockProblem, type OpenShockProblemWritable, type PasswordResetRequestV2, type PauseUserShareShockersRequest, type PauseUserShareShockersResponse, PermissionType, type RemoveUserSharesResponse, type ReportTokensRequest, RoleType, type SetTokenPausedRequest, type ShareInviteBaseDetails, type ShockerControlSettings, type ShockerLimits, type ShockerPermissions, type ShockerPermLimitPairWithId, type ShockerPermLimitPairWithIdAndName, type ShockerSendControlData, type ShockerSendControlError, type ShockerSendControlErrors, type ShockerSendControlResponse, type ShockerSendControlResponses, type SignUpV2, type TokenCreatedResponseV2, type TokenPausedResponse, type TokenResponseV2, type TokensCreateTokenV2Data, type TokensCreateTokenV2Response, type TokensCreateTokenV2Responses, type TokensEditTokenV2Data, type TokensEditTokenV2Error, type TokensEditTokenV2Errors, type TokensEditTokenV2Responses, type TokensGetTokenByIdV2Data, type TokensGetTokenByIdV2Error, type TokensGetTokenByIdV2Errors, type TokensGetTokenByIdV2Response, type TokensGetTokenByIdV2Responses, type TokensListTokensV2Data, type TokensListTokensV2Response, type TokensListTokensV2Responses, type TokensReportTokensData, type TokensReportTokensResponses, type TokensSelfGetSelfTokenV2Data, type TokensSelfGetSelfTokenV2Response, type TokensSelfGetSelfTokenV2Responses, type TokensSetTokenPausedData, type TokensSetTokenPausedError, type TokensSetTokenPausedErrors, type TokensSetTokenPausedResponse, type TokensSetTokenPausedResponses, UsernameAvailability, type UsernameCheckResponse, type UsernameError, UsernameErrorType, type UserShareInfo, type UserSharesBulkPauseUserShareShockersData, type UserSharesBulkPauseUserShareShockersResponse, type UserSharesBulkPauseUserShareShockersResponses, type UserSharesBulkRemoveUserShareShockersData, type UserSharesBulkRemoveUserShareShockersResponse, type UserSharesBulkRemoveUserShareShockersResponses, type UserSharesBulkUserShareShockersUpdateData, type UserSharesBulkUserShareShockersUpdateError, type UserSharesBulkUserShareShockersUpdateErrors, type UserSharesBulkUserShareShockersUpdateResponses, type UserSharesCreateShareInviteData, type UserSharesCreateShareInviteError, type UserSharesCreateShareInviteErrors, type UserSharesCreateShareInviteResponse, type UserSharesCreateShareInviteResponses, type UserSharesDeleteOutgoingInviteData, type UserSharesDeleteOutgoingInviteError, type UserSharesDeleteOutgoingInviteErrors, type UserSharesDeleteOutgoingInviteResponses, type UserSharesDenyIncomingInviteData, type UserSharesDenyIncomingInviteError, type UserSharesDenyIncomingInviteErrors, type UserSharesDenyIncomingInviteResponses, type UserSharesGetIncomingInvitesListData, type UserSharesGetIncomingInvitesListResponse, type UserSharesGetIncomingInvitesListResponses, type UserSharesGetOutgoingInvitesListData, type UserSharesGetOutgoingInvitesListResponse, type UserSharesGetOutgoingInvitesListResponses, type UserSharesGetSharesByUsersData, type UserSharesGetSharesByUsersResponse, type UserSharesGetSharesByUsersResponses, type UserSharesRedeemInviteData, type UserSharesRedeemInviteError, type UserSharesRedeemInviteErrors, type UserSharesRedeemInviteResponse, type UserSharesRedeemInviteResponses, type V2UserShares, type V2UserSharesListItem } from './types.gen';
diff --git a/src/lib/api/internal/v2/sdk.gen.ts b/src/lib/api/internal/v2/sdk.gen.ts
index 2c9706f2..2247cda4 100644
--- a/src/lib/api/internal/v2/sdk.gen.ts
+++ b/src/lib/api/internal/v2/sdk.gen.ts
@@ -2,8 +2,8 @@
 
 import type { Client, Options as Options2, TDataShape } from './client';
 import { client } from './client.gen';
-import { userSharesGetIncomingInvitesListResponseTransformer, userSharesGetOutgoingInvitesListResponseTransformer, userSharesGetSharesByUsersResponseTransformer, userSharesRedeemInviteResponseTransformer } from './transformers.gen';
-import type { AccountCheckUsernameData, AccountCheckUsernameResponses, AccountLoginV2Data, AccountLoginV2Errors, AccountLoginV2Responses, AccountPasswordResetInitiateV2Data, AccountPasswordResetInitiateV2Errors, AccountPasswordResetInitiateV2LegacyData, AccountPasswordResetInitiateV2LegacyErrors, AccountPasswordResetInitiateV2LegacyResponses, AccountPasswordResetInitiateV2Responses, AccountSignUpV2Data, AccountSignUpV2Errors, AccountSignUpV2Responses, DeviceGetLiveControlGatewayV2Data, DeviceGetLiveControlGatewayV2Errors, DeviceGetLiveControlGatewayV2Responses, DevicesCreateDeviceV2Data, DevicesCreateDeviceV2Responses, ShockerSendControlData, ShockerSendControlErrors, ShockerSendControlResponses, UserSharesBulkPauseUserShareShockersData, UserSharesBulkPauseUserShareShockersResponses, UserSharesBulkRemoveUserShareShockersData, UserSharesBulkRemoveUserShareShockersResponses, UserSharesBulkUserShareShockersUpdateData, UserSharesBulkUserShareShockersUpdateErrors, UserSharesBulkUserShareShockersUpdateResponses, UserSharesCreateShareInviteData, UserSharesCreateShareInviteErrors, UserSharesCreateShareInviteResponses, UserSharesDeleteOutgoingInviteData, UserSharesDeleteOutgoingInviteErrors, UserSharesDeleteOutgoingInviteResponses, UserSharesDenyIncomingInviteData, UserSharesDenyIncomingInviteErrors, UserSharesDenyIncomingInviteResponses, UserSharesGetIncomingInvitesListData, UserSharesGetIncomingInvitesListResponses, UserSharesGetOutgoingInvitesListData, UserSharesGetOutgoingInvitesListResponses, UserSharesGetSharesByUsersData, UserSharesGetSharesByUsersResponses, UserSharesRedeemInviteData, UserSharesRedeemInviteErrors, UserSharesRedeemInviteResponses } from './types.gen';
+import { tokensCreateTokenV2ResponseTransformer, tokensGetTokenByIdV2ResponseTransformer, tokensListTokensV2ResponseTransformer, tokensSelfGetSelfTokenV2ResponseTransformer, userSharesGetIncomingInvitesListResponseTransformer, userSharesGetOutgoingInvitesListResponseTransformer, userSharesGetSharesByUsersResponseTransformer, userSharesRedeemInviteResponseTransformer } from './transformers.gen';
+import type { AccountCheckUsernameData, AccountCheckUsernameResponses, AccountLoginV2Data, AccountLoginV2Errors, AccountLoginV2Responses, AccountPasswordResetInitiateV2Data, AccountPasswordResetInitiateV2Errors, AccountPasswordResetInitiateV2LegacyData, AccountPasswordResetInitiateV2LegacyErrors, AccountPasswordResetInitiateV2LegacyResponses, AccountPasswordResetInitiateV2Responses, AccountSignUpV2Data, AccountSignUpV2Errors, AccountSignUpV2Responses, DeviceGetLiveControlGatewayV2Data, DeviceGetLiveControlGatewayV2Errors, DeviceGetLiveControlGatewayV2Responses, DevicesCreateDeviceV2Data, DevicesCreateDeviceV2Responses, ShockerSendControlData, ShockerSendControlErrors, ShockerSendControlResponses, TokensCreateTokenV2Data, TokensCreateTokenV2Responses, TokensEditTokenV2Data, TokensEditTokenV2Errors, TokensEditTokenV2Responses, TokensGetTokenByIdV2Data, TokensGetTokenByIdV2Errors, TokensGetTokenByIdV2Responses, TokensListTokensV2Data, TokensListTokensV2Responses, TokensReportTokensData, TokensReportTokensResponses, TokensSelfGetSelfTokenV2Data, TokensSelfGetSelfTokenV2Responses, TokensSetTokenPausedData, TokensSetTokenPausedErrors, TokensSetTokenPausedResponses, UserSharesBulkPauseUserShareShockersData, UserSharesBulkPauseUserShareShockersResponses, UserSharesBulkRemoveUserShareShockersData, UserSharesBulkRemoveUserShareShockersResponses, UserSharesBulkUserShareShockersUpdateData, UserSharesBulkUserShareShockersUpdateErrors, UserSharesBulkUserShareShockersUpdateResponses, UserSharesCreateShareInviteData, UserSharesCreateShareInviteErrors, UserSharesCreateShareInviteResponses, UserSharesDeleteOutgoingInviteData, UserSharesDeleteOutgoingInviteErrors, UserSharesDeleteOutgoingInviteResponses, UserSharesDenyIncomingInviteData, UserSharesDenyIncomingInviteErrors, UserSharesDenyIncomingInviteResponses, UserSharesGetIncomingInvitesListData, UserSharesGetIncomingInvitesListResponses, UserSharesGetOutgoingInvitesListData, UserSharesGetOutgoingInvitesListResponses, UserSharesGetSharesByUsersData, UserSharesGetSharesByUsersResponses, UserSharesRedeemInviteData, UserSharesRedeemInviteErrors, UserSharesRedeemInviteResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean, TResponse = unknown> = Options2<TData, ThrowOnError, TResponse> & {
     /**
@@ -19,6 +19,89 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
     meta?: Record<string, unknown>;
 };
 
+/**
+ * Gets information about the current token used to access this endpoint
+ */
+export const tokensSelfGetSelfTokenV2 = <ThrowOnError extends boolean = true>(options?: Options<TokensSelfGetSelfTokenV2Data, ThrowOnError>) => (options?.client ?? client).get<TokensSelfGetSelfTokenV2Responses, unknown, ThrowOnError, 'data'>({
+    responseTransformer: tokensSelfGetSelfTokenV2ResponseTransformer,
+    responseStyle: 'data',
+    url: '/2/tokens/self',
+    ...options
+});
+
+/**
+ * Endpoint to delete potentially compromised api tokens
+ */
+export const tokensReportTokens = <ThrowOnError extends boolean = true>(options?: Options<TokensReportTokensData, ThrowOnError>) => (options?.client ?? client).post<TokensReportTokensResponses, unknown, ThrowOnError, 'data'>({
+    responseStyle: 'data',
+    url: '/2/tokens/report',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options?.headers
+    }
+});
+
+/**
+ * List all tokens for the current user
+ */
+export const tokensListTokensV2 = <ThrowOnError extends boolean = true>(options?: Options<TokensListTokensV2Data, ThrowOnError>) => (options?.client ?? client).get<TokensListTokensV2Responses, unknown, ThrowOnError, 'data'>({
+    responseTransformer: tokensListTokensV2ResponseTransformer,
+    responseStyle: 'data',
+    url: '/2/tokens',
+    ...options
+});
+
+/**
+ * Create a new token
+ */
+export const tokensCreateTokenV2 = <ThrowOnError extends boolean = true>(options?: Options<TokensCreateTokenV2Data, ThrowOnError>) => (options?.client ?? client).post<TokensCreateTokenV2Responses, unknown, ThrowOnError, 'data'>({
+    responseTransformer: tokensCreateTokenV2ResponseTransformer,
+    responseStyle: 'data',
+    url: '/2/tokens',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options?.headers
+    }
+});
+
+/**
+ * Get a token by id
+ */
+export const tokensGetTokenByIdV2 = <ThrowOnError extends boolean = true>(options: Options<TokensGetTokenByIdV2Data, ThrowOnError>) => (options.client ?? client).get<TokensGetTokenByIdV2Responses, TokensGetTokenByIdV2Errors, ThrowOnError, 'data'>({
+    responseTransformer: tokensGetTokenByIdV2ResponseTransformer,
+    responseStyle: 'data',
+    url: '/2/tokens/{tokenId}',
+    ...options
+});
+
+/**
+ * Edit a token
+ */
+export const tokensEditTokenV2 = <ThrowOnError extends boolean = true>(options: Options<TokensEditTokenV2Data, ThrowOnError>) => (options.client ?? client).patch<TokensEditTokenV2Responses, TokensEditTokenV2Errors, ThrowOnError, 'data'>({
+    responseStyle: 'data',
+    url: '/2/tokens/{tokenId}',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});
+
+/**
+ * Set whether a token is paused. A paused token may not send shocker control messages.
+ */
+export const tokensSetTokenPaused = <ThrowOnError extends boolean = true>(options: Options<TokensSetTokenPausedData, ThrowOnError>) => (options.client ?? client).patch<TokensSetTokenPausedResponses, TokensSetTokenPausedErrors, ThrowOnError, 'data'>({
+    responseStyle: 'data',
+    url: '/2/tokens/{tokenId}/paused',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});
+
 /**
  * Check if a username is available
  */
diff --git a/src/lib/api/internal/v2/transformers.gen.ts b/src/lib/api/internal/v2/transformers.gen.ts
index 4b300bfc..2fec6073 100644
--- a/src/lib/api/internal/v2/transformers.gen.ts
+++ b/src/lib/api/internal/v2/transformers.gen.ts
@@ -1,6 +1,48 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { UserSharesGetIncomingInvitesListResponse, UserSharesGetOutgoingInvitesListResponse, UserSharesGetSharesByUsersResponse, UserSharesRedeemInviteResponse } from './types.gen';
+import type { TokensCreateTokenV2Response, TokensGetTokenByIdV2Response, TokensListTokensV2Response, TokensSelfGetSelfTokenV2Response, UserSharesGetIncomingInvitesListResponse, UserSharesGetOutgoingInvitesListResponse, UserSharesGetSharesByUsersResponse, UserSharesRedeemInviteResponse } from './types.gen';
+
+const tokenResponseV2SchemaResponseTransformer = (data: any) => {
+    data.createdOn = Temporal.Instant.from(data.createdOn);
+    if (data.validUntil) {
+        data.validUntil = Temporal.Instant.from(data.validUntil);
+    }
+    if (data.lastUsed) {
+        data.lastUsed = Temporal.Instant.from(data.lastUsed);
+    }
+    return data;
+};
+
+export const tokensSelfGetSelfTokenV2ResponseTransformer = async (data: any): Promise<TokensSelfGetSelfTokenV2Response> => {
+    data = tokenResponseV2SchemaResponseTransformer(data);
+    return data;
+};
+
+export const tokensListTokensV2ResponseTransformer = async (data: any): Promise<TokensListTokensV2Response> => {
+    data = data.map((item: any) => tokenResponseV2SchemaResponseTransformer(item));
+    return data;
+};
+
+const tokenCreatedResponseV2SchemaResponseTransformer = (data: any) => {
+    data.createdAt = Temporal.Instant.from(data.createdAt);
+    if (data.validUntil) {
+        data.validUntil = Temporal.Instant.from(data.validUntil);
+    }
+    if (data.lastUsed) {
+        data.lastUsed = Temporal.Instant.from(data.lastUsed);
+    }
+    return data;
+};
+
+export const tokensCreateTokenV2ResponseTransformer = async (data: any): Promise<TokensCreateTokenV2Response> => {
+    data = tokenCreatedResponseV2SchemaResponseTransformer(data);
+    return data;
+};
+
+export const tokensGetTokenByIdV2ResponseTransformer = async (data: any): Promise<TokensGetTokenByIdV2Response> => {
+    data = tokenResponseV2SchemaResponseTransformer(data);
+    return data;
+};
 
 const userShareInfoSchemaResponseTransformer = (data: any) => {
     data.createdOn = Temporal.Instant.from(data.createdOn);
diff --git a/src/lib/api/internal/v2/types.gen.ts b/src/lib/api/internal/v2/types.gen.ts
index 3e394c60..d67ff2be 100644
--- a/src/lib/api/internal/v2/types.gen.ts
+++ b/src/lib/api/internal/v2/types.gen.ts
@@ -28,6 +28,10 @@ export type Control = {
     exclusive?: boolean;
 };
 
+export const ControlLimitMode = { Clamp: 'Clamp', Lerp: 'Lerp' } as const;
+
+export type ControlLimitMode = typeof ControlLimitMode[keyof typeof ControlLimitMode];
+
 export type ControlRequest = {
     shocks: Array<Control>;
     customName?: string | null;
@@ -47,10 +51,35 @@ export type CreateShareRequest = {
     user?: string | null;
 };
 
+export type CreateTokenRequestV2 = {
+    name: string;
+    permissions: Array<PermissionType>;
+    shockerControl: ShockerControlSettings;
+    validUntil?: Temporal.Instant | null;
+};
+
+export type DurationLimitSettings = {
+    min: number;
+    max: number;
+    mode?: ControlLimitMode;
+};
+
+export type EditTokenRequestV2 = {
+    name: string;
+    permissions: Array<PermissionType>;
+    shockerControl: ShockerControlSettings;
+};
+
 export type HubCreateRequest = {
     name: string;
 };
 
+export type IntensityLimitSettings = {
+    min: number;
+    max: number;
+    mode: ControlLimitMode;
+};
+
 export type LcgNodeResponseV2 = {
     host: string;
     port: number;
@@ -113,10 +142,25 @@ export type PauseUserShareShockersResponse = {
     };
 };
 
+export const PermissionType = {
+    ShockersUse: 'shockers.use',
+    ShockersEdit: 'shockers.edit',
+    ShockersPause: 'shockers.pause',
+    DevicesEdit: 'devices.edit',
+    DevicesAuth: 'devices.auth'
+} as const;
+
+export type PermissionType = typeof PermissionType[keyof typeof PermissionType];
+
 export type RemoveUserSharesResponse = {
     affectedRecords: number;
 };
 
+export type ReportTokensRequest = {
+    turnstileResponse: string;
+    secrets: Array<string>;
+};
+
 export const RoleType = {
     Support: 'Support',
     Staff: 'Staff',
@@ -126,6 +170,13 @@ export const RoleType = {
 
 export type RoleType = typeof RoleType[keyof typeof RoleType];
 
+export type SetTokenPausedRequest = {
+    /**
+     * When true, the token is paused and may not send shocker control messages.
+     */
+    paused: boolean;
+};
+
 export type ShareInviteBaseDetails = {
     id: string;
     createdAt: Temporal.Instant;
@@ -134,6 +185,18 @@ export type ShareInviteBaseDetails = {
     shockers: Array<ShockerPermLimitPairWithIdAndName>;
 };
 
+/**
+ * Per-token shocker control configuration: a toggle plus min/max limits for intensity and duration.
+ */
+export type ShockerControlSettings = {
+    /**
+     * When true, this token is paused and may not send shocker control messages.
+     */
+    paused: boolean;
+    intensity: IntensityLimitSettings;
+    duration: DurationLimitSettings;
+};
+
 export type ShockerLimits = {
     intensity: number | null;
     duration: number | null;
@@ -166,6 +229,34 @@ export type SignUpV2 = {
     turnstileResponse: string;
 };
 
+export type TokenCreatedResponseV2 = {
+    id: string;
+    name: string;
+    token: string;
+    createdAt: Temporal.Instant;
+    validUntil: Temporal.Instant | null;
+    lastUsed: Temporal.Instant | null;
+    permissions: Array<PermissionType>;
+    shockerControl: ShockerControlSettings;
+};
+
+export type TokenPausedResponse = {
+    /**
+     * The now-set paused state of the token.
+     */
+    paused: boolean;
+};
+
+export type TokenResponseV2 = {
+    id: string;
+    name: string;
+    createdOn: Temporal.Instant;
+    validUntil: Temporal.Instant | null;
+    lastUsed: Temporal.Instant | null;
+    permissions: Array<PermissionType>;
+    shockerControl: ShockerControlSettings;
+};
+
 export type UserShareInfo = {
     id: string;
     name: string;
@@ -237,6 +328,147 @@ export type OpenShockProblemWritable = {
     [key: string]: unknown;
 };
 
+export type TokensSelfGetSelfTokenV2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/2/tokens/self';
+};
+
+export type TokensSelfGetSelfTokenV2Responses = {
+    /**
+     * OK
+     */
+    200: TokenResponseV2;
+};
+
+export type TokensSelfGetSelfTokenV2Response = TokensSelfGetSelfTokenV2Responses[keyof TokensSelfGetSelfTokenV2Responses];
+
+export type TokensReportTokensData = {
+    body?: ReportTokensRequest;
+    path?: never;
+    query?: never;
+    url: '/2/tokens/report';
+};
+
+export type TokensReportTokensResponses = {
+    /**
+     * The tokens were deleted if found
+     */
+    200: unknown;
+};
+
+export type TokensListTokensV2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/2/tokens';
+};
+
+export type TokensListTokensV2Responses = {
+    /**
+     * All tokens for the current user
+     */
+    200: Array<TokenResponseV2>;
+};
+
+export type TokensListTokensV2Response = TokensListTokensV2Responses[keyof TokensListTokensV2Responses];
+
+export type TokensCreateTokenV2Data = {
+    body?: CreateTokenRequestV2;
+    path?: never;
+    query?: never;
+    url: '/2/tokens';
+};
+
+export type TokensCreateTokenV2Responses = {
+    /**
+     * The created token
+     */
+    200: TokenCreatedResponseV2;
+};
+
+export type TokensCreateTokenV2Response = TokensCreateTokenV2Responses[keyof TokensCreateTokenV2Responses];
+
+export type TokensGetTokenByIdV2Data = {
+    body?: never;
+    path: {
+        tokenId: string;
+    };
+    query?: never;
+    url: '/2/tokens/{tokenId}';
+};
+
+export type TokensGetTokenByIdV2Errors = {
+    /**
+     * The token does not exist or you do not have access to it.
+     */
+    404: OpenShockProblem;
+};
+
+export type TokensGetTokenByIdV2Error = TokensGetTokenByIdV2Errors[keyof TokensGetTokenByIdV2Errors];
+
+export type TokensGetTokenByIdV2Responses = {
+    /**
+     * The token
+     */
+    200: TokenResponseV2;
+};
+
+export type TokensGetTokenByIdV2Response = TokensGetTokenByIdV2Responses[keyof TokensGetTokenByIdV2Responses];
+
+export type TokensEditTokenV2Data = {
+    body?: EditTokenRequestV2;
+    path: {
+        tokenId: string;
+    };
+    query?: never;
+    url: '/2/tokens/{tokenId}';
+};
+
+export type TokensEditTokenV2Errors = {
+    /**
+     * The token does not exist or you do not have access to it.
+     */
+    404: OpenShockProblem;
+};
+
+export type TokensEditTokenV2Error = TokensEditTokenV2Errors[keyof TokensEditTokenV2Errors];
+
+export type TokensEditTokenV2Responses = {
+    /**
+     * The edited token
+     */
+    200: unknown;
+};
+
+export type TokensSetTokenPausedData = {
+    body?: SetTokenPausedRequest;
+    path: {
+        tokenId: string;
+    };
+    query?: never;
+    url: '/2/tokens/{tokenId}/paused';
+};
+
+export type TokensSetTokenPausedErrors = {
+    /**
+     * The token does not exist or you do not have access to it.
+     */
+    404: OpenShockProblem;
+};
+
+export type TokensSetTokenPausedError = TokensSetTokenPausedErrors[keyof TokensSetTokenPausedErrors];
+
+export type TokensSetTokenPausedResponses = {
+    /**
+     * The now-set paused state of the token.
+     */
+    200: TokenPausedResponse;
+};
+
+export type TokensSetTokenPausedResponse = TokensSetTokenPausedResponses[keyof TokensSetTokenPausedResponses];
+
 export type AccountCheckUsernameData = {
     body?: ChangeUsernameRequest;
     path?: never;
diff --git a/src/lib/components/ExpirationPicker.svelte b/src/lib/components/ExpirationPicker.svelte
index 37d8e0d7..fe3eb504 100644
--- a/src/lib/components/ExpirationPicker.svelte
+++ b/src/lib/components/ExpirationPicker.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { ZonedDateTime } from '@internationalized/date';
+  import { parseAbsoluteToLocal, type ZonedDateTime } from '@internationalized/date';
   import DateTimePicker from '$lib/components/datetime-picker/date-time-picker.svelte';
   import * as Select from '$lib/components/ui/select';
   import { GetValResColor } from '$lib/types/ValidationResult';
@@ -15,20 +15,13 @@
 
   const inDays = (days: number) => () => Temporal.Now.instant().add({ hours: days * 24 });
 
-  let customDate = $state<ZonedDateTime | undefined>(undefined);
-  let customInstant = $derived<Temporal.Instant | null>(
-    customDate !== undefined
-      ? Temporal.Instant.fromEpochMilliseconds(customDate.toDate().getTime())
-      : null
-  );
-
   const expirationOptions: {
     value: string;
     label: string;
     getInstant: () => Temporal.Instant | null;
   }[] = [
     { value: 'never', label: 'Never', getInstant: () => null },
-    { value: 'custom', label: 'Custom', getInstant: () => customInstant },
+    { value: 'custom', label: 'Custom', getInstant: () => instant },
     { value: '1days', label: '1 Day', getInstant: inDays(1) },
     { value: '7days', label: '7 Days', getInstant: inDays(7) },
     { value: '30days', label: '30 Days', getInstant: inDays(30) },
@@ -38,12 +31,24 @@
   ];
 
   let selectedExpiration = $derived(expirationOptions.find((o) => o.value === option));
+
+  // Presets derive the instant from the chosen option; 'custom' is driven directly by the
+  // date picker via the getter/setter below, so leave it untouched in that mode.
   $effect(() => {
-    instant = selectedExpiration?.getInstant() ?? null;
+    if (option !== 'custom') instant = selectedExpiration?.getInstant() ?? null;
   });
 
+  // The calendar widget speaks @internationalized/date; translate to/from Temporal at this
+  // single boundary so `instant` (Temporal) stays the source of truth.
+  function getCustomDate(): ZonedDateTime | undefined {
+    return instant ? parseAbsoluteToLocal(instant.toString()) : undefined;
+  }
+  function setCustomDate(date: ZonedDateTime | undefined) {
+    instant = date ? Temporal.Instant.fromEpochMilliseconds(date.toDate().getTime()) : null;
+  }
+
   let validationResult = $derived(
-    option === 'custom' && !customInstant
+    option === 'custom' && !instant
       ? { valid: false, message: 'Expire date is required' }
       : { valid: true }
   );
@@ -66,7 +71,7 @@
 
   {#if option === 'custom'}
     <div class="my-2 w-1/2">
-      <DateTimePicker bind:date={customDate} />
+      <DateTimePicker bind:date={getCustomDate, setCustomDate} />
     </div>
   {/if}
   {#if 'message' in validationResult}
diff --git a/src/routes/(app)/settings/api-tokens/+page.svelte b/src/routes/(app)/settings/api-tokens/+page.svelte
index 949910e4..6088b6b7 100644
--- a/src/routes/(app)/settings/api-tokens/+page.svelte
+++ b/src/routes/(app)/settings/api-tokens/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { tokensListTokens } from '$lib/api';
-  import type { TokenCreatedResponse, TokenResponse } from '$lib/api';
+  import { tokensListTokensV2 } from '$lib/api';
+  import type { TokenResponseV2 } from '$lib/api';
+  import { resolve } from '$app/paths';
   import Plus from '@lucide/svelte/icons/plus';
   import RotateCcw from '@lucide/svelte/icons/rotate-ccw';
   import type { SortingState } from '@tanstack/table-core';
@@ -8,6 +9,7 @@
   import Container from '$lib/components/Container.svelte';
   import {
     CreateActionsColumnDef,
+    CreateColumnDef,
     CreateSortableColumnDef,
     LocaleDateRenderer,
     RenderCell,
@@ -20,21 +22,19 @@
   import { onMount } from 'svelte';
   import { toast } from 'svelte-sonner';
   import DataTableActions from './data-table-actions.svelte';
-  import TokenCreateDialog from './dialog-token-create.svelte';
   import { registerBreadcrumbs } from '$lib/state/breadcrumbs-state.svelte';
-  import TokenCreatedDialog from './dialog-token-created.svelte';
 
   registerBreadcrumbs(() => [
     { label: 'Settings', href: '/settings/account' },
     { label: 'API Tokens' },
   ]);
 
-  let tokens = $state<TokenResponse[]>([]);
+  let tokens = $state<TokenResponseV2[]>([]);
   let sorting = $state<SortingState>([]);
 
   async function loadTokens(): Promise<boolean> {
     try {
-      tokens = await tokensListTokens();
+      tokens = await tokensListTokensV2();
       return true;
     } catch (error) {
       await handleApiError(error);
@@ -42,20 +42,7 @@
     }
   }
 
-  function onCreated(token: TokenCreatedResponse) {
-    tokens.push({
-      id: token.id,
-      name: token.name,
-      createdOn: token.createdAt,
-      validUntil: token.validUntil,
-      lastUsed: token.lastUsed,
-      permissions: token.permissions,
-    });
-    createdTokenSecret = token.token;
-    toast.success('Token created successfully');
-  }
-
-  function onEdit(id: string, updater: (token: TokenResponse) => TokenResponse) {
+  function onEdit(id: string, updater: (token: TokenResponseV2) => TokenResponseV2) {
     const idx = tokens.findIndex((t) => t.id === id);
     if (idx !== -1) tokens[idx] = updater(tokens[idx]);
   }
@@ -64,17 +51,19 @@
     tokens = tokens.filter((t) => t.id !== id);
   }
 
-  const columns: ColumnDef<TokenResponse>[] = [
+  const columns: ColumnDef<TokenResponseV2>[] = [
     CreateSortableColumnDef('name', 'Name', RenderCell),
+    CreateColumnDef('shockerControl', 'Status', (sc) =>
+      sc.paused
+        ? { text: 'Paused', bold: true, color: 'orange' }
+        : { text: 'Active', bold: true, color: 'green' }
+    ),
     CreateSortableColumnDef('createdOn', 'Created at', LocaleDateRenderer),
     CreateSortableColumnDef('validUntil', 'Expires at', TimeSinceRelativeOrNeverRenderer),
     CreateSortableColumnDef('lastUsed', 'Last used', TimeSinceRelativeOrNeverRenderer),
     CreateActionsColumnDef(DataTableActions, (token) => ({ token, onEdit, onDeleted })),
   ];
 
-  let showGenerateTokenModal = $state<boolean>(false);
-  let createdTokenSecret = $state<string | null>(null);
-
   async function refresh() {
     if (await loadTokens()) {
       toast.success('Tokens refreshed successfully');
@@ -84,15 +73,12 @@
   onMount(loadTokens);
 </script>
 
-<TokenCreateDialog bind:open={showGenerateTokenModal} {onCreated} />
-<TokenCreatedDialog bind:token={createdTokenSecret} />
-
 <Container>
   <Card.Header class="w-full">
     <Card.Title class="flex items-center justify-between space-x-2 text-3xl">
       API Tokens
       <div>
-        <Button onclick={() => (showGenerateTokenModal = true)}>
+        <Button href={resolve('/settings/api-tokens/new')}>
           <Plus />
           Generate Token
         </Button>
diff --git a/src/routes/(app)/settings/api-tokens/data-table-actions.svelte b/src/routes/(app)/settings/api-tokens/data-table-actions.svelte
index 61acfb1d..ddc56b82 100644
--- a/src/routes/(app)/settings/api-tokens/data-table-actions.svelte
+++ b/src/routes/(app)/settings/api-tokens/data-table-actions.svelte
@@ -1,37 +1,105 @@
 <script lang="ts">
-  import type { TokenResponse } from '$lib/api';
+  import { tokenDeleteDeleteToken, tokensSetTokenPaused } from '$lib/api';
+  import type { TokenResponseV2 } from '$lib/api';
+  import { dialog } from '$lib/components/dialog-manager/dialog-store.svelte';
+  import type { DialogRenderProps } from '$lib/components/dialog-manager/types';
   import TableActionMenu from '$lib/components/TableActionMenu.svelte';
+  import { buttonVariants } from '$lib/components/ui/button';
   import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
+  import * as Tooltip from '$lib/components/ui/tooltip';
+  import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
+  import { cn } from '$lib/utils';
   import { copyToClipboard } from '$lib/utils/clipboard.svelte';
-  import TokenDeleteDialog from './dialog-token-delete.svelte';
-  import TokenEditDialog from './dialog-token-edit.svelte';
+  import Pause from '@lucide/svelte/icons/pause';
+  import Play from '@lucide/svelte/icons/play';
+  import { toast } from 'svelte-sonner';
+  import TokenEditDialog, { type TokenEditResult } from './dialog-token-edit.svelte';
 
   interface Props {
-    token: TokenResponse;
-    onEdit: (id: string, updater: (token: TokenResponse) => TokenResponse) => void;
+    token: TokenResponseV2;
+    onEdit: (id: string, updater: (token: TokenResponseV2) => TokenResponseV2) => void;
     onDeleted: (id: string) => void;
   }
 
   let { token, onEdit, onDeleted }: Props = $props();
 
-  let editDialogOpen = $state<boolean>(false);
-  let deleteDialogOpen = $state<boolean>(false);
-
   const copyId = () => copyToClipboard(token.id, 'ID copied to clipboard');
 
-  function openDeleteDialog() {
-    deleteDialogOpen = true;
-    console.log('Delete dialog opened for token:', $state.snapshot(token));
+  async function togglePaused() {
+    const paused = !token.shockerControl.paused;
+    try {
+      const result = await tokensSetTokenPaused({
+        path: { tokenId: token.id },
+        body: { paused },
+      });
+      onEdit(token.id, (t) => ({
+        ...t,
+        shockerControl: { ...t.shockerControl, paused: result.paused },
+      }));
+      toast.success(result.paused ? 'Token paused' : 'Token resumed');
+    } catch (error) {
+      await handleApiError(error);
+    }
+  }
+
+  async function openEditDialog() {
+    const result = await dialog.open<void, TokenEditResult | undefined>({
+      contentSnippet: editSnippet,
+    });
+    if (!result) return;
+    onEdit(token.id, (t) => ({ ...t, ...result }));
+  }
+
+  async function openDeleteDialog() {
+    const result = await dialog.confirm({
+      title: 'Delete API token',
+      confirmButtonText: 'Delete',
+      data: token,
+      descSnippet: deleteDescSnippet,
+    });
+    if (!result.confirmed) return;
+    try {
+      await tokenDeleteDeleteToken({ path: { tokenId: token.id } });
+      onDeleted(token.id);
+      toast.success('Token deleted successfully');
+    } catch (error) {
+      await handleApiError(error);
+    }
   }
 </script>
 
-<TokenEditDialog open={editDialogOpen} {token} {onEdit} />
-<TokenDeleteDialog open={deleteDialogOpen} {token} {onDeleted} />
+{#snippet editSnippet(props: DialogRenderProps<void, TokenEditResult | undefined>)}
+  <TokenEditDialog {token} resolve={props.resolve} close={props.close} />
+{/snippet}
+
+{#snippet deleteDescSnippet(t: TokenResponseV2)}
+  Are you sure you want to delete <strong>{t.name}</strong>?<br />
+  This action cannot be undone. This will permanently delete the token.
+{/snippet}
+
+<div class="flex items-center justify-end gap-1">
+  <Tooltip.Root>
+    <Tooltip.Trigger
+      class={cn('size-9', buttonVariants({ variant: 'ghost', size: 'icon' }))}
+      onclick={togglePaused}
+    >
+      {#if token.shockerControl.paused}
+        <Play />
+      {:else}
+        <Pause />
+      {/if}
+    </Tooltip.Trigger>
+    <Tooltip.Content>
+      <p>{token.shockerControl.paused ? 'Resume token' : 'Pause token'}</p>
+    </Tooltip.Content>
+  </Tooltip.Root>
 
-<TableActionMenu>
-  <DropdownMenu.Item class="cursor-pointer" onclick={copyId}>Copy ID</DropdownMenu.Item>
-  <DropdownMenu.Item class="cursor-pointer" onclick={() => (editDialogOpen = true)}>
-    Edit
-  </DropdownMenu.Item>
-  <DropdownMenu.Item class="cursor-pointer" onclick={openDeleteDialog}>Delete</DropdownMenu.Item>
-</TableActionMenu>
+  <TableActionMenu>
+    <DropdownMenu.Item class="cursor-pointer" onclick={copyId}>Copy ID</DropdownMenu.Item>
+    <DropdownMenu.Item class="cursor-pointer" onclick={togglePaused}>
+      {token.shockerControl.paused ? 'Resume' : 'Pause'}
+    </DropdownMenu.Item>
+    <DropdownMenu.Item class="cursor-pointer" onclick={openEditDialog}>Edit</DropdownMenu.Item>
+    <DropdownMenu.Item class="cursor-pointer" onclick={openDeleteDialog}>Delete</DropdownMenu.Item>
+  </TableActionMenu>
+</div>
diff --git a/src/routes/(app)/settings/api-tokens/dialog-token-create.svelte b/src/routes/(app)/settings/api-tokens/dialog-token-create.svelte
deleted file mode 100644
index 2dcaed52..00000000
--- a/src/routes/(app)/settings/api-tokens/dialog-token-create.svelte
+++ /dev/null
@@ -1,123 +0,0 @@
-<script lang="ts" module>
-  import { PermissionType, tokensCreateToken } from '$lib/api';
-  import type { TokenCreatedResponse } from '$lib/api';
-  import type { ValidationResult } from '$lib/types/ValidationResult';
-
-  type PermissionCategory = {
-    name: string;
-    perms: { name: string; key: string }[];
-  };
-
-  const permissionCategories = Object.values(PermissionType).reduce(
-    (acc: PermissionCategory[], v) => {
-      const [category, perm] = v.split('.');
-      const cat = acc.find((c) => c.name === category);
-      if (cat) {
-        cat.perms.push({ name: perm, key: v });
-      } else {
-        acc.push({ name: category, perms: [{ name: perm, key: v }] });
-      }
-      return acc;
-    },
-    []
-  );
-
-  function nameValidation(name: string): ValidationResult {
-    if (name.length === 0) {
-      return { valid: false, message: 'Name is required' };
-    }
-
-    if (name.length > 32) {
-      return { valid: false, message: 'Name is too long' };
-    }
-
-    return { valid: true };
-  }
-
-  function capitalizeFirstLetter(string: string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  }
-</script>
-
-<script lang="ts">
-  import ExpirationPicker from '$lib/components/ExpirationPicker.svelte';
-  import TextInput from '$lib/components/input/TextInput.svelte';
-  import Button from '$lib/components/ui/button/button.svelte';
-  import * as Dialog from '$lib/components/ui/dialog';
-  import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
-
-  interface Props {
-    open: boolean;
-    onCreated: (token: TokenCreatedResponse) => void;
-  }
-
-  let { open = $bindable(), onCreated }: Props = $props();
-
-  let name = $state<string>('');
-  let expire = $state('never');
-  let expireInstant = $state<Temporal.Instant | null>(null);
-  let permissions = $state<PermissionType[]>([PermissionType.ShockersUse]);
-
-  function onOpenChange(o: boolean) {
-    // Stupid hack because when this dialog closes its state is never cleared... ._.
-    if (!o) {
-      name = '';
-      expire = 'never';
-
-      permissions = [PermissionType.ShockersUse];
-    }
-    open = o;
-  }
-
-  let nameValidationResult = $derived(nameValidation(name));
-
-  async function onFormSubmit() {
-    try {
-      const createdToken = await tokensCreateToken({
-        body: { name, validUntil: expireInstant, permissions },
-      });
-      onCreated(createdToken);
-      open = false;
-      onOpenChange(false);
-    } catch (error) {
-      await handleApiError(error);
-    }
-  }
-</script>
-
-<Dialog.Root bind:open={() => open, onOpenChange}>
-  <Dialog.Content>
-    <Dialog.Header>
-      <Dialog.Title>New API Token</Dialog.Title>
-      <Dialog.Description
-        >Please make sure to select the appropriate permissions for the token.</Dialog.Description
-      >
-    </Dialog.Header>
-    <form class="modal-form border-surface-500 rounded-container-token space-y-4">
-      <TextInput
-        label="Token Name"
-        placeholder="Token name..."
-        bind:value={name}
-        validationResult={nameValidationResult}
-      />
-
-      <ExpirationPicker bind:option={expire} bind:instant={expireInstant} />
-
-      <div class="mt-4">
-        <h2>Permissions</h2>
-        <div class="border-surface-500 mt-3 flex flex-col space-y-4 rounded-md border p-4">
-          {#each permissionCategories as permission (permission.name)}
-            <span>{capitalizeFirstLetter(permission.name)}</span>
-            {#each permission.perms as perm (perm.key)}
-              <label class="mt-0! ml-4">
-                <input type="checkbox" class="checkbox" value={perm.key} bind:group={permissions} />
-                {capitalizeFirstLetter(perm.name)}
-              </label>
-            {/each}
-          {/each}
-        </div>
-      </div>
-    </form>
-    <Button onclick={onFormSubmit}>Generate</Button>
-  </Dialog.Content>
-</Dialog.Root>
diff --git a/src/routes/(app)/settings/api-tokens/dialog-token-created.svelte b/src/routes/(app)/settings/api-tokens/dialog-token-created.svelte
deleted file mode 100644
index d90f353d..00000000
--- a/src/routes/(app)/settings/api-tokens/dialog-token-created.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts">
-  import KeyRound from '@lucide/svelte/icons/key-round';
-  import CopyInput from '$lib/components/CopyInput.svelte';
-  import * as Dialog from '$lib/components/ui/dialog';
-
-  interface Props {
-    token: string | null;
-  }
-
-  let { token = $bindable() }: Props = $props();
-
-  function onOpenChanged(open: boolean) {
-    if (!open) {
-      token = null;
-    }
-  }
-</script>
-
-<Dialog.Root bind:open={() => token !== null, onOpenChanged}>
-  <Dialog.Content>
-    <Dialog.Header>
-      <Dialog.Title>API Token Generated</Dialog.Title>
-      <Dialog.Description>
-        Please copy your API Token now, you will not be able to view it again later!
-      </Dialog.Description>
-    </Dialog.Header>
-    <div class="flex flex-col items-center space-y-4">
-      <div class="flex w-full items-center justify-between rounded-md p-2">
-        <CopyInput value={token!}>
-          {#snippet icon()}
-            <KeyRound size="20" />
-          {/snippet}
-        </CopyInput>
-      </div>
-    </div>
-  </Dialog.Content>
-</Dialog.Root>
diff --git a/src/routes/(app)/settings/api-tokens/dialog-token-delete.svelte b/src/routes/(app)/settings/api-tokens/dialog-token-delete.svelte
deleted file mode 100644
index df49dbaa..00000000
--- a/src/routes/(app)/settings/api-tokens/dialog-token-delete.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script lang="ts">
-  import { tokenDeleteDeleteToken } from '$lib/api';
-  import type { TokenResponse } from '$lib/api';
-  import ConfirmDeleteDialog from '$lib/components/ConfirmDeleteDialog.svelte';
-  import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
-  import { toast } from 'svelte-sonner';
-
-  interface Props {
-    open: boolean;
-    token: TokenResponse;
-    onDeleted: (id: string) => void;
-  }
-
-  let { open = $bindable(), token, onDeleted }: Props = $props();
-
-  async function deleteToken() {
-    try {
-      await tokenDeleteDeleteToken({ path: { tokenId: token.id } });
-      onDeleted(token.id);
-      toast.success('Token deleted successfully');
-      open = false;
-    } catch (error) {
-      await handleApiError(error);
-    }
-  }
-</script>
-
-<ConfirmDeleteDialog bind:open title="Delete API token" onConfirm={deleteToken}>
-  {#snippet description()}
-    Are you sure you want to delete <strong>{token?.name}</strong>?<br />
-    This action cannot be undone. This will permanently delete the token.
-  {/snippet}
-</ConfirmDeleteDialog>
diff --git a/src/routes/(app)/settings/api-tokens/dialog-token-edit.svelte b/src/routes/(app)/settings/api-tokens/dialog-token-edit.svelte
index 25e01c52..a45b03cc 100644
--- a/src/routes/(app)/settings/api-tokens/dialog-token-edit.svelte
+++ b/src/routes/(app)/settings/api-tokens/dialog-token-edit.svelte
@@ -1,40 +1,46 @@
 <script lang="ts">
-  import { PermissionType, tokensEditToken } from '$lib/api';
-  import type { TokenResponse } from '$lib/api';
+  import { PermissionType, tokensEditTokenV2 } from '$lib/api';
+  import type { ShockerControlSettings, TokenResponseV2 } from '$lib/api';
+  import type { DialogContentProps } from '$lib/components/dialog-manager/types';
   import TextInput from '$lib/components/input/TextInput.svelte';
   import Button from '$lib/components/ui/button/button.svelte';
   import * as Dialog from '$lib/components/ui/dialog';
   import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
   import type { ValidationResult } from '$lib/types/ValidationResult';
   import { toast } from 'svelte-sonner';
+  import ShockerControlSettingsEditor from './shocker-control-settings.svelte';
 
-  interface Props {
-    open: boolean;
-    token: TokenResponse;
-    onEdit: (id: string, updater: (token: TokenResponse) => TokenResponse) => void;
+  export type TokenEditResult = Pick<TokenResponseV2, 'name' | 'permissions' | 'shockerControl'>;
+
+  interface Props extends DialogContentProps<TokenEditResult | undefined> {
+    token: TokenResponseV2;
   }
 
-  let { open = $bindable(), token, onEdit }: Props = $props();
+  let { token, resolve }: Props = $props();
 
   // svelte-ignore state_referenced_locally
   let name = $state(token.name);
   // svelte-ignore state_referenced_locally
   let permissions = $state(token.permissions);
+  let shockerControl = $state<ShockerControlSettings>(
+    // svelte-ignore state_referenced_locally
+    structuredClone($state.snapshot(token.shockerControl))
+  );
+  let submitting = $state(false);
 
   async function saveChanges() {
+    submitting = true;
     try {
-      await tokensEditToken({ path: { tokenId: token.id }, body: { name, permissions } });
-      onEdit(token.id, (token) => {
-        return {
-          ...token,
-          name,
-          permissions,
-        };
+      await tokensEditTokenV2({
+        path: { tokenId: token.id },
+        body: { name, permissions, shockerControl },
       });
       toast.success('Token edited successfully');
-      open = false;
+      resolve({ name, permissions, shockerControl });
     } catch (error) {
       await handleApiError(error);
+    } finally {
+      submitting = false;
     }
   }
 
@@ -72,43 +78,52 @@
   let nameValidationResult = $derived(nameValidation(name));
 </script>
 
-<Dialog.Root bind:open>
-  <Dialog.Content>
-    <Dialog.Header>
-      <Dialog.Title>Edit API Token</Dialog.Title>
-      <Dialog.Description></Dialog.Description>
-    </Dialog.Header>
-    <form class="modal-form border-surface-500 rounded-container-token space-y-4">
-      <TextInput
-        label="Token Name"
-        placeholder="Token name..."
-        bind:value={name}
-        validationResult={nameValidationResult}
-      />
+<div class="max-h-[80vh] space-y-4 overflow-y-auto pr-1">
+  <Dialog.Header>
+    <Dialog.Title>Edit API Token</Dialog.Title>
+    <Dialog.Description></Dialog.Description>
+  </Dialog.Header>
+  <form class="modal-form border-surface-500 rounded-container-token space-y-4">
+    <TextInput
+      label="Token Name"
+      placeholder="Token name..."
+      bind:value={name}
+      validationResult={nameValidationResult}
+    />
 
-      <div class="mt-4">
-        <h2>Permissions</h2>
-        <div class="border-surface-500 mt-3 flex flex-col space-y-4 rounded-md border p-4">
-          {#each permissionCategories as permission (permission.name)}
-            <span class="capitalize">{permission.name}</span>
-            {#each permission.perms as perm (perm.key)}
-              <label class="mt-0! ml-4">
-                <input
-                  type="checkbox"
-                  class="checkbox capitalize"
-                  value={perm.key}
-                  bind:group={permissions}
-                />
-                {perm.name}
-              </label>
-            {/each}
+    <div class="mt-4">
+      <h2>Permissions</h2>
+      <div class="border-surface-500 mt-3 flex flex-col space-y-4 rounded-md border p-4">
+        {#each permissionCategories as permission (permission.name)}
+          <span class="capitalize">{permission.name}</span>
+          {#each permission.perms as perm (perm.key)}
+            <label class="mt-0! ml-4">
+              <input
+                type="checkbox"
+                class="checkbox capitalize"
+                value={perm.key}
+                bind:group={permissions}
+              />
+              {perm.name}
+            </label>
           {/each}
-        </div>
+        {/each}
+      </div>
+    </div>
+
+    <div class="mt-4">
+      <h2>Shocker Control</h2>
+      <div class="mt-3">
+        <ShockerControlSettingsEditor bind:settings={shockerControl} />
       </div>
-    </form>
+    </div>
+  </form>
 
-    <Button variant="default" onclick={saveChanges} disabled={!nameValidationResult.valid}>
-      Save Changes
-    </Button>
-  </Dialog.Content>
-</Dialog.Root>
+  <Button
+    variant="default"
+    onclick={saveChanges}
+    disabled={submitting || !nameValidationResult.valid}
+  >
+    Save Changes
+  </Button>
+</div>
diff --git a/src/routes/(app)/settings/api-tokens/new/+page.svelte b/src/routes/(app)/settings/api-tokens/new/+page.svelte
index 4f9daee2..a110c171 100644
--- a/src/routes/(app)/settings/api-tokens/new/+page.svelte
+++ b/src/routes/(app)/settings/api-tokens/new/+page.svelte
@@ -1,16 +1,59 @@
+<script lang="ts" module>
+  import { PermissionType } from '$lib/api';
+  import type { ValidationResult } from '$lib/types/ValidationResult';
+
+  type PermissionCategory = {
+    name: string;
+    perms: { name: string; key: string }[];
+  };
+
+  const permissionCategories = Object.values(PermissionType).reduce(
+    (acc: PermissionCategory[], v) => {
+      const [category, perm] = v.split('.');
+      const cat = acc.find((c) => c.name === category);
+      if (cat) {
+        cat.perms.push({ name: perm, key: v });
+      } else {
+        acc.push({ name: category, perms: [{ name: perm, key: v }] });
+      }
+      return acc;
+    },
+    []
+  );
+
+  function nameValidation(name: string): ValidationResult {
+    if (name.length === 0) return { valid: false, message: 'Name is required' };
+    if (name.length > 32) return { valid: false, message: 'Name is too long' };
+    return { valid: true };
+  }
+
+  function capitalizeFirstLetter(s: string) {
+    return s.charAt(0).toUpperCase() + s.slice(1);
+  }
+</script>
+
 <script lang="ts">
   import { resolve } from '$app/paths';
-  import { PermissionType, tokensCreateToken } from '$lib/api';
+  import { page } from '$app/state';
+  import { ControlLimitMode, tokensCreateTokenV2 } from '$lib/api';
+  import type { ShockerControlSettings } from '$lib/api';
+  import Container from '$lib/components/Container.svelte';
+  import CopyInput from '$lib/components/CopyInput.svelte';
+  import ExpirationPicker from '$lib/components/ExpirationPicker.svelte';
+  import TextInput from '$lib/components/input/TextInput.svelte';
   import LoadingCircle from '$lib/components/svg/LoadingCircle.svelte';
   import Button from '$lib/components/ui/button/button.svelte';
   import * as Card from '$lib/components/ui/card/index.js';
-  import { onMount } from 'svelte';
-  import { toast } from 'svelte-sonner';
-  import type { QueryParamsType } from './queryParamsType';
-  import { page } from '$app/state';
-  import { browser } from '$app/environment';
+  import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
   import { registerBreadcrumbs } from '$lib/state/breadcrumbs-state.svelte';
-  import Container from '$lib/components/Container.svelte';
+  import CircleCheck from '@lucide/svelte/icons/circle-check';
+  import KeyRound from '@lucide/svelte/icons/key-round';
+  import { toast } from 'svelte-sonner';
+  import ShockerControlSettingsEditor, {
+    defaultShockerControl,
+    durationRange,
+    intensityRange,
+  } from '../shocker-control-settings.svelte';
 
   registerBreadcrumbs(() => [
     { label: 'Settings', href: '/settings/account' },
@@ -18,164 +61,251 @@
     { label: 'New' },
   ]);
 
-  let windowQueryParams = $state<
-    | QueryParamsType
-    | {
-        error: string;
-      }
-  >({
-    error: 'Loading...',
-  });
+  // Form state (prefilled from query params, then freely editable).
+  let name = $state('');
+  let expire = $state('never');
+  let expireInstant = $state<Temporal.Instant | null>(null);
+  let permissions = $state<PermissionType[]>([]);
+  let shockerControl = $state<ShockerControlSettings>(defaultShockerControl());
 
-  let creatingToken = $state(false);
+  // External-request context.
+  let redirectUri = $state<string | null>(null);
+  let parseError = $state<string | null>(null);
+
+  let creating = $state(false);
   let tokenSecret = $state<string | null>(null);
 
-  function getQueryParams():
-    | QueryParamsType
-    | {
-        error: string;
-      } {
-    if (!browser) {
-      throw new Error('getQueryParams can only be called in the browser');
-    }
+  let isExternal = $derived(redirectUri !== null);
+  let nameValidationResult = $derived(nameValidation(name));
+
+  function clampInt(value: string | null, min: number, max: number, fallback: number): number {
+    if (value === null) return fallback;
+    const n = Number(value);
+    if (!Number.isFinite(n)) return fallback;
+    return Math.min(max, Math.max(min, Math.round(n)));
+  }
 
+  function parseMode(value: string | null, fallback: ControlLimitMode): ControlLimitMode {
+    if (value === ControlLimitMode.Lerp) return ControlLimitMode.Lerp;
+    if (value === ControlLimitMode.Clamp) return ControlLimitMode.Clamp;
+    return fallback;
+  }
+
+  function parseQueryParams() {
     const params = page.url.searchParams;
 
-    const name = params.get('name');
-    const redirectUri = params.get('redirect_uri');
-    const permissions = params.get('permissions');
+    redirectUri = params.get('redirect_uri');
+    const external = redirectUri !== null;
 
-    if (!name || !redirectUri || !permissions) {
-      return {
-        error:
-          'Required get parameters are missing. Make sure name, redirect_uri, and permissions are provided.',
-      };
-    }
+    const qName = params.get('name');
+    const qPermissions = params.get('permissions');
 
-    const permissionsArray = permissions.split(',');
-    if (permissionsArray.length === 0) {
-      return {
-        error: 'Permissions cannot be empty',
-      };
+    // An external request must declare what it wants.
+    if (external && (!qName || !qPermissions)) {
+      parseError =
+        'Required get parameters are missing. Make sure name, redirect_uri, and permissions are provided.';
+      return;
     }
 
-    let invalidPermissions: string[] = [];
+    if (qName) name = qName;
 
-    permissionsArray.forEach((p) => {
-      if (!Object.values(PermissionType).includes(p as PermissionType)) {
-        invalidPermissions.push(p);
+    if (qPermissions) {
+      const requested = qPermissions.split(',').filter(Boolean);
+      const invalid = requested.filter(
+        (p) => !Object.values(PermissionType).includes(p as PermissionType)
+      );
+      if (invalid.length > 0) {
+        parseError = `Invalid permissions provided: ${invalid.join(', ')}`;
+        return;
       }
-    });
+      permissions = requested as PermissionType[];
+    } else if (!external) {
+      // Sensible default for the in-app self-service flow.
+      permissions = [PermissionType.ShockersUse];
+    }
 
-    if (invalidPermissions.length > 0) {
-      return {
-        error: `Invalid permissions provided: ${invalidPermissions.join(', ')}`,
-      };
+    const qExpiration = params.get('expiration');
+    if (qExpiration) {
+      try {
+        expireInstant = Temporal.Instant.from(qExpiration);
+        expire = 'custom';
+      } catch {
+        // Invalid datetime, leave the default ('never').
+      }
     }
 
-    return {
-      name: name,
-      redirectUri: redirectUri,
-      permissions: permissionsArray.map((p) => p as PermissionType),
-    };
+    const sc = defaultShockerControl();
+    const i = intensityRange;
+    const d = durationRange;
+    sc.intensity.min = clampInt(params.get('intensity_min'), i.min, i.max, sc.intensity.min);
+    sc.intensity.max = clampInt(params.get('intensity_max'), i.min, i.max, sc.intensity.max);
+    if (sc.intensity.min > sc.intensity.max) {
+      [sc.intensity.min, sc.intensity.max] = [sc.intensity.max, sc.intensity.min];
+    }
+    sc.intensity.mode = parseMode(params.get('intensity_mode'), sc.intensity.mode);
+    sc.duration.min = clampInt(params.get('duration_min'), d.min, d.max, sc.duration.min);
+    sc.duration.max = clampInt(params.get('duration_max'), d.min, d.max, sc.duration.max);
+    if (sc.duration.min > sc.duration.max) {
+      [sc.duration.min, sc.duration.max] = [sc.duration.max, sc.duration.min];
+    }
+    sc.duration.mode = parseMode(
+      params.get('duration_mode'),
+      sc.duration.mode ?? ControlLimitMode.Clamp
+    );
+    shockerControl = sc;
   }
 
-  function allowRequest() {
-    const params = windowQueryParams as QueryParamsType;
-
-    creatingToken = true;
-
-    tokensCreateToken({
-      body: { name: params.name, permissions: params.permissions as PermissionType[] },
-    })
-      .then((response) => {
-        tokenSecret = response.token;
-        openUrl();
-      })
-      .catch((error) => {
-        // Handle error in token creation, e.g., show an error message
-        console.error('Error creating token:', error);
-        toast.error('Failed to create token');
+  async function createToken() {
+    if (!nameValidationResult.valid) return;
+    creating = true;
+    try {
+      const response = await tokensCreateTokenV2({
+        body: { name, validUntil: expireInstant, permissions, shockerControl },
       });
-  }
-
-  function openUrl() {
-    if (!tokenSecret) {
-      console.error('Token secret is not available');
-      toast.error('Token secret is not available');
-      return;
-    }
-
-    if (!windowQueryParams) {
-      console.error('Redirect URI is not available');
-      toast.error('Redirect URI is not available');
-      return;
+      tokenSecret = response.token;
+      toast.success('Token created successfully');
+      if (isExternal) redirectBack();
+    } catch (error) {
+      await handleApiError(error);
+    } finally {
+      creating = false;
     }
+  }
 
-    const redirectUriReplaced = (windowQueryParams as QueryParamsType).redirectUri.replace(
-      '%',
-      tokenSecret
-    );
-
-    console.log('Redirecting to:', redirectUriReplaced);
-    window.location.href = redirectUriReplaced;
+  function redirectBack() {
+    if (!tokenSecret || !redirectUri) return;
+    const target = redirectUri.replace('%', tokenSecret);
+    window.location.href = target;
   }
 
-  onMount(() => {
-    windowQueryParams = getQueryParams();
-  });
+  // Parse query params at init so child pickers receive the prefilled values immediately.
+  parseQueryParams();
 </script>
 
-<Container class="items-center justify-center">
-  <Card.Root class="w-lg max-w-2xl">
-    {#if 'error' in windowQueryParams}
+<Container class="items-center-safe justify-center-safe overflow-y-auto">
+  <Card.Root class="w-lg max-w-2xl shrink-0">
+    {#if parseError}
       <Card.Header>
         <Card.Title class="text-2xl">API Token Request</Card.Title>
       </Card.Header>
       <Card.Content>
-        <span class="text-red-500">
-          {windowQueryParams.error}
+        <span class="text-red-500">{parseError}</span>
+      </Card.Content>
+    {:else if tokenSecret && isExternal}
+      <Card.Header>
+        <Card.Title class="flex items-center gap-2 text-2xl">
+          <CircleCheck class="text-green-500" />
+          Access granted
+        </Card.Title>
+        <Card.Description>
+          The token has been created and shared with the application. Redirecting you back to<br />
+          <b>{redirectUri}</b>
+        </Card.Description>
+      </Card.Header>
+      <Card.Content>
+        <span class="text-muted-foreground text-sm">
+          If you are not redirected automatically, use the button below.
         </span>
       </Card.Content>
+      <Card.Footer class="flex justify-end space-x-2">
+        <Button variant="outline" onclick={redirectBack}>Retry</Button>
+        <Button href={resolve('/settings/api-tokens')}>Finish</Button>
+      </Card.Footer>
+    {:else if tokenSecret}
+      <Card.Header>
+        <Card.Title class="flex items-center gap-2 text-2xl">
+          <CircleCheck class="text-green-500" />
+          API Token Generated
+        </Card.Title>
+        <Card.Description>
+          Please copy your API Token now, you will not be able to view it again later!
+        </Card.Description>
+      </Card.Header>
+      <Card.Content class="flex flex-col space-y-4">
+        <CopyInput value={tokenSecret}>
+          {#snippet icon()}
+            <KeyRound size="20" />
+          {/snippet}
+        </CopyInput>
+      </Card.Content>
+      <Card.Footer class="flex justify-end">
+        <Button href={resolve('/settings/api-tokens')}>Done</Button>
+      </Card.Footer>
     {:else}
       <Card.Header>
-        <Card.Title class="text-2xl">API Token Request</Card.Title>
-        <Card.Description
-          >An external application is requesting access to your account. Please review the
-          permissions it is requesting before allowing access</Card.Description
-        >
+        <Card.Title class="text-2xl">
+          {isExternal ? 'API Token Request' : 'New API Token'}
+        </Card.Title>
+        <Card.Description>
+          {#if isExternal}
+            An external application is requesting access to your account. Review and adjust the
+            permissions below before allowing access.
+          {:else}
+            Configure and generate a new API token for your account.
+          {/if}
+        </Card.Description>
       </Card.Header>
       <Card.Content class="flex flex-col space-y-4">
-        <span>
-          <b>{windowQueryParams.name}</b> is requesting an API Token with the following permissions:
-        </span>
-        <ul class="list-disc pl-5">
-          {#each windowQueryParams.permissions as permission (permission)}
-            <li>{permission}</li>
-          {/each}
-        </ul>
-        <span class="mt-4">
-          Your token will be shared with the application at<br /><b
-            >{windowQueryParams.redirectUri}</b
-          ></span
-        >
+        {#if isExternal}
+          <span>
+            <b>{name}</b> is requesting an API Token. Your token will be shared with the application
+            at<br /><b>{redirectUri}</b>
+          </span>
+        {/if}
+
+        <TextInput
+          label="Token Name"
+          placeholder="Token name..."
+          bind:value={name}
+          validationResult={nameValidationResult}
+        />
+
+        <ExpirationPicker bind:option={expire} bind:instant={expireInstant} />
+
+        <div>
+          <h2>Permissions</h2>
+          <div class="border-surface-500 mt-3 flex flex-col space-y-4 rounded-md border p-4">
+            {#each permissionCategories as permission (permission.name)}
+              <span>{capitalizeFirstLetter(permission.name)}</span>
+              {#each permission.perms as perm (perm.key)}
+                <label class="mt-0! ml-4">
+                  <input
+                    type="checkbox"
+                    class="checkbox"
+                    value={perm.key}
+                    bind:group={permissions}
+                  />
+                  {capitalizeFirstLetter(perm.name)}
+                </label>
+              {/each}
+            {/each}
+          </div>
+        </div>
+
+        <div>
+          <h2>Shocker Control</h2>
+          <div class="mt-3">
+            <ShockerControlSettingsEditor bind:settings={shockerControl} />
+          </div>
+        </div>
       </Card.Content>
       <Card.Footer class="flex justify-end space-x-2">
         <Button
-          class="m-w-16"
-          onclick={allowRequest}
-          disabled={creatingToken && !tokenSecret}
+          onclick={createToken}
+          disabled={creating || !nameValidationResult.valid}
           color="yellow"
         >
-          {#if tokenSecret}
-            <span>Open Again</span>
-          {:else if creatingToken}
+          {#if creating}
             <LoadingCircle />
-          {:else}
+          {:else if isExternal}
             Allow
+          {:else}
+            Generate
           {/if}
         </Button>
-        <Button class="w-16" href={resolve('/')} variant="outline">Deny</Button>
+        <Button href={resolve(isExternal ? '/' : '/settings/api-tokens')} variant="outline">
+          {isExternal ? 'Deny' : 'Cancel'}
+        </Button>
       </Card.Footer>
     {/if}
   </Card.Root>
diff --git a/src/routes/(app)/settings/api-tokens/new/queryParamsType.ts b/src/routes/(app)/settings/api-tokens/new/queryParamsType.ts
deleted file mode 100644
index 700e9de0..00000000
--- a/src/routes/(app)/settings/api-tokens/new/queryParamsType.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { PermissionType } from '$lib/api';
-export type QueryParamsType = {
-  name: string;
-  redirectUri: string;
-  permissions: PermissionType[];
-};
diff --git a/src/routes/(app)/settings/api-tokens/shocker-control-settings.svelte b/src/routes/(app)/settings/api-tokens/shocker-control-settings.svelte
new file mode 100644
index 00000000..df59f23a
--- /dev/null
+++ b/src/routes/(app)/settings/api-tokens/shocker-control-settings.svelte
@@ -0,0 +1,128 @@
+<script lang="ts" module>
+  import { ControlLimitMode, type ShockerControlSettings } from '$lib/api';
+  import { ControlDurationProps, ControlIntensityProps } from '$lib/constants/ControlConstants';
+
+  // ControlIntensityProps is a percentage; ControlDurationProps is in seconds, but
+  // shockerControl durations are in milliseconds, so convert at this boundary.
+  export const intensityRange = ControlIntensityProps;
+  export const durationRange = {
+    min: Math.round(ControlDurationProps.min * 1000),
+    max: Math.round(ControlDurationProps.max * 1000),
+    step: Math.round(ControlDurationProps.step * 1000),
+  };
+
+  /** Permissive default used when creating a new token. */
+  export function defaultShockerControl(): ShockerControlSettings {
+    return {
+      paused: false,
+      intensity: { min: intensityRange.min, max: intensityRange.max, mode: ControlLimitMode.Clamp },
+      duration: { min: durationRange.min, max: durationRange.max, mode: ControlLimitMode.Clamp },
+    };
+  }
+</script>
+
+<script lang="ts">
+  import { Label } from '$lib/components/ui/label';
+  import { Slider } from '$lib/components/ui/slider';
+  import { Switch } from '$lib/components/ui/switch';
+  import * as ToggleGroup from '$lib/components/ui/toggle-group';
+  import * as Tooltip from '$lib/components/ui/tooltip';
+
+  interface Props {
+    settings: ShockerControlSettings;
+  }
+
+  let { settings = $bindable() }: Props = $props();
+
+  const modes = Object.values(ControlLimitMode);
+
+  const modeDescriptions: Record<ControlLimitMode, string> = {
+    [ControlLimitMode.Clamp]:
+      'Clamp: requests outside the allowed range are capped to the nearest limit (the min or the max).',
+    [ControlLimitMode.Lerp]:
+      'Lerp: the full input range is linearly rescaled so it fits within your allowed min–max range.',
+  };
+</script>
+
+{#snippet modeItems()}
+  {#each modes as mode (mode)}
+    <Tooltip.Root>
+      <Tooltip.Trigger>
+        {#snippet child({ props })}
+          <ToggleGroup.Item {...props} class="cursor-pointer" value={mode}>{mode}</ToggleGroup.Item>
+        {/snippet}
+      </Tooltip.Trigger>
+      <Tooltip.Content class="max-w-xs">{modeDescriptions[mode]}</Tooltip.Content>
+    </Tooltip.Root>
+  {/each}
+{/snippet}
+
+<div class="border-surface-500 flex flex-col gap-5 rounded-md border p-4">
+  <div class="flex items-center justify-between gap-2">
+    <div class="flex flex-col">
+      <Label class="text-sm font-medium">Paused</Label>
+      <span class="text-muted-foreground text-xs">
+        A paused token may not send shocker control messages.
+      </span>
+    </div>
+    <Switch bind:checked={settings.paused} />
+  </div>
+
+  <div class="space-y-2">
+    <div class="flex items-center justify-between">
+      <Label class="text-xs">Intensity range</Label>
+      <span class="text-muted-foreground font-mono text-xs">
+        {settings.intensity.min}% – {settings.intensity.max}%
+      </span>
+    </div>
+    <Slider
+      type="multiple"
+      value={[settings.intensity.min, settings.intensity.max]}
+      onValueChange={(v) => {
+        settings.intensity.min = v[0];
+        settings.intensity.max = v[1];
+      }}
+      min={intensityRange.min}
+      max={intensityRange.max}
+      step={intensityRange.step}
+    />
+    <ToggleGroup.Root
+      type="single"
+      value={settings.intensity.mode}
+      onValueChange={(v) => v && (settings.intensity.mode = v as ControlLimitMode)}
+      size="sm"
+      variant="outline"
+    >
+      {@render modeItems()}
+    </ToggleGroup.Root>
+  </div>
+
+  <div class="space-y-2">
+    <div class="flex items-center justify-between">
+      <Label class="text-xs">Duration range</Label>
+      <span class="text-muted-foreground font-mono text-xs">
+        {(settings.duration.min / 1000).toFixed(1)}s – {(settings.duration.max / 1000).toFixed(1)}s
+      </span>
+    </div>
+    <Slider
+      type="multiple"
+      value={[settings.duration.min, settings.duration.max]}
+      onValueChange={(v) => {
+        settings.duration.min = v[0];
+        settings.duration.max = v[1];
+      }}
+      min={durationRange.min}
+      max={durationRange.max}
+      step={durationRange.step}
+    />
+    <ToggleGroup.Root
+      type="single"
+      value={settings.duration.mode}
+      onValueChange={(v) => v && (settings.duration.mode = v as ControlLimitMode)}
+      size="sm"
+      variant="outline"
+    >
+      {@render modeItems()}
+    </ToggleGroup.Root>
+  </div>
+</div>