diff --git a/ui/.prettierrc b/ui/.prettierrc
index 75b60f4..8c38ce7 100644
--- a/ui/.prettierrc
+++ b/ui/.prettierrc
@@ -6,7 +6,7 @@
   "singleQuote": true,
   "trailingComma": "es5",
   "bracketSpacing": false,
-  "jsxBracketSameLine": true,
+  "bracketSameLine": true,
   "arrowParens": "always",
   "parser": "typescript"
-}
\ No newline at end of file
+}
diff --git a/ui/src/application/AddApplicationDialog.tsx b/ui/src/application/AddApplicationDialog.tsx
index 875d5ec..8b73b85 100644
--- a/ui/src/application/AddApplicationDialog.tsx
+++ b/ui/src/application/AddApplicationDialog.tsx
@@ -34,8 +34,7 @@ export default class AddDialog extends Component<IProps, IState> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="app-dialog"
-            >
+                id="app-dialog">
                 <DialogTitle id="form-dialog-title">Create an application</DialogTitle>
                 <DialogContent>
                     <DialogContentText>
@@ -70,8 +69,7 @@ export default class AddDialog extends Component<IProps, IState> {
                                 disabled={!submitEnabled}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Create
                             </Button>
                         </div>
diff --git a/ui/src/application/Applications.tsx b/ui/src/application/Applications.tsx
index 572e591..4269729 100644
--- a/ui/src/application/Applications.tsx
+++ b/ui/src/application/Applications.tsx
@@ -53,13 +53,11 @@ class Applications extends Component<Stores<'appStore'>> {
                         id="create-app"
                         variant="contained"
                         color="primary"
-                        onClick={() => (this.createDialog = true)}
-                    >
+                        onClick={() => (this.createDialog = true)}>
                         Create Application
                     </Button>
                 }
-                maxWidth={1000}
-            >
+                maxWidth={1000}>
                 <Grid item xs={12}>
                     <Paper elevation={6}>
                         <Table id="app-table">
diff --git a/ui/src/application/UpdateApplicationDialog.tsx b/ui/src/application/UpdateApplicationDialog.tsx
index 027b39c..a4038e0 100644
--- a/ui/src/application/UpdateApplicationDialog.tsx
+++ b/ui/src/application/UpdateApplicationDialog.tsx
@@ -44,8 +44,7 @@ export default class UpdateDialog extends Component<IProps, IState> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="app-dialog"
-            >
+                id="app-dialog">
                 <DialogTitle id="form-dialog-title">Update an application</DialogTitle>
                 <DialogContent>
                     <DialogContentText>
@@ -80,8 +79,7 @@ export default class UpdateDialog extends Component<IProps, IState> {
                                 disabled={!submitEnabled}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Update
                             </Button>
                         </div>
diff --git a/ui/src/client/AddClientDialog.tsx b/ui/src/client/AddClientDialog.tsx
index c93fea3..3249b60 100644
--- a/ui/src/client/AddClientDialog.tsx
+++ b/ui/src/client/AddClientDialog.tsx
@@ -28,8 +28,7 @@ export default class AddDialog extends Component<IProps, {name: string}> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="client-dialog"
-            >
+                id="client-dialog">
                 <DialogTitle id="form-dialog-title">Create a client</DialogTitle>
                 <DialogContent>
                     <TextField
@@ -47,16 +46,14 @@ export default class AddDialog extends Component<IProps, {name: string}> {
                     <Button onClick={fClose}>Cancel</Button>
                     <Tooltip
                         placement={'bottom-start'}
-                        title={submitEnabled ? '' : 'name is required'}
-                    >
+                        title={submitEnabled ? '' : 'name is required'}>
                         <div>
                             <Button
                                 className="create"
                                 disabled={!submitEnabled}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Create
                             </Button>
                         </div>
diff --git a/ui/src/client/Clients.tsx b/ui/src/client/Clients.tsx
index b8027b7..67154ee 100644
--- a/ui/src/client/Clients.tsx
+++ b/ui/src/client/Clients.tsx
@@ -48,12 +48,10 @@ class Clients extends Component<Stores<'clientStore'>> {
                         id="create-client"
                         variant="contained"
                         color="primary"
-                        onClick={() => (this.showDialog = true)}
-                    >
+                        onClick={() => (this.showDialog = true)}>
                         Create Client
                     </Button>
-                }
-            >
+                }>
                 <Grid item xs={12}>
                     <Paper elevation={6}>
                         <Table id="client-table">
diff --git a/ui/src/client/UpdateClientDialog.tsx b/ui/src/client/UpdateClientDialog.tsx
index 94ae211..214a7c2 100644
--- a/ui/src/client/UpdateClientDialog.tsx
+++ b/ui/src/client/UpdateClientDialog.tsx
@@ -41,8 +41,7 @@ export default class UpdateDialog extends Component<IProps, IState> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="client-dialog"
-            >
+                id="client-dialog">
                 <DialogTitle id="form-dialog-title">Update a Client</DialogTitle>
                 <DialogContent>
                     <DialogContentText>
@@ -69,8 +68,7 @@ export default class UpdateDialog extends Component<IProps, IState> {
                                 disabled={!submitEnabled}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Update
                             </Button>
                         </div>
diff --git a/ui/src/common/ConfirmDialog.tsx b/ui/src/common/ConfirmDialog.tsx
index e6d441b..fdb246e 100644
--- a/ui/src/common/ConfirmDialog.tsx
+++ b/ui/src/common/ConfirmDialog.tsx
@@ -23,8 +23,7 @@ export default function ConfirmDialog({title, text, fClose, fOnSubmit}: IProps)
             open={true}
             onClose={fClose}
             aria-labelledby="form-dialog-title"
-            className="confirm-dialog"
-        >
+            className="confirm-dialog">
             <DialogTitle id="form-dialog-title">{title}</DialogTitle>
             <DialogContent>
                 <DialogContentText>{text}</DialogContentText>
@@ -38,8 +37,7 @@ export default function ConfirmDialog({title, text, fClose, fOnSubmit}: IProps)
                     autoFocus
                     color="primary"
                     variant="contained"
-                    className="confirm"
-                >
+                    className="confirm">
                     Yes
                 </Button>
             </DialogActions>
diff --git a/ui/src/common/ConnectionErrorBanner.tsx b/ui/src/common/ConnectionErrorBanner.tsx
index 3df98c0..fbcbb72 100644
--- a/ui/src/common/ConnectionErrorBanner.tsx
+++ b/ui/src/common/ConnectionErrorBanner.tsx
@@ -16,8 +16,7 @@ export const ConnectionErrorBanner = ({height, retry, message}: ConnectionErrorB
             width: '100%',
             zIndex: 1300,
             position: 'relative',
-        }}
-    >
+        }}>
         <Typography align="center" variant="h6" style={{lineHeight: `${height}px`}}>
             {message}{' '}
             <Button variant="outlined" onClick={retry}>
diff --git a/ui/src/common/ScrollUpButton.tsx b/ui/src/common/ScrollUpButton.tsx
index 819666a..e030262 100644
--- a/ui/src/common/ScrollUpButton.tsx
+++ b/ui/src/common/ScrollUpButton.tsx
@@ -36,8 +36,7 @@ class ScrollUpButton extends Component {
                     display: this.state.display,
                     opacity: this.state.opacity,
                 }}
-                onClick={this.scrollUp}
-            >
+                onClick={this.scrollUp}>
                 <KeyboardArrowUp />
             </Fab>
         );
diff --git a/ui/src/common/SettingsDialog.tsx b/ui/src/common/SettingsDialog.tsx
index c8aa2cf..c9a0464 100644
--- a/ui/src/common/SettingsDialog.tsx
+++ b/ui/src/common/SettingsDialog.tsx
@@ -31,8 +31,7 @@ class SettingsDialog extends Component<IProps & Stores<'currentUser'>> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="changepw-dialog"
-            >
+                id="changepw-dialog">
                 <DialogTitle id="form-dialog-title">Change Password</DialogTitle>
                 <DialogContent>
                     <TextField
@@ -55,8 +54,7 @@ class SettingsDialog extends Component<IProps & Stores<'currentUser'>> {
                                 disabled={pass.length === 0}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Change
                             </Button>
                         </div>
diff --git a/ui/src/layout/Header.tsx b/ui/src/layout/Header.tsx
index 6089f92..db819a9 100644
--- a/ui/src/layout/Header.tsx
+++ b/ui/src/layout/Header.tsx
@@ -106,8 +106,7 @@ class Header extends Component<IProps> {
                         </Link>
                         <a
                             href={'https://github.com/gotify/server/releases/tag/v' + version}
-                            className={classes.link}
-                        >
+                            className={classes.link}>
                             <Typography variant="button" color="inherit">
                                 @{version}
                             </Typography>
@@ -123,8 +122,7 @@ class Header extends Component<IProps> {
                             href="https://github.com/gotify/server"
                             className={classes.link}
                             target="_blank"
-                            rel="noopener noreferrer"
-                        >
+                            rel="noopener noreferrer">
                             <IconButton color="inherit">
                                 <GitHubIcon />
                             </IconButton>
diff --git a/ui/src/layout/Navigation.tsx b/ui/src/layout/Navigation.tsx
index caf4b7a..d499d6c 100644
--- a/ui/src/layout/Navigation.tsx
+++ b/ui/src/layout/Navigation.tsx
@@ -57,8 +57,7 @@ class Navigation extends Component<
                           onClick={() => setNavOpen(false)}
                           className={`${classes.link} item`}
                           to={'/messages/' + app.id}
-                          key={app.id}
-                      >
+                          key={app.id}>
                           <ListItem button>
                               <ListItemText primary={app.name} />
                           </ListItem>
@@ -79,8 +78,7 @@ class Navigation extends Component<
                 classes={{root: classes.root, paper: classes.drawerPaper}}
                 navOpen={navOpen}
                 setNavOpen={setNavOpen}
-                id="message-navigation"
-            >
+                id="message-navigation">
                 <div className={classes.toolbar} />
                 <Link className={classes.link} to="/" onClick={() => setNavOpen(false)}>
                     <ListItem button disabled={!loggedIn} className="all">
@@ -96,8 +94,7 @@ class Navigation extends Component<
                             onClick={() => {
                                 requestPermission();
                                 this.setState({showRequestNotification: false});
-                            }}
-                        >
+                            }}>
                             Enable Notifications
                         </Button>
                     ) : null}
diff --git a/ui/src/message/Messages.tsx b/ui/src/message/Messages.tsx
index 72a298d..7cafdab 100644
--- a/ui/src/message/Messages.tsx
+++ b/ui/src/message/Messages.tsx
@@ -11,7 +11,7 @@ import {inject, Stores} from '../inject';
 import {observable} from 'mobx';
 import ReactInfinite from 'react-infinite';
 import {IMessage} from '../types';
-import ConfirmDialog from "../common/ConfirmDialog";
+import ConfirmDialog from '../common/ConfirmDialog';
 
 type IProps = RouteComponentProps<{id: string}>;
 
@@ -73,8 +73,7 @@ class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>,
                             disabled={!hasMessages}
                             color="primary"
                             onClick={() => messagesStore.refreshByApp(appId)}
-                            style={{marginRight: 5}}
-                        >
+                            style={{marginRight: 5}}>
                             Refresh
                         </Button>
                         <Button
@@ -82,21 +81,20 @@ class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>,
                             variant="contained"
                             disabled={!hasMessages}
                             color="primary"
-                            onClick={() => {this.deleteAll = true}}
-                        >
+                            onClick={() => {
+                                this.deleteAll = true;
+                            }}>
                             Delete All
                         </Button>
                     </div>
-                }
-            >
+                }>
                 {hasMessages ? (
                     <div style={{width: '100%'}} id="messages">
                         <ReactInfinite
                             key={appId}
                             useWindowAsScrollContainer
                             preloadBatchSize={window.innerHeight * 3}
-                            elementHeight={messages.map((m) => this.heights[m.id] || 1)}
-                        >
+                            elementHeight={messages.map((m) => this.heights[m.id] || 1)}>
                             {messages.map(this.renderMessage)}
                         </ReactInfinite>
 
diff --git a/ui/src/plugin/PluginDetailView.tsx b/ui/src/plugin/PluginDetailView.tsx
index d764bb1..dc6dc11 100644
--- a/ui/src/plugin/PluginDetailView.tsx
+++ b/ui/src/plugin/PluginDetailView.tsx
@@ -79,8 +79,7 @@ class PluginDetailView extends Component<IProps & Stores<'pluginStore'>, IState>
                         name={'Configurer'}
                         description={'This is the configuration panel for this plugin.'}
                         icon={Build}
-                        refresh={this.refreshConfigurer.bind(this)}
-                    >
+                        refresh={this.refreshConfigurer.bind(this)}>
                         <ConfigurerPanel
                             pluginInfo={pluginInfo}
                             initialConfig={
@@ -100,8 +99,7 @@ class PluginDetailView extends Component<IProps & Stores<'pluginStore'>, IState>
                         name={'Displayer'}
                         description={'This is the information generated by the plugin.'}
                         refresh={this.refreshDisplayer.bind(this)}
-                        icon={Subject}
-                    >
+                        icon={Subject}>
                         <DisplayerPanel
                             pluginInfo={pluginInfo}
                             displayText={
@@ -147,8 +145,7 @@ const PanelWrapper: React.FC<IPanelWrapperProps> = ({
                         style={{float: 'right'}}
                         onClick={() => {
                             refresh();
-                        }}
-                    >
+                        }}>
                         <Refresh />
                     </Button>
                 ) : null}
@@ -202,8 +199,7 @@ class ConfigurerPanel extends Component<IConfigurerPanelProps, {unsavedChanges:
                         this.props.save(newConfig!).then(() => {
                             this.setState({unsavedChanges: null});
                         });
-                    }}
-                >
+                    }}>
                     <Typography variant="button">Save</Typography>
                 </Button>
             </div>
@@ -264,8 +260,7 @@ class PluginInfo extends Component<{pluginInfo: IPlugin}> {
                                 href={url}
                                 target="_blank"
                                 rel="noopener noreferrer"
-                                className="custom-route"
-                            >
+                                className="custom-route">
                                 {url}
                             </a>
                         ))(`${config.get('url')}plugin/${id}/custom/${token}/`)}
diff --git a/ui/src/snack/SnackBarHandler.tsx b/ui/src/snack/SnackBarHandler.tsx
index d88b23f..5d08fb9 100644
--- a/ui/src/snack/SnackBarHandler.tsx
+++ b/ui/src/snack/SnackBarHandler.tsx
@@ -42,8 +42,7 @@ class SnackBarHandler extends Component<Stores<'snackManager'>> {
                         key="close"
                         aria-label="Close"
                         color="inherit"
-                        onClick={this.closeCurrentSnack}
-                    >
+                        onClick={this.closeCurrentSnack}>
                         <Close />
                     </IconButton>
                 }
diff --git a/ui/src/user/AddEditUserDialog.tsx b/ui/src/user/AddEditUserDialog.tsx
index 744ba25..cad98ce 100644
--- a/ui/src/user/AddEditUserDialog.tsx
+++ b/ui/src/user/AddEditUserDialog.tsx
@@ -44,8 +44,7 @@ export default class AddEditDialog extends Component<IProps, IState> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="add-edit-user-dialog"
-            >
+                id="add-edit-user-dialog">
                 <DialogTitle id="form-dialog-title">
                     {isEdit ? 'Edit ' + this.props.name : 'Add a user'}
                 </DialogTitle>
@@ -91,16 +90,14 @@ export default class AddEditDialog extends Component<IProps, IState> {
                                     ? ''
                                     : 'password is required'
                                 : 'name is required'
-                        }
-                    >
+                        }>
                         <div>
                             <Button
                                 className="save-create"
                                 disabled={!passPresent || !namePresent}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 {isEdit ? 'Save' : 'Create'}
                             </Button>
                         </div>
diff --git a/ui/src/user/Login.tsx b/ui/src/user/Login.tsx
index 439ec33..e400ed8 100644
--- a/ui/src/user/Login.tsx
+++ b/ui/src/user/Login.tsx
@@ -52,8 +52,7 @@ class Login extends Component<Stores<'currentUser'>> {
                                 color="primary"
                                 disabled={!!this.props.currentUser.connectionErrorMessage}
                                 style={{marginTop: 15, marginBottom: 5}}
-                                onClick={this.login}
-                            >
+                                onClick={this.login}>
                                 Login
                             </Button>
                         </form>
@@ -81,8 +80,7 @@ class Login extends Component<Stores<'currentUser'>> {
                     id="register"
                     variant="contained"
                     color="primary"
-                    onClick={() => (this.registerDialog = true)}
-                >
+                    onClick={() => (this.registerDialog = true)}>
                     Register
                 </Button>
             );
diff --git a/ui/src/user/Register.tsx b/ui/src/user/Register.tsx
index e4e594a..9ef3470 100644
--- a/ui/src/user/Register.tsx
+++ b/ui/src/user/Register.tsx
@@ -41,8 +41,7 @@ export default class RegistrationDialog extends Component<IProps, IState> {
                 open={true}
                 onClose={fClose}
                 aria-labelledby="form-dialog-title"
-                id="add-edit-user-dialog"
-            >
+                id="add-edit-user-dialog">
                 <DialogTitle id="form-dialog-title">Registration</DialogTitle>
                 <DialogContent>
                     <TextField
@@ -75,16 +74,14 @@ export default class RegistrationDialog extends Component<IProps, IState> {
                                     ? ''
                                     : 'password is required'
                                 : 'name is required'
-                        }
-                    >
+                        }>
                         <div>
                             <Button
                                 className="save-create"
                                 disabled={!passPresent || !namePresent}
                                 onClick={submitAndClose}
                                 color="primary"
-                                variant="contained"
-                            >
+                                variant="contained">
                                 Register
                             </Button>
                         </div>
diff --git a/ui/src/user/Users.tsx b/ui/src/user/Users.tsx
index 72e7288..df71c8b 100644
--- a/ui/src/user/Users.tsx
+++ b/ui/src/user/Users.tsx
@@ -75,12 +75,10 @@ class Users extends Component<WithStyles<'wrapper'> & Stores<'userStore'>> {
                         id="create-user"
                         variant="contained"
                         color="primary"
-                        onClick={() => (this.createDialog = true)}
-                    >
+                        onClick={() => (this.createDialog = true)}>
                         Create User
                     </Button>
-                }
-            >
+                }>
                 <Grid item xs={12}>
                     <Paper elevation={6}>
                         <Table id="user-table">