diff --git a/src/ui/elements/forms/Checkbox.tsx b/src/ui/elements/forms/Checkbox.tsx
index e7b58fb..bd8c2f1 100644
--- a/src/ui/elements/forms/Checkbox.tsx
+++ b/src/ui/elements/forms/Checkbox.tsx
@@ -1,17 +1,10 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type CheckboxProps = InputProps & {
   checkboxRef?: RefObject<HTMLInputElement>;
-}
+};
 
 export function Checkbox(props: CheckboxProps): JSX.Element {
-  return (
-    <input
-      class="uk-checkbox"
-      type="checkbox"
-      ref={props.checkboxRef}
-      {...props}
-    />
-  )
-}
\ No newline at end of file
+  return <input class="uk-checkbox" type="checkbox" ref={props.checkboxRef} {...props} />;
+}
diff --git a/src/ui/elements/forms/InputProps.tsx b/src/ui/elements/forms/InputProps.tsx
index fb1ce06..3951d08 100644
--- a/src/ui/elements/forms/InputProps.tsx
+++ b/src/ui/elements/forms/InputProps.tsx
@@ -1,9 +1,8 @@
 export type InputProps = {
-    name?: string;
-    value?: string;
-    placeholder?: string;
-    onChange?: () => void;
-    required?: boolean;
-    checked?: boolean;
-    extraProps?: {};
-}
\ No newline at end of file
+  name?: string;
+  value?: string;
+  placeholder?: string;
+  onChange?: () => void;
+  required?: boolean;
+  checked?: boolean;
+};
diff --git a/src/ui/elements/forms/NumberInput.tsx b/src/ui/elements/forms/NumberInput.tsx
index 4f6b7e0..ce08a7c 100644
--- a/src/ui/elements/forms/NumberInput.tsx
+++ b/src/ui/elements/forms/NumberInput.tsx
@@ -1,17 +1,12 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type NumberInputProps = InputProps & {
   inputRef?: RefObject<HTMLInputElement>;
-}
+};
 
 export function NumberInput(props: NumberInputProps): JSX.Element {
   return (
-    <input
-      class="uk-input uk-form-width-medium"
-      type="number"
-      ref={props.inputRef}
-      {...props}
-    />
-  )
-}
\ No newline at end of file
+    <input class="uk-input uk-form-width-medium" type="number" ref={props.inputRef} {...props} />
+  );
+}
diff --git a/src/ui/elements/forms/PasswordInput.tsx b/src/ui/elements/forms/PasswordInput.tsx
index 6c05276..c7741f2 100644
--- a/src/ui/elements/forms/PasswordInput.tsx
+++ b/src/ui/elements/forms/PasswordInput.tsx
@@ -1,17 +1,12 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type PasswordInputProps = InputProps & {
   inputRef?: RefObject<HTMLInputElement>;
-}
+};
 
 export function PasswordInput(props: PasswordInputProps): JSX.Element {
   return (
-    <input
-      class="uk-input uk-form-width-medium"
-      type="password"
-      ref={props.inputRef}
-      {...props}
-    />
-  )
-}
\ No newline at end of file
+    <input class="uk-input uk-form-width-medium" type="password" ref={props.inputRef} {...props} />
+  );
+}
diff --git a/src/ui/elements/forms/Select.tsx b/src/ui/elements/forms/Select.tsx
index 182d294..c5330a2 100644
--- a/src/ui/elements/forms/Select.tsx
+++ b/src/ui/elements/forms/Select.tsx
@@ -1,33 +1,29 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type SelectProps = InputProps & {
   selectRef?: RefObject<HTMLSelectElement>;
   children?: JSX.Element | JSX.Element[];
-}
+};
 
 export function Select(props: SelectProps): JSX.Element {
   return (
-    <select
-      class="uk-select uk-form-width-medium"
-      ref={props.selectRef}
-      {...props}
-    >
+    <select class="uk-select uk-form-width-medium" ref={props.selectRef} {...props}>
       {props.children}
     </select>
-  )
+  );
 }
 
 type SelectOptionProps = {
   name: string;
   value: string;
   selected?: boolean;
-}
+};
 
 export function SelectOption(props: SelectOptionProps): JSX.Element {
   return (
     <option label={props.name} value={props.value} selected={props.selected}>
       {props.name}
     </option>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/src/ui/elements/forms/TextArea.tsx b/src/ui/elements/forms/TextArea.tsx
index 1627d32..cda3d1a 100644
--- a/src/ui/elements/forms/TextArea.tsx
+++ b/src/ui/elements/forms/TextArea.tsx
@@ -1,16 +1,12 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type TextInputProps = InputProps & {
   textAreaRef?: RefObject<HTMLInputElement>;
-}
+};
 
 export function TextArea(props: TextInputProps): JSX.Element {
   return (
-    <textarea
-      class="uk-textarea uk-form-width-medium"
-      textAreaRef={props.textAreaRef}
-      {...props}
-    />
-  )
-}
\ No newline at end of file
+    <textarea class="uk-textarea uk-form-width-medium" textAreaRef={props.textAreaRef} {...props} />
+  );
+}
diff --git a/src/ui/elements/forms/TextInput.tsx b/src/ui/elements/forms/TextInput.tsx
index 320a561..bbd0e54 100644
--- a/src/ui/elements/forms/TextInput.tsx
+++ b/src/ui/elements/forms/TextInput.tsx
@@ -1,17 +1,12 @@
-import { JSX, RefObject } from "preact";
 import { InputProps } from "./InputProps";
+import { JSX, RefObject } from "preact";
 
 type TextInputProps = InputProps & {
   inputRef?: RefObject<HTMLInputElement>;
-}
+};
 
 export function TextInput(props: TextInputProps): JSX.Element {
   return (
-    <input
-      class="uk-input uk-form-width-medium"
-      type="text"
-      ref={props.inputRef}
-      {...props}
-    />
-  )
-}
\ No newline at end of file
+    <input class="uk-input uk-form-width-medium" type="text" ref={props.inputRef} {...props} />
+  );
+}
diff --git a/src/ui/pages/Access/Auth/userpass/UserPassUserEdit.tsx b/src/ui/pages/Access/Auth/userpass/UserPassUserEdit.tsx
index 59f6c3b..c9fa4e1 100644
--- a/src/ui/pages/Access/Auth/userpass/UserPassUserEdit.tsx
+++ b/src/ui/pages/Access/Auth/userpass/UserPassUserEdit.tsx
@@ -1,4 +1,5 @@
 import { Button } from "../../../../elements/Button";
+import { Checkbox } from "../../../../elements/forms/Checkbox";
 import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../../../types/DefaultPageProps";
 import { ErrorMessage, sendErrorNotification } from "../../../../elements/ErrorMessage";
@@ -6,16 +7,15 @@ import { Form } from "../../../../elements/forms/Form";
 import { InputWithTitle } from "../../../../elements/InputWithTitle";
 import { Margin } from "../../../../elements/Margin";
 import { MarginInline } from "../../../../elements/MarginInline";
+import { NumberInput } from "../../../../elements/forms/NumberInput";
 import { PageTitle } from "../../../../elements/PageTitle";
+import { PasswordInput } from "../../../../elements/forms/PasswordInput";
+import { TextInput } from "../../../../elements/forms/TextInput";
 import { UserType } from "../../../../../api/types/user";
 import { route } from "preact-router";
 import { toStr } from "../../../../../utils";
 import { userPassUserViewURL } from "../../../pageLinks";
 import i18next from "i18next";
-import { PasswordInput } from "../../../../elements/forms/PasswordInput";
-import { TextInput } from "../../../../elements/forms/TextInput";
-import { NumberInput } from "../../../../elements/forms/NumberInput";
-import { Checkbox } from "../../../../elements/forms/Checkbox";
 
 const removeEmptyStrings = (arr: string[]) => arr.filter((e) => e.length > 0);
 
diff --git a/src/ui/pages/Access/Auth/userpass/UserPassUserNew.tsx b/src/ui/pages/Access/Auth/userpass/UserPassUserNew.tsx
index 45be94d..95df422 100644
--- a/src/ui/pages/Access/Auth/userpass/UserPassUserNew.tsx
+++ b/src/ui/pages/Access/Auth/userpass/UserPassUserNew.tsx
@@ -3,16 +3,16 @@ import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../../../types/DefaultPageProps";
 import { ErrorMessage } from "../../../../elements/ErrorMessage";
 import { Form } from "../../../../elements/forms/Form";
+import { InputWithTitle } from "../../../../elements/InputWithTitle";
 import { Margin } from "../../../../elements/Margin";
 import { MarginInline } from "../../../../elements/MarginInline";
 import { PageTitle } from "../../../../elements/PageTitle";
+import { PasswordInput } from "../../../../elements/forms/PasswordInput";
+import { TextInput } from "../../../../elements/forms/TextInput";
 import { UserType } from "../../../../../api/types/user";
 import { route } from "preact-router";
 import { userPassUserViewURL } from "../../../pageLinks";
 import i18next from "i18next";
-import { TextInput } from "../../../../elements/forms/TextInput";
-import { InputWithTitle } from "../../../../elements/InputWithTitle";
-import { PasswordInput } from "../../../../elements/forms/PasswordInput";
 
 export class UserPassUserNew extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Login_Token.tsx b/src/ui/pages/Login_Token.tsx
index e5b8b71..1c705e5 100644
--- a/src/ui/pages/Login_Token.tsx
+++ b/src/ui/pages/Login_Token.tsx
@@ -3,12 +3,12 @@ import { Component, JSX, createRef } from "preact";
 import { DefaultPageProps } from "../../types/DefaultPageProps";
 import { ErrorMessage } from "../elements/ErrorMessage";
 import { Form } from "../elements/forms/Form";
+import { InputWithTitle } from "../elements/InputWithTitle";
 import { Margin } from "../elements/Margin";
 import { MarginInline } from "../elements/MarginInline";
+import { PasswordInput } from "../elements/forms/PasswordInput";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { PasswordInput } from "../elements/forms/PasswordInput";
-import { InputWithTitle } from "../elements/InputWithTitle";
 
 export class TokenLoginForm extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Login_Username.tsx b/src/ui/pages/Login_Username.tsx
index ab9495a..44cfdb1 100644
--- a/src/ui/pages/Login_Username.tsx
+++ b/src/ui/pages/Login_Username.tsx
@@ -3,13 +3,13 @@ import { Component, JSX, createRef } from "preact";
 import { DefaultPageProps } from "../../types/DefaultPageProps";
 import { ErrorMessage } from "../elements/ErrorMessage";
 import { Form } from "../elements/forms/Form";
+import { InputWithTitle } from "../elements/InputWithTitle";
 import { Margin } from "../elements/Margin";
 import { MarginInline } from "../elements/MarginInline";
+import { PasswordInput } from "../elements/forms/PasswordInput";
+import { TextInput } from "../elements/forms/TextInput";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../elements/forms/TextInput";
-import { PasswordInput } from "../elements/forms/PasswordInput";
-import { InputWithTitle } from "../elements/InputWithTitle";
 
 export class UsernameLoginForm extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Policies/PolicyNew.tsx b/src/ui/pages/Policies/PolicyNew.tsx
index 1aa0dd8..48b1a00 100644
--- a/src/ui/pages/Policies/PolicyNew.tsx
+++ b/src/ui/pages/Policies/PolicyNew.tsx
@@ -3,13 +3,13 @@ import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../types/DefaultPageProps";
 import { ErrorMessage } from "../../elements/ErrorMessage";
 import { Form } from "../../elements/forms/Form";
+import { InputWithTitle } from "../../elements/InputWithTitle";
 import { Margin } from "../../elements/Margin";
 import { PageTitle } from "../../elements/PageTitle";
+import { TextInput } from "../../elements/forms/TextInput";
 import { policyViewURL } from "../pageLinks";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../../elements/forms/TextInput";
-import { InputWithTitle } from "../../elements/InputWithTitle";
 
 export class PolicyNew extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/PwGen.tsx b/src/ui/pages/PwGen.tsx
index 14eac7e..91a7e6c 100644
--- a/src/ui/pages/PwGen.tsx
+++ b/src/ui/pages/PwGen.tsx
@@ -5,8 +5,8 @@ import { DefaultPageProps } from "../../types/DefaultPageProps";
 import { Form } from "../elements/forms/Form";
 import { Margin } from "../elements/Margin";
 import { PageTitle } from "../elements/PageTitle";
-import i18next from "i18next";
 import { Select, SelectOption } from "../elements/forms/Select";
+import i18next from "i18next";
 
 const passwordLengthMin = 1;
 const passwordLengthMax = 64;
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
index 7045608..ddd6c12 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
@@ -6,6 +6,7 @@ import { ErrorMessage, sendErrorNotification } from "../../../elements/ErrorMess
 import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { Select, SelectOption } from "../../../elements/forms/Select";
 import {
   SupportedLanguages,
   dumpData,
@@ -14,7 +15,6 @@ import {
 } from "../../../../utils/dataInterchange";
 import { sortedObjectMap } from "../../../../utils";
 import i18next from "i18next";
-import { Select, SelectOption } from "../../../elements/forms/Select";
 
 export type KVEditProps = DefaultPageProps & {
   baseMount: string;
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
index 11e7def..b049b85 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
@@ -2,13 +2,13 @@ import { Button } from "../../../elements/Button";
 import { Component, JSX, createRef } from "preact";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
 import { DoesNotExistError } from "../../../../types/internalErrors";
+import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { delSecretsEngineURL, kvListURL, kvNewURL, kvViewURL } from "../../pageLinks";
 import { route } from "preact-router";
 import { sendErrorNotification } from "../../../elements/ErrorMessage";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
-import { Margin } from "../../../elements/Margin";
 
 export type KVKeysListProps = DefaultPageProps & {
   baseMount: string;
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
index f3ae71f..bb1ebcc 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
@@ -3,13 +3,13 @@ import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
 import { ErrorMessage } from "../../../elements/ErrorMessage";
 import { Form } from "../../../elements/forms/Form";
+import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { kvViewURL } from "../../pageLinks";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
-import { InputWithTitle } from "../../../elements/InputWithTitle";
 
 export class KeyValueNew extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueView.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueView.tsx
index 18ff254..7465a30 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueView.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueView.tsx
@@ -7,12 +7,12 @@ import { DoesNotExistError } from "../../../../types/internalErrors";
 import { Grid, GridSizes } from "../../../elements/Grid";
 import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { Select, SelectOption } from "../../../elements/forms/Select";
 import { SupportedLanguages, dumpData, toPrismCode } from "../../../../utils/dataInterchange";
 import { kvDeleteURL, kvEditURL, kvVersionsURL } from "../../pageLinks";
 import { sendErrorNotification } from "../../../elements/ErrorMessage";
 import { sortedObjectMap } from "../../../../utils";
 import i18next from "i18next";
-import { Select, SelectOption } from "../../../elements/forms/Select";
 
 type KVSecretViewDataProps = DefaultPageProps & { data: Map<string, unknown> };
 
diff --git a/src/ui/pages/Secrets/NewEngines/NewKVEngine.tsx b/src/ui/pages/Secrets/NewEngines/NewKVEngine.tsx
index 5d4c7b0..c7ee37e 100644
--- a/src/ui/pages/Secrets/NewEngines/NewKVEngine.tsx
+++ b/src/ui/pages/Secrets/NewEngines/NewKVEngine.tsx
@@ -6,11 +6,11 @@ import { Form } from "../../../elements/forms/Form";
 import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { PageTitle } from "../../../elements/PageTitle";
+import { Select, SelectOption } from "../../../elements/forms/Select";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { kvListURL } from "../../pageLinks";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { Select, SelectOption } from "../../../elements/forms/Select";
-import { TextInput } from "../../../elements/forms/TextInput";
 
 export class NewKVEngine extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
@@ -21,11 +21,7 @@ export class NewKVEngine extends Component<DefaultPageProps> {
         <PageTitle title={i18next.t("new_kv_engine_title")} />
         <Form onSubmit={(data) => this.submit(data)}>
           <Margin>
-            <TextInput
-              name="name"
-              placeholder={i18next.t("common_name")}
-              required
-            />
+            <TextInput name="name" placeholder={i18next.t("common_name")} required />
           </Margin>
           <Margin>
             <Select name="version">
diff --git a/src/ui/pages/Secrets/NewEngines/NewTOTPEngine.tsx b/src/ui/pages/Secrets/NewEngines/NewTOTPEngine.tsx
index f1b33bc..e099ee9 100644
--- a/src/ui/pages/Secrets/NewEngines/NewTOTPEngine.tsx
+++ b/src/ui/pages/Secrets/NewEngines/NewTOTPEngine.tsx
@@ -6,10 +6,10 @@ import { Form } from "../../../elements/forms/Form";
 import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { PageTitle } from "../../../elements/PageTitle";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { route } from "preact-router";
 import { totpListURL } from "../../pageLinks";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
 
 export class NewTOTPEngine extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
@@ -20,11 +20,7 @@ export class NewTOTPEngine extends Component<DefaultPageProps> {
         <PageTitle title={i18next.t("new_totp_engine_title")} />
         <Form onSubmit={(data) => this.submit(data)}>
           <Margin>
-            <TextInput
-              name="name"
-              placeholder={i18next.t("common_name")}
-              required
-            />
+            <TextInput name="name" placeholder={i18next.t("common_name")} required />
           </Margin>
 
           <Margin>
diff --git a/src/ui/pages/Secrets/NewEngines/NewTransitEngine.tsx b/src/ui/pages/Secrets/NewEngines/NewTransitEngine.tsx
index d00c26f..06cf649 100644
--- a/src/ui/pages/Secrets/NewEngines/NewTransitEngine.tsx
+++ b/src/ui/pages/Secrets/NewEngines/NewTransitEngine.tsx
@@ -6,9 +6,9 @@ import { Form } from "../../../elements/forms/Form";
 import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { PageTitle } from "../../../elements/PageTitle";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
 
 export class NewTransitEngine extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
@@ -19,11 +19,7 @@ export class NewTransitEngine extends Component<DefaultPageProps> {
         <PageTitle title={i18next.t("new_transit_engine_title")} />
         <Form onSubmit={(data) => this.submit(data)}>
           <Margin>
-            <TextInput
-              name="name"
-              placeholder={i18next.t("common_name")}
-              required
-            />
+            <TextInput name="name" placeholder={i18next.t("common_name")} required />
           </Margin>
 
           <Margin>
diff --git a/src/ui/pages/Secrets/TOTP/TOTPNew.tsx b/src/ui/pages/Secrets/TOTP/TOTPNew.tsx
index 8f4dacd..da713a0 100644
--- a/src/ui/pages/Secrets/TOTP/TOTPNew.tsx
+++ b/src/ui/pages/Secrets/TOTP/TOTPNew.tsx
@@ -7,9 +7,9 @@ import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { QRScanner } from "../../../elements/QRScanner";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
 
 function replaceAll(str: string, replace: string, replaceWith: string): string {
   return str.replace(new RegExp(replace, "g"), replaceWith);
@@ -69,30 +69,23 @@ export class TOTPNewForm extends Component<
         {!this.state.qrMode && (
           <>
             <Margin>
-              <TextInput
-                name="key"
-                placeholder={i18next.t("totp_new_key_input")}
-              />
+              <TextInput name="key" placeholder={i18next.t("totp_new_key_input")} />
             </Margin>
 
             <Margin>
-              <TextInput
-                name="uri"
-                placeholder={i18next.t("totp_new_uri_input")}
-              />
+              <TextInput name="uri" placeholder={i18next.t("totp_new_uri_input")} />
             </Margin>
           </>
         )}
 
         {this.state.qrMode && (
           <QRScanner
-            onScan={(uri) => {
-              let formData = new FormData();
+            onScan={async (uri) => {
+              const formData = new FormData();
               formData.set("key", "");
-              formData.set("name", this.nameInputRef.current.value)
+              formData.set("name", this.nameInputRef.current.value);
               formData.set("uri", uri);
-              this.onSubmit(formData);
-              this.setState({ qrMode: !this.state.qrMode });
+              await this.onSubmit(formData);
             }}
           />
         )}
diff --git a/src/ui/pages/Secrets/TOTP/TOTPNewGenerated.tsx b/src/ui/pages/Secrets/TOTP/TOTPNewGenerated.tsx
index 1353d88..dfb26c8 100644
--- a/src/ui/pages/Secrets/TOTP/TOTPNewGenerated.tsx
+++ b/src/ui/pages/Secrets/TOTP/TOTPNewGenerated.tsx
@@ -1,4 +1,5 @@
 import { Button } from "../../../elements/Button";
+import { Checkbox } from "../../../elements/forms/Checkbox";
 import { Component, JSX, createRef } from "preact";
 import { CopyableInputBox } from "../../../elements/CopyableInputBox";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
@@ -8,14 +9,13 @@ import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { NewTOTPResp } from "../../../../api/types/totp";
+import { NumberInput } from "../../../elements/forms/NumberInput";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { Select, SelectOption } from "../../../elements/forms/Select";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { route } from "preact-router";
 import { totpListURL } from "../../pageLinks";
 import i18next from "i18next";
-import { NumberInput } from "../../../elements/forms/NumberInput";
-import { TextInput } from "../../../elements/forms/TextInput";
-import { Checkbox } from "../../../elements/forms/Checkbox";
-import { Select, SelectOption, } from "../../../elements/forms/Select";
 
 export class TOTPNewGeneratedForm extends Component<
   { baseMount: string } & DefaultPageProps,
@@ -30,11 +30,7 @@ export class TOTPNewGeneratedForm extends Component<
         <Form onSubmit={(data) => this.onSubmit(data)}>
           <Margin>
             <InputWithTitle title={i18next.t("common_name")}>
-              <TextInput
-                name="name"
-                placeholder={i18next.t("common_name")}
-                required
-              />
+              <TextInput name="name" placeholder={i18next.t("common_name")} required />
             </InputWithTitle>
           </Margin>
 
diff --git a/src/ui/pages/Secrets/Transit/TransitDecrypt.tsx b/src/ui/pages/Secrets/Transit/TransitDecrypt.tsx
index 5967b2f..0c0932b 100644
--- a/src/ui/pages/Secrets/Transit/TransitDecrypt.tsx
+++ b/src/ui/pages/Secrets/Transit/TransitDecrypt.tsx
@@ -1,4 +1,5 @@
 import { Button } from "../../../elements/Button";
+import { Checkbox } from "../../../elements/forms/Checkbox";
 import { Component, createRef } from "preact";
 import { CopyableBox } from "../../../elements/CopyableBox";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
@@ -8,10 +9,9 @@ import { Form } from "../../../elements/forms/Form";
 import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { TextArea } from "../../../elements/forms/TextArea";
 import { fileToBase64 } from "../../../../utils/fileToBase64";
 import i18next from "i18next";
-import { Checkbox } from "../../../elements/forms/Checkbox";
-import { TextArea } from "../../../elements/forms/TextArea";
 
 export class TransitDecrypt extends Component<DefaultPageProps, { plaintext: string }> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Secrets/Transit/TransitEncrypt.tsx b/src/ui/pages/Secrets/Transit/TransitEncrypt.tsx
index 7796ee7..4ac7a8c 100644
--- a/src/ui/pages/Secrets/Transit/TransitEncrypt.tsx
+++ b/src/ui/pages/Secrets/Transit/TransitEncrypt.tsx
@@ -1,4 +1,5 @@
 import { Button } from "../../../elements/Button";
+import { Checkbox } from "../../../elements/forms/Checkbox";
 import { Component, createRef } from "preact";
 import { CopyableBox } from "../../../elements/CopyableBox";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
@@ -8,10 +9,9 @@ import { Form } from "../../../elements/forms/Form";
 import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { TextArea } from "../../../elements/forms/TextArea";
 import { fileToBase64 } from "../../../../utils/fileToBase64";
 import i18next from "i18next";
-import { Checkbox } from "../../../elements/forms/Checkbox";
-import { TextArea } from "../../../elements/forms/TextArea";
 
 export class TransitEncrypt extends Component<DefaultPageProps, { ciphertext: string }> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Secrets/Transit/TransitNew.tsx b/src/ui/pages/Secrets/Transit/TransitNew.tsx
index 68e5222..48dc0cb 100644
--- a/src/ui/pages/Secrets/Transit/TransitNew.tsx
+++ b/src/ui/pages/Secrets/Transit/TransitNew.tsx
@@ -3,15 +3,15 @@ import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../../types/DefaultPageProps";
 import { ErrorMessage } from "../../../elements/ErrorMessage";
 import { Form } from "../../../elements/forms/Form";
+import { InputWithTitle } from "../../../elements/InputWithTitle";
 import { Margin } from "../../../elements/Margin";
 import { MarginInline } from "../../../elements/MarginInline";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { Select, SelectOption } from "../../../elements/forms/Select";
+import { TextInput } from "../../../elements/forms/TextInput";
 import { route } from "preact-router";
 import { transitViewSecretURL } from "../../pageLinks";
 import i18next from "i18next";
-import { TextInput } from "../../../elements/forms/TextInput";
-import { InputWithTitle } from "../../../elements/InputWithTitle";
-import { Select, SelectOption } from "../../../elements/forms/Select";
 
 export class TransitNew extends Component<DefaultPageProps> {
   errorMessageRef = createRef<ErrorMessage>();
diff --git a/src/ui/pages/Secrets/Transit/TransitRewrap.tsx b/src/ui/pages/Secrets/Transit/TransitRewrap.tsx
index dd386a1..c4a2bc1 100644
--- a/src/ui/pages/Secrets/Transit/TransitRewrap.tsx
+++ b/src/ui/pages/Secrets/Transit/TransitRewrap.tsx
@@ -6,11 +6,11 @@ import { ErrorMessage, sendErrorNotification } from "../../../elements/ErrorMess
 import { Form } from "../../../elements/forms/Form";
 import { Margin } from "../../../elements/Margin";
 import { SecretTitleElement } from "../SecretTitleElement";
+import { Select, SelectOption } from "../../../elements/forms/Select";
+import { TextArea } from "../../../elements/forms/TextArea";
 import { TransitKeyType } from "../../../../api/types/transit";
 import { objectToMap } from "../../../../utils";
 import i18next from "i18next";
-import { Select, SelectOption } from "../../../elements/forms/Select";
-import { TextArea } from "../../../elements/forms/TextArea";
 
 type versionOption = { version: string; label: string };
 
diff --git a/src/ui/pages/SetLanguage.tsx b/src/ui/pages/SetLanguage.tsx
index 8530d02..87abfbc 100644
--- a/src/ui/pages/SetLanguage.tsx
+++ b/src/ui/pages/SetLanguage.tsx
@@ -9,10 +9,10 @@ import { Form } from "../elements/forms/Form";
 import { Margin } from "../elements/Margin";
 import { MarginInline } from "../elements/MarginInline";
 import { PageTitle } from "../elements/PageTitle";
+import { Select, SelectOption } from "../elements/forms/Select";
 import { getTranslationCompletePercentage } from "../../utils/translationUtils";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { Select, SelectOption } from "../elements/forms/Select.js";
 
 export class SetLanguage extends Component<DefaultPageProps> {
   render() {
@@ -23,9 +23,9 @@ export class SetLanguage extends Component<DefaultPageProps> {
           <Margin>
             <Select name="language">
               {Object.getOwnPropertyNames(translations).map((languageID) => {
-                let languageName = i18next.getFixedT(languageID, null)("language_name");
-                let languageCompletionPercent = getTranslationCompletePercentage(languageID);
-                let name = `${languageName} (${languageCompletionPercent})`
+                const languageName = i18next.getFixedT(languageID, null)("language_name");
+                const languageCompletionPercent = getTranslationCompletePercentage(languageID);
+                const name = `${languageName} (${languageCompletionPercent})`;
                 return (
                   <SelectOption
                     name={name}
diff --git a/src/ui/pages/SetVaultURL.tsx b/src/ui/pages/SetVaultURL.tsx
index 23f3a2d..4e03c77 100644
--- a/src/ui/pages/SetVaultURL.tsx
+++ b/src/ui/pages/SetVaultURL.tsx
@@ -2,12 +2,12 @@ import { Button } from "../elements/Button";
 import { Component } from "preact";
 import { DefaultPageProps } from "../../types/DefaultPageProps";
 import { Form } from "../elements/forms/Form";
+import { InputWithTitle } from "../elements/InputWithTitle";
 import { Margin } from "../elements/Margin";
 import { PageTitle } from "../elements/PageTitle";
+import { TextInput } from "../elements/forms/TextInput";
 import { route } from "preact-router";
 import i18next from "i18next";
-import { TextInput } from "../elements/forms/TextInput";
-import { InputWithTitle } from "../elements/InputWithTitle";
 
 export class SetVaultURL extends Component<DefaultPageProps> {
   render() {
diff --git a/src/ui/pages/Settings/GeneralSettings.tsx b/src/ui/pages/Settings/GeneralSettings.tsx
index 8fcb288..ad79255 100644
--- a/src/ui/pages/Settings/GeneralSettings.tsx
+++ b/src/ui/pages/Settings/GeneralSettings.tsx
@@ -4,11 +4,11 @@ import { InputWithTitle } from "../../elements/InputWithTitle";
 import i18next from "i18next";
 
 // @ts-ignore
+import { Select, SelectOption } from "../../elements/forms/Select";
+import { TextInput } from "../../elements/forms/TextInput";
 import { getTranslationCompletePercentage } from "../../../utils/translationUtils";
 import { settingsSavedNotification } from "./Settings";
 import translations from "../../../translations/index.mjs";
-import { Select, SelectOption } from "../../elements/forms/Select";
-import { TextInput } from "../../elements/forms/TextInput";
 
 const Themes = [
   { name: "dark", readable: "Dark" },
@@ -72,9 +72,9 @@ export class GeneralSettings extends Component<DefaultPageProps> {
             }}
           >
             {Object.getOwnPropertyNames(translations).map((languageID) => {
-              let languageName = i18next.getFixedT(languageID, null)("language_name");
-              let languageCompletionPercent = getTranslationCompletePercentage(languageID);
-              let name = `${languageName} (${languageCompletionPercent})`
+              const languageName = i18next.getFixedT(languageID, null)("language_name");
+              const languageCompletionPercent = getTranslationCompletePercentage(languageID);
+              const name = `${languageName} (${languageCompletionPercent})`;
               return (
                 <SelectOption
                   name={name}
diff --git a/src/ui/pages/Settings/KeyValueSettings.tsx b/src/ui/pages/Settings/KeyValueSettings.tsx
index dfea395..db3323d 100644
--- a/src/ui/pages/Settings/KeyValueSettings.tsx
+++ b/src/ui/pages/Settings/KeyValueSettings.tsx
@@ -1,13 +1,13 @@
+import { Checkbox } from "../../elements/forms/Checkbox";
 import { Component, createRef } from "preact";
 import { DefaultPageProps } from "../../../types/DefaultPageProps";
 import { InputWithTitle } from "../../elements/InputWithTitle";
+import { NumberInput } from "../../elements/forms/NumberInput";
+import { Select, SelectOption } from "../../elements/forms/Select";
 import { SupportedLanguages } from "../../../utils/dataInterchange";
+import { TextInput } from "../../elements/forms/TextInput";
 import { settingsSavedNotification } from "./Settings";
 import i18next from "i18next";
-import { Select, SelectOption } from "../../elements/forms/Select";
-import { NumberInput } from "../../elements/forms/NumberInput";
-import { Checkbox } from "../../elements/forms/Checkbox";
-import { TextInput } from "../../elements/forms/TextInput";
 
 export class KeyValueViewSettings extends Component<DefaultPageProps> {
   viewSyntaxSelectRef = createRef<HTMLSelectElement>();
diff --git a/src/ui/pages/Unseal_Form.tsx b/src/ui/pages/Unseal_Form.tsx
index 95cde47..04e2305 100644
--- a/src/ui/pages/Unseal_Form.tsx
+++ b/src/ui/pages/Unseal_Form.tsx
@@ -1,10 +1,10 @@
 import { Button } from "../elements/Button";
 import { Form } from "../elements/forms/Form";
+import { InputWithTitle } from "../elements/InputWithTitle";
 import { JSX } from "preact/jsx-runtime";
 import { MarginInline } from "../elements/MarginInline";
-import i18next from "i18next";
 import { PasswordInput } from "../elements/forms/PasswordInput";
-import { InputWithTitle } from "../elements/InputWithTitle";
+import i18next from "i18next";
 
 type FormUnsealProps = {
   onKeySubmit: (key: string) => void;
@@ -12,9 +12,11 @@ type FormUnsealProps = {
 
 export function UnsealForm(props: FormUnsealProps): JSX.Element {
   return (
-    <Form onSubmit={(data: FormData) => {
-      props.onKeySubmit(data.get("unsealKey") as string);
-    }}>
+    <Form
+      onSubmit={(data: FormData) => {
+        props.onKeySubmit(data.get("unsealKey") as string);
+      }}
+    >
       <MarginInline>
         <InputWithTitle title={i18next.t("unseal_key_input_placeholder")}>
           <PasswordInput