diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx
index 64afa40..2b6b0aa 100644
--- a/web/src/components/About.jsx
+++ b/web/src/components/About.jsx
@@ -11,6 +11,8 @@ import ListItemIcon from '@material-ui/core/ListItemIcon'
 import ListItemText from '@material-ui/core/ListItemText'
 import { useTranslation } from 'react-i18next'
 import { echoHost } from 'utils/Hosts'
+import { ThemeProvider } from '@material-ui/core/styles'
+import { lightTheme } from 'components/App'
 
 export default function AboutDialog() {
   const { t } = useTranslation()
@@ -29,59 +31,55 @@ export default function AboutDialog() {
         <ListItemText primary={t('About')} />
       </ListItem>
 
-      <Dialog
-        open={open}
-        onClose={() => setOpen(false)}
-        aria-labelledby='form-dialog-title'
-        fullWidth
-        maxWidth='sm'
-      >
-        <DialogTitle id='form-dialog-title'>{t('About')}</DialogTitle>
+      <ThemeProvider theme={lightTheme}>
+        <Dialog open={open} onClose={() => setOpen(false)} aria-labelledby='form-dialog-title' fullWidth maxWidth='sm'>
+          <DialogTitle id='form-dialog-title'>{t('About')}</DialogTitle>
 
-        <DialogContent>
-          <center>
-            <h2>TorrServer {torrServerVersion}</h2>
-            <a style={{ color: '#00a572' }} href='https://github.com/YouROK/TorrServer'>
-              https://github.com/YouROK/TorrServer
-            </a>
-          </center>
           <DialogContent>
             <center>
-              <h2>{t('ThanksToEveryone')}</h2>
+              <h2>TorrServer {torrServerVersion}</h2>
+              <a style={{ color: '#00a572' }} href='https://github.com/YouROK/TorrServer'>
+                https://github.com/YouROK/TorrServer
+              </a>
             </center>
-            <br />
-            <h2>{t('SpecialThanks')}</h2>
-            <b>anacrolix Matt Joiner</b>&nbsp;
-            <a style={{ color: '#00a572' }} href='https://github.com/anacrolix/'>
-              github.com/anacrolix
-            </a>
-            <br />
-            <b>nikk</b>&nbsp;
-            <a style={{ color: '#00a572' }} href='https://github.com/tsynik'>
-              github.com/tsynik
-            </a>
-            <br />
-            <b>dancheskus</b>&nbsp;
-            <a style={{ color: '#00a572' }} href='https://github.com/dancheskus'>
-              github.com/dancheskus
-            </a>
-            <br />
-            <b>tw1cker Руслан Пахнев</b>&nbsp;
-            <a style={{ color: '#00a572' }} href='https://github.com/Nemiroff'>
-              github.com/Nemiroff
-            </a>
-            <br />
-            <b>SpAwN_LMG</b>
-            <br />
+            <DialogContent>
+              <center>
+                <h2>{t('ThanksToEveryone')}</h2>
+              </center>
+              <br />
+              <h2>{t('SpecialThanks')}</h2>
+              <b>anacrolix Matt Joiner</b>&nbsp;
+              <a style={{ color: '#00a572' }} href='https://github.com/anacrolix/'>
+                github.com/anacrolix
+              </a>
+              <br />
+              <b>nikk</b>&nbsp;
+              <a style={{ color: '#00a572' }} href='https://github.com/tsynik'>
+                github.com/tsynik
+              </a>
+              <br />
+              <b>dancheskus</b>&nbsp;
+              <a style={{ color: '#00a572' }} href='https://github.com/dancheskus'>
+                github.com/dancheskus
+              </a>
+              <br />
+              <b>tw1cker Руслан Пахнев</b>&nbsp;
+              <a style={{ color: '#00a572' }} href='https://github.com/Nemiroff'>
+                github.com/Nemiroff
+              </a>
+              <br />
+              <b>SpAwN_LMG</b>
+              <br />
+            </DialogContent>
           </DialogContent>
-        </DialogContent>
 
-        <DialogActions>
-          <Button onClick={() => setOpen(false)} color='primary' variant='outlined' autoFocus>
-            {t('Close')}
-          </Button>
-        </DialogActions>
-      </Dialog>
+          <DialogActions>
+            <Button onClick={() => setOpen(false)} color='primary' variant='outlined' autoFocus>
+              {t('Close')}
+            </Button>
+          </DialogActions>
+        </Dialog>
+      </ThemeProvider>
     </div>
   )
 }
diff --git a/web/src/components/Add/AddDialog.jsx b/web/src/components/Add/AddDialog.jsx
index 2e0c460..71d0e96 100644
--- a/web/src/components/Add/AddDialog.jsx
+++ b/web/src/components/Add/AddDialog.jsx
@@ -270,7 +270,11 @@ export default function AddDialog({
             onClick={handleSave}
             color='primary'
           >
-            {isLoadingButton ? <CircularProgress style={{ color: 'white' }} size={20} /> : t(isEditMode ? 'Save' : 'Add')}
+            {isLoadingButton ? (
+              <CircularProgress style={{ color: 'white' }} size={20} />
+            ) : (
+              t(isEditMode ? 'Save' : 'Add' )
+            )}
           </Button>
         </ButtonWrapper>
       </Dialog>
diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx
index 665b0e3..a4fdb1a 100644
--- a/web/src/components/App/index.jsx
+++ b/web/src/components/App/index.jsx
@@ -30,7 +30,7 @@ export const lightTheme = createMuiTheme({
   palette: {
     type: 'light',
     primary: { main: '#00a572' },
-    background: { paper: '#cbe8d9' },
+    background: { paper: '#f1f1f1' },
   },
   typography: { fontFamily: 'Open Sans, sans-serif' },
 })
@@ -92,7 +92,7 @@ export default function App() {
             <Sidebar isDrawerOpen={isDrawerOpen} setIsDonationDialogOpen={setIsDonationDialogOpen} />
           </ThemeProvider>
           <TorrentList />
-          <ThemeProvider theme={darkTheme}>
+          <ThemeProvider theme={lightTheme}>
             {isDonationDialogOpen && <DonateDialog onClose={() => setIsDonationDialogOpen(false)} />}
           </ThemeProvider>
           {!JSON.parse(localStorage.getItem('snackbarIsClosed')) && <DonateSnackbar />}
diff --git a/web/src/components/CloseServer.jsx b/web/src/components/CloseServer.jsx
index 004f29a..eefa178 100644
--- a/web/src/components/CloseServer.jsx
+++ b/web/src/components/CloseServer.jsx
@@ -3,6 +3,8 @@ import { Button, Dialog, DialogActions, DialogTitle, ListItem, ListItemIcon, Lis
 import { PowerSettingsNew as PowerSettingsNewIcon } from '@material-ui/icons'
 import { shutdownHost } from 'utils/Hosts'
 import { useTranslation } from 'react-i18next'
+import { ThemeProvider } from '@material-ui/core/styles'
+import { lightTheme } from 'components/App'
 
 export default function CloseServer() {
   const { t } = useTranslation()
@@ -20,26 +22,28 @@ export default function CloseServer() {
         <ListItemText primary={t('CloseServer')} />
       </ListItem>
 
-      <Dialog open={open} onClose={closeDialog}>
-        <DialogTitle>{t('CloseServer?')}</DialogTitle>
-        <DialogActions>
-          <Button variant='outlined' onClick={closeDialog} color='primary'>
-            {t('Cancel')}
-          </Button>
+      <ThemeProvider theme={lightTheme}>
+        <Dialog open={open} onClose={closeDialog}>
+          <DialogTitle>{t('CloseServer?')}</DialogTitle>
+          <DialogActions>
+            <Button variant='outlined' onClick={closeDialog} color='primary'>
+              {t('Cancel')}
+            </Button>
 
-          <Button
-            variant='contained'
-            onClick={() => {
-              fetch(shutdownHost())
-              closeDialog()
-            }}
-            color='primary'
-            autoFocus
-          >
-            {t('TurnOff')}
-          </Button>
-        </DialogActions>
-      </Dialog>
+            <Button
+              variant='contained'
+              onClick={() => {
+                fetch(shutdownHost())
+                closeDialog()
+              }}
+              color='primary'
+              autoFocus
+            >
+              {t('TurnOff')}
+            </Button>
+          </DialogActions>
+        </Dialog>
+      </ThemeProvider>
     </>
   )
 }
diff --git a/web/src/components/RemoveAll.jsx b/web/src/components/RemoveAll.jsx
index be9c719..f9b90d5 100644
--- a/web/src/components/RemoveAll.jsx
+++ b/web/src/components/RemoveAll.jsx
@@ -6,6 +6,8 @@ import DeleteIcon from '@material-ui/icons/Delete'
 import { useState } from 'react'
 import { torrentsHost } from 'utils/Hosts'
 import { useTranslation } from 'react-i18next'
+import { ThemeProvider } from '@material-ui/core/styles'
+import { lightTheme } from 'components/App'
 
 const fnRemoveAll = () => {
   fetch(torrentsHost(), {
@@ -46,26 +48,28 @@ export default function RemoveAll() {
         <ListItemText primary={t('RemoveAll')} />
       </ListItem>
 
-      <Dialog open={open} onClose={closeDialog}>
-        <DialogTitle>{t('DeleteTorrents?')}</DialogTitle>
-        <DialogActions>
-          <Button variant='outlined' onClick={closeDialog} color='primary'>
-            {t('Cancel')}
-          </Button>
+      <ThemeProvider theme={lightTheme}>
+        <Dialog open={open} onClose={closeDialog}>
+          <DialogTitle>{t('DeleteTorrents?')}</DialogTitle>
+          <DialogActions>
+            <Button variant='outlined' onClick={closeDialog} color='primary'>
+              {t('Cancel')}
+            </Button>
 
-          <Button
-            variant='contained'
-            onClick={() => {
-              fnRemoveAll()
-              closeDialog()
-            }}
-            color='primary'
-            autoFocus
-          >
-            {t('OK')}
-          </Button>
-        </DialogActions>
-      </Dialog>
+            <Button
+              variant='contained'
+              onClick={() => {
+                fnRemoveAll()
+                closeDialog()
+              }}
+              color='primary'
+              autoFocus
+            >
+              {t('OK')}
+            </Button>
+          </DialogActions>
+        </Dialog>
+      </ThemeProvider>
     </>
   )
 }
diff --git a/web/src/components/Settings.jsx b/web/src/components/Settings.jsx
index 3e5cb5c..d84a0aa 100644
--- a/web/src/components/Settings.jsx
+++ b/web/src/components/Settings.jsx
@@ -13,6 +13,8 @@ import Button from '@material-ui/core/Button'
 import { FormControlLabel, InputLabel, Select, Switch } from '@material-ui/core'
 import { settingsHost, setTorrServerHost, getTorrServerHost } from 'utils/Hosts'
 import { useTranslation } from 'react-i18next'
+import { ThemeProvider } from '@material-ui/core/styles'
+import { lightTheme } from 'components/App'
 
 export default function SettingsDialog() {
   const { t } = useTranslation()
@@ -100,193 +102,195 @@ export default function SettingsDialog() {
         <ListItemText primary={t('Settings')} />
       </ListItem>
 
-      <Dialog open={open} onClose={handleClose} aria-labelledby='form-dialog-title' fullWidth>
-        <DialogTitle id='form-dialog-title'>{t('Settings')}</DialogTitle>
-        <DialogContent>
-          <TextField
-            onChange={onInputHost}
-            margin='dense'
-            id='TorrServerHost'
-            label={t('Host')}
-            value={tsHost}
-            type='url'
-            fullWidth
-          />
-          {show && (
-            <>
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='CacheSize'
-                label={t('CacheSize')}
-                value={CacheSize}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='ReaderReadAHead'
-                label={t('ReaderReadAHead')}
-                value={ReaderReadAHead}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={PreloadBuffer} onChange={inputForm} id='PreloadBuffer' color='primary' />}
-                label={t('PreloadBuffer')}
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={UseDisk} onChange={inputForm} id='UseDisk' color='primary' />}
-                label={t('UseDisk')}
-              />
-              <br />
-              <small>{t('UseDiskDesc')}</small>
-              <br />
-              <FormControlLabel
-                control={
-                  <Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='primary' />
-                }
-                label={t('RemoveCacheOnDrop')}
-              />
-              <br />
-              <small>{t('RemoveCacheOnDropDesc')}</small>
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='TorrentsSavePath'
-                label={t('TorrentsSavePath')}
-                value={TorrentsSavePath}
-                type='url'
-                fullWidth
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={EnableIPv6} onChange={inputForm} id='EnableIPv6' color='primary' />}
-                label={t('EnableIPv6')}
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisableTCP} onChange={inputForm} id='DisableTCP' color='primary' />}
-                label={t('TCP')}
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisableUTP} onChange={inputForm} id='DisableUTP' color='primary' />}
-                label={t('UTP')}
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisablePEX} onChange={inputForm} id='DisablePEX' color='primary' />}
-                label={t('PEX')}
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={ForceEncrypt} onChange={inputForm} id='ForceEncrypt' color='primary' />}
-                label={t('ForceEncrypt')}
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='TorrentDisconnectTimeout'
-                label={t('TorrentDisconnectTimeout')}
-                value={TorrentDisconnectTimeout}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='ConnectionsLimit'
-                label={t('ConnectionsLimit')}
-                value={ConnectionsLimit}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisableDHT} onChange={inputForm} id='DisableDHT' color='primary' />}
-                label={t('DHT')}
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='DhtConnectionLimit'
-                label={t('DhtConnectionLimit')}
-                value={DhtConnectionLimit}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='DownloadRateLimit'
-                label={t('DownloadRateLimit')}
-                value={DownloadRateLimit}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisableUpload} onChange={inputForm} id='DisableUpload' color='primary' />}
-                label={t('Upload')}
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='UploadRateLimit'
-                label={t('UploadRateLimit')}
-                value={UploadRateLimit}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <TextField
-                onChange={inputForm}
-                margin='dense'
-                id='PeersListenPort'
-                label={t('PeersListenPort')}
-                value={PeersListenPort}
-                type='number'
-                fullWidth
-              />
-              <br />
-              <FormControlLabel
-                control={<Switch checked={!DisableUPNP} onChange={inputForm} id='DisableUPNP' color='primary' />}
-                label={t('UPNP')}
-              />
-              <br />
-              <InputLabel htmlFor='RetrackersMode'>{t('RetrackersMode')}</InputLabel>
-              <Select onChange={inputForm} type='number' native id='RetrackersMode' value={RetrackersMode}>
-                <option value={0}>{t('DontAddRetrackers')}</option>
-                <option value={1}>{t('AddRetrackers')}</option>
-                <option value={2}>{t('RemoveRetrackers')}</option>
-                <option value={3}>{t('ReplaceRetrackers')}</option>
-              </Select>
-              <br />
-            </>
-          )}
-        </DialogContent>
+      <ThemeProvider theme={lightTheme}>
+        <Dialog open={open} onClose={handleClose} aria-labelledby='form-dialog-title' fullWidth>
+          <DialogTitle id='form-dialog-title'>{t('Settings')}</DialogTitle>
+          <DialogContent>
+            <TextField
+              onChange={onInputHost}
+              margin='dense'
+              id='TorrServerHost'
+              label={t('Host')}
+              value={tsHost}
+              type='url'
+              fullWidth
+            />
+            {show && (
+              <>
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='CacheSize'
+                  label={t('CacheSize')}
+                  value={CacheSize}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='ReaderReadAHead'
+                  label={t('ReaderReadAHead')}
+                  value={ReaderReadAHead}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={PreloadBuffer} onChange={inputForm} id='PreloadBuffer' color='primary' />}
+                  label={t('PreloadBuffer')}
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={UseDisk} onChange={inputForm} id='UseDisk' color='primary' />}
+                  label={t('UseDisk')}
+                />
+                <br />
+                <small>{t('UseDiskDesc')}</small>
+                <br />
+                <FormControlLabel
+                  control={
+                    <Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='primary' />
+                  }
+                  label={t('RemoveCacheOnDrop')}
+                />
+                <br />
+                <small>{t('RemoveCacheOnDropDesc')}</small>
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='TorrentsSavePath'
+                  label={t('TorrentsSavePath')}
+                  value={TorrentsSavePath}
+                  type='url'
+                  fullWidth
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={EnableIPv6} onChange={inputForm} id='EnableIPv6' color='primary' />}
+                  label={t('EnableIPv6')}
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisableTCP} onChange={inputForm} id='DisableTCP' color='primary' />}
+                  label={t('TCP')}
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisableUTP} onChange={inputForm} id='DisableUTP' color='primary' />}
+                  label={t('UTP')}
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisablePEX} onChange={inputForm} id='DisablePEX' color='primary' />}
+                  label={t('PEX')}
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={ForceEncrypt} onChange={inputForm} id='ForceEncrypt' color='primary' />}
+                  label={t('ForceEncrypt')}
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='TorrentDisconnectTimeout'
+                  label={t('TorrentDisconnectTimeout')}
+                  value={TorrentDisconnectTimeout}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='ConnectionsLimit'
+                  label={t('ConnectionsLimit')}
+                  value={ConnectionsLimit}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisableDHT} onChange={inputForm} id='DisableDHT' color='primary' />}
+                  label={t('DHT')}
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='DhtConnectionLimit'
+                  label={t('DhtConnectionLimit')}
+                  value={DhtConnectionLimit}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='DownloadRateLimit'
+                  label={t('DownloadRateLimit')}
+                  value={DownloadRateLimit}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisableUpload} onChange={inputForm} id='DisableUpload' color='primary' />}
+                  label={t('Upload')}
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='UploadRateLimit'
+                  label={t('UploadRateLimit')}
+                  value={UploadRateLimit}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <TextField
+                  onChange={inputForm}
+                  margin='dense'
+                  id='PeersListenPort'
+                  label={t('PeersListenPort')}
+                  value={PeersListenPort}
+                  type='number'
+                  fullWidth
+                />
+                <br />
+                <FormControlLabel
+                  control={<Switch checked={!DisableUPNP} onChange={inputForm} id='DisableUPNP' color='primary' />}
+                  label={t('UPNP')}
+                />
+                <br />
+                <InputLabel htmlFor='RetrackersMode'>{t('RetrackersMode')}</InputLabel>
+                <Select onChange={inputForm} type='number' native id='RetrackersMode' value={RetrackersMode}>
+                  <option value={0}>{t('DontAddRetrackers')}</option>
+                  <option value={1}>{t('AddRetrackers')}</option>
+                  <option value={2}>{t('RemoveRetrackers')}</option>
+                  <option value={3}>{t('ReplaceRetrackers')}</option>
+                </Select>
+                <br />
+              </>
+            )}
+          </DialogContent>
 
-        <DialogActions>
-          <Button onClick={handleClose} color='primary' variant='outlined'>
-            {t('Cancel')}
-          </Button>
+          <DialogActions>
+            <Button onClick={handleClose} color='primary' variant='outlined'>
+              {t('Cancel')}
+            </Button>
 
-          <Button onClick={handleSave} color='primary' variant='outlined'>
-            {t('Save')}
-          </Button>
-        </DialogActions>
-      </Dialog>
+            <Button onClick={handleSave} color='primary' variant='outlined'>
+              {t('Save')}
+            </Button>
+          </DialogActions>
+        </Dialog>
+      </ThemeProvider>
     </div>
   )
 }