diff --git a/import.sql b/import.sql
index 2ccabfec5..e3471043d 100644
--- a/import.sql
+++ b/import.sql
@@ -118,9 +118,12 @@ CREATE TABLE IF NOT EXISTS `npwd_marketplace_listings`
 
 CREATE TABLE IF NOT EXISTS `npwd_marketplace_reports`
 (
-    `id`         int(11) NOT NULL AUTO_INCREMENT,
-    `listing_id` int(11)      DEFAULT NULL,
-    `profile`    varchar(255) DEFAULT NULL,
+    `id`          int(11)      NOT NULL AUTO_INCREMENT,
+    `listing_id`  int(11)      DEFAULT NULL,
+    `profile`     varchar(255) DEFAULT NULL,
+    `title`       varchar(255) NOT NULL,
+    `description` varchar(255) NOT NULL,
+    `url`         varchar(255) NOT NULL,
     PRIMARY KEY (id)
 );
 
@@ -181,8 +184,8 @@ CREATE TABLE IF NOT EXISTS `npwd_calls`
 
 CREATE TABLE IF NOT EXISTS npwd_phone_gallery
 (
-    `id`         int(11) NOT NULL AUTO_INCREMENT,
-    `identifier` varchar(48)  DEFAULT NULL,
+    `id`         int(11)      NOT NULL AUTO_INCREMENT,
+    `identifier` varchar(48) DEFAULT NULL,
     `image`      varchar(255) NOT NULL,
     PRIMARY KEY (id),
     INDEX `identifier` (`identifier`)
diff --git a/package.json b/package.json
index c5d73ffb1..913a83c50 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@octokit/core": "^3.5.1",
     "husky": "^7.0.4",
     "lerna": "^4.0.0",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.0",
     "pretty-quick": "^3.1.2"
   },
   "scripts": {
diff --git a/phone/src/apps/contacts/hooks/useContactsAPI.ts b/phone/src/apps/contacts/hooks/useContactsAPI.ts
index 3a5740772..8b802aeb1 100644
--- a/phone/src/apps/contacts/hooks/useContactsAPI.ts
+++ b/phone/src/apps/contacts/hooks/useContactsAPI.ts
@@ -22,7 +22,7 @@ export const useContactsAPI = () => {
       }).then((serverResp) => {
         if (serverResp.status !== 'ok') {
           return addAlert({
-            message: t('CONTACTS.ADD_FAILED'),
+            message: t('CONTACTS.FEEDBACK.ADD_FAILED'),
             type: 'error',
           });
         }
@@ -30,7 +30,7 @@ export const useContactsAPI = () => {
         // Sanity checks maybe?
         addLocalContact(serverResp.data);
         addAlert({
-          message: t('CONTACTS.ADD_SUCCESS'),
+          message: t('CONTACTS.FEEDBACK.ADD_SUCCESS'),
           type: 'success',
         });
         history.replace(referral);
@@ -49,7 +49,7 @@ export const useContactsAPI = () => {
       }).then((resp) => {
         if (resp.status !== 'ok') {
           return addAlert({
-            message: t('CONTACTS.UPDATE_FAILED'),
+            message: t('CONTACTS.FEEDBACK.UPDATE_FAILED'),
             type: 'error',
           });
         }
@@ -62,7 +62,7 @@ export const useContactsAPI = () => {
         });
 
         addAlert({
-          message: t('CONTACTS.UPDATE_SUCCESS'),
+          message: t('CONTACTS.FEEDBACK.UPDATE_SUCCESS'),
           type: 'success',
         });
 
@@ -77,7 +77,7 @@ export const useContactsAPI = () => {
       fetchNui<ServerPromiseResp>(ContactEvents.DELETE_CONTACT, { id }).then((resp) => {
         if (resp.status !== 'ok') {
           return addAlert({
-            message: t('CONTACTS.DELETE_FAILED'),
+            message: t('CONTACTS.FEEDBACK.DELETE_FAILED'),
             type: 'error',
           });
         }
@@ -86,7 +86,7 @@ export const useContactsAPI = () => {
         deleteLocalContact(id);
 
         addAlert({
-          message: t('CONTACTS.DELETE_SUCCESS'),
+          message: t('CONTACTS.FEEDBACK.DELETE_SUCCESS'),
           type: 'success',
         });
       });
diff --git a/phone/src/apps/dialer/components/DialerInput.tsx b/phone/src/apps/dialer/components/DialerInput.tsx
index e3019a6d8..074023499 100644
--- a/phone/src/apps/dialer/components/DialerInput.tsx
+++ b/phone/src/apps/dialer/components/DialerInput.tsx
@@ -48,7 +48,7 @@ export const DialerInput: React.FC = () => {
   return (
     <Box component={Paper} className={classes.root}>
       <InputBase
-        placeholder={t('APPS_DIALER_INPUT_PLACEHOLDER')}
+        placeholder={t('DIALER.INPUT_PLACEHOLDER')}
         className={classes.input}
         value={inputVal}
         onChange={(e) => set(e.target.value)}
diff --git a/phone/src/apps/dialer/components/DialerNavBar.tsx b/phone/src/apps/dialer/components/DialerNavBar.tsx
index f26ea1c11..79e3bfd1a 100644
--- a/phone/src/apps/dialer/components/DialerNavBar.tsx
+++ b/phone/src/apps/dialer/components/DialerNavBar.tsx
@@ -31,14 +31,14 @@ const DialerNavBar: React.FC = () => {
   return (
     <BottomNavigation value={page} onChange={handleChange} showLabels className={classes.root}>
       <BottomNavigationAction
-        label={t('APPS_DIALER_NAVBAR_HISTORY')}
+        label={t('DIALER.NAVBAR_HISTORY')}
         value="/phone"
         component={NavLink}
         icon={<HistoryIcon />}
         to="/phone"
       />
       <BottomNavigationAction
-        label={t('APPS_DIALER_NAVBAR_DIAL')}
+        label={t('DIALER.NAVBAR_DIAL')}
         value="/phone/dial"
         color="secondary"
         component={NavLink}
@@ -46,7 +46,7 @@ const DialerNavBar: React.FC = () => {
         to="/phone/dial"
       />
       <BottomNavigationAction
-        label={t('APPS_DIALER_NAVBAR_CONTACTS')}
+        label={t('DIALER.NAVBAR_CONTACTS')}
         value="/phone/contacts"
         color="secondary"
         component={NavLink}
diff --git a/phone/src/apps/dialer/components/views/DialerHistory.tsx b/phone/src/apps/dialer/components/views/DialerHistory.tsx
index 9445f2d81..c74ae955e 100644
--- a/phone/src/apps/dialer/components/views/DialerHistory.tsx
+++ b/phone/src/apps/dialer/components/views/DialerHistory.tsx
@@ -43,7 +43,7 @@ export const DialerHistory: React.FC = () => {
     return (
       <Box display="flex" justifyContent="center" alignItems="center" paddingTop={35}>
         <p>
-          {t('APPS_DIALER_NO_HISTORY')}
+          {t('DIALER.NO_HISTORY')}
           <span role="img" aria-label="sad">
             😞
           </span>
diff --git a/phone/src/apps/marketplace/components/MarketplaceList/ListingActions.tsx b/phone/src/apps/marketplace/components/MarketplaceList/ListingActions.tsx
index 8fab4ceee..56ecc08b8 100644
--- a/phone/src/apps/marketplace/components/MarketplaceList/ListingActions.tsx
+++ b/phone/src/apps/marketplace/components/MarketplaceList/ListingActions.tsx
@@ -36,13 +36,13 @@ export const ListingActions: React.FC<MarketplaceListing> = ({ children, ...list
     }).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MARKETPLACE_DELETE_LISTING_FAILED'),
+          message: t('MARKETPLACE.FEEDBACK.DELETE_LISTING_FAILED'),
           type: 'error',
         });
       }
 
       addAlert({
-        message: t('APPS_MARKETPLACE_DELETE_LISTING_SUCCESS'),
+        message: t('MARKETPLACE.FEEDBACK.DELETE_LISTING_SUCCESS'),
         type: 'success',
       });
     });
@@ -54,13 +54,13 @@ export const ListingActions: React.FC<MarketplaceListing> = ({ children, ...list
     }).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MARKETPLACE_REPORT_LISTING_FAILED'),
+          message: t('MARKETPLACE.FEEDBACK.REPORT_LISTING_FAILED'),
           type: 'error',
         });
       }
 
       addAlert({
-        message: t('APPS_MARKETPLACE_REPORT_LISTING_SUCCESS'),
+        message: t('MARKETPLACE.FEEDBACK.REPORT_LISTING_SUCCESS'),
         type: 'success',
       });
     });
diff --git a/phone/src/apps/marketplace/components/MarketplaceList/MarketplaceItem.tsx b/phone/src/apps/marketplace/components/MarketplaceList/MarketplaceItem.tsx
index b2f419e4a..c9ca0f9a1 100644
--- a/phone/src/apps/marketplace/components/MarketplaceList/MarketplaceItem.tsx
+++ b/phone/src/apps/marketplace/components/MarketplaceList/MarketplaceItem.tsx
@@ -26,6 +26,7 @@ const useStyles = makeStyles((theme) => ({
     display: 'flex',
     flexFlow: 'column',
     alignItems: 'flex',
+    borderWidth: 2,
     height: 'auto',
     background: theme.palette.background.paper,
     marginBottom: 20,
diff --git a/phone/src/apps/marketplace/components/form/ListingForm.tsx b/phone/src/apps/marketplace/components/form/ListingForm.tsx
index f7612294c..ec3c56265 100644
--- a/phone/src/apps/marketplace/components/form/ListingForm.tsx
+++ b/phone/src/apps/marketplace/components/form/ListingForm.tsx
@@ -59,7 +59,7 @@ export const ListingForm: React.FC = () => {
   const addListing = () => {
     if (!areFieldsFilled) {
       return addAlert({
-        message: t('APPS_MARKETPLACE_REQUIRED_FIELDS'),
+        message: t('MARKETPLACE.FEEDBACK.REQUIRED_FIELDS'),
         type: 'error',
       });
     }
@@ -78,13 +78,13 @@ export const ListingForm: React.FC = () => {
         }
 
         return addAlert({
-          message: t('APPS_MARKETPLACE_CREATE_LISTING_FAILED'),
+          message: t('MARKETPLACE.FEEDBACK.CREATE_LISTING_FAILED'),
           type: 'error',
         });
       }
 
       addAlert({
-        message: t('APPS_MARKETPLACE_CREATE_LISTING_SUCCESS'),
+        message: t('MARKETPLACE.FEEDBACK.CREATE_LISTING_SUCCESS'),
         type: 'success',
       });
       history.push('/marketplace');
@@ -131,7 +131,7 @@ export const ListingForm: React.FC = () => {
         error={title.length >= MarketplaceDatabaseLimits.title}
         onChange={handleTitleChange}
         label={t('GENERIC.REQUIRED')}
-        placeholder={t('APPS_MARKETPLACE_FORM_TITLE')}
+        placeholder={t('MARKETPLACE.FORM_TITLE')}
         inputProps={{
           className: classes.textFieldInput,
           maxLength: 25,
@@ -153,7 +153,7 @@ export const ListingForm: React.FC = () => {
       </Box>
       <TextField
         className={classes.input}
-        placeholder={t('APPS_MARKETPLACE_FORM_IMAGE')}
+        placeholder={t('MARKETPLACE.FORM_IMAGE')}
         value={url}
         error={url.length >= MarketplaceDatabaseLimits.url}
         onChange={handleUrlChange}
@@ -168,7 +168,7 @@ export const ListingForm: React.FC = () => {
         onChange={handleDescriptionChange}
         label={t('GENERIC.REQUIRED')}
         error={description.length >= MarketplaceDatabaseLimits.description}
-        placeholder={t('APPS_MARKETPLACE_FORM_DESCRIPTION')}
+        placeholder={t('MARKETPLACE.FORM_DESCRIPTION')}
         inputProps={{
           className: classes.multilineFieldInput,
           maxLength: 130,
diff --git a/phone/src/apps/marketplace/hooks/useMarketplaceActions.ts b/phone/src/apps/marketplace/hooks/useMarketplaceActions.ts
index d4fc4bbf3..1bccfe90a 100644
--- a/phone/src/apps/marketplace/hooks/useMarketplaceActions.ts
+++ b/phone/src/apps/marketplace/hooks/useMarketplaceActions.ts
@@ -3,7 +3,7 @@ import { MarketplaceListing } from '@typings/marketplace';
 import { useRecoilCallback } from 'recoil';
 
 interface MarketplaceActionValues {
-  deleteListing: (id: number) => void;
+  deleteListing: (ids: number[]) => void;
   addListing: (listing: MarketplaceListing) => void;
 }
 
@@ -12,7 +12,7 @@ export const useMarketplaceActions = (): MarketplaceActionValues => {
 
   const deleteListing = useRecoilCallback(
     ({ snapshot }) =>
-      (id: number) => {
+      (ids: number[]) => {
         const { state, contents } = snapshot.getLoadable(listingState);
         // Make sure our atom is actually loaded before we attempt a dispatch
         if (state !== 'hasValue') return;
@@ -20,7 +20,9 @@ export const useMarketplaceActions = (): MarketplaceActionValues => {
         // block dispatch
         if (!contents.length) return;
 
-        setListings((curListings) => [...curListings].filter((listing) => listing.id !== id));
+        setListings((curListings) =>
+          [...curListings].filter((listing) => !ids.includes(listing.id)),
+        );
       },
     [],
   );
@@ -28,9 +30,9 @@ export const useMarketplaceActions = (): MarketplaceActionValues => {
   const addListing = useRecoilCallback(
     ({ snapshot }) =>
       (listing: MarketplaceListing) => {
-        const { contents } = snapshot.getLoadable(listingState);
+        const { state } = snapshot.getLoadable(listingState);
         // Make sure our atom is actually loaded before we attempt a dispatch
-        if (contents !== 'hasValue') return;
+        if (state !== 'hasValue') return;
 
         setListings((curListings) => [listing, ...curListings]);
       },
diff --git a/phone/src/apps/marketplace/hooks/useMarketplaceService.ts b/phone/src/apps/marketplace/hooks/useMarketplaceService.ts
index d15582d5b..871b289d8 100644
--- a/phone/src/apps/marketplace/hooks/useMarketplaceService.ts
+++ b/phone/src/apps/marketplace/hooks/useMarketplaceService.ts
@@ -1,9 +1,5 @@
 import { useNuiEvent } from 'fivem-nui-react-lib';
-import {
-  MarketplaceBroadcastAddDTO,
-  MarketplaceDeleteDTO,
-  MarketplaceEvents,
-} from '@typings/marketplace';
+import { MarketplaceBroadcastAddDTO, MarketplaceEvents } from '@typings/marketplace';
 import { useMarketplaceActions } from './useMarketplaceActions';
 import { useCallback } from 'react';
 
@@ -18,8 +14,8 @@ export const useMarketplaceService = () => {
   );
 
   const deleteListingHandler = useCallback(
-    (listing: MarketplaceDeleteDTO) => {
-      deleteListing(listing.id);
+    (listingIds: number[]) => {
+      deleteListing(listingIds);
     },
     [deleteListing],
   );
@@ -30,9 +26,5 @@ export const useMarketplaceService = () => {
     addListingHandler,
   );
 
-  useNuiEvent<MarketplaceDeleteDTO>(
-    'MARKETPLACE',
-    MarketplaceEvents.BROADCAST_DELETE,
-    deleteListingHandler,
-  );
+  useNuiEvent<number[]>('MARKETPLACE', MarketplaceEvents.BROADCAST_DELETE, deleteListingHandler);
 };
diff --git a/phone/src/apps/match/components/ActiveProfile.tsx b/phone/src/apps/match/components/ActiveProfile.tsx
index edaa7def0..3d5fee196 100644
--- a/phone/src/apps/match/components/ActiveProfile.tsx
+++ b/phone/src/apps/match/components/ActiveProfile.tsx
@@ -128,13 +128,13 @@ const ActiveProfile = ({ profile, onSwipe }: IProps) => {
     <>
       <Draggable id="active-profile" onDrag={onDrag} onDrop={handleSwipe}>
         <Card raised className={c.root}>
-          <StatusDisplay className={likeClass} text={t('APPS_MATCH_LIKED')} visible={isLiked} />
-          <StatusDisplay className={nopeClass} text={t('APPS_MATCH_NOPE')} visible={notLiked} />
+          <StatusDisplay className={likeClass} text={t('MATCH.LIKED')} visible={isLiked} />
+          <StatusDisplay className={nopeClass} text={t('MATCH.NOPE')} visible={notLiked} />
           <Profile profile={profile} />
         </Card>
       </Draggable>
       <Box className={c.buttons} display="flex" justifyContent="center">
-        <Tooltip title={t('APPS_MATCH_DISLIKE')} aria-label="dislike">
+        <Tooltip title={t('MATCH.DISLIKE')} aria-label="dislike">
           <Fab
             size="large"
             color="secondary"
@@ -145,7 +145,7 @@ const ActiveProfile = ({ profile, onSwipe }: IProps) => {
             <CancelIcon />
           </Fab>
         </Tooltip>
-        <Tooltip title={t('APPS_MATCH_LIKE')} aria-label="like">
+        <Tooltip title={t('MATCH.LIKE')} aria-label="like">
           <Fab
             size="large"
             color="primary"
diff --git a/phone/src/apps/match/components/Error.tsx b/phone/src/apps/match/components/Error.tsx
index 3d4ea2074..928e491fe 100644
--- a/phone/src/apps/match/components/Error.tsx
+++ b/phone/src/apps/match/components/Error.tsx
@@ -22,7 +22,7 @@ function NoProfiles() {
   const [t] = useTranslation();
   return (
     <Box className={classes.root}>
-      <Typography variant="h5">{t('APPS_MATCH_NO_PROFILES')}</Typography>
+      <Typography variant="h5">{t('MATCH.FEEDBACK.NO_PROFILES')}</Typography>
     </Box>
   );
 }
diff --git a/phone/src/apps/match/components/matches/Match.tsx b/phone/src/apps/match/components/matches/Match.tsx
index 6e7684ebe..3414858ee 100644
--- a/phone/src/apps/match/components/matches/Match.tsx
+++ b/phone/src/apps/match/components/matches/Match.tsx
@@ -36,7 +36,7 @@ export const Match = ({ match }: IProps) => {
     setShowProfile((show) => !show);
   };
 
-  const secondaryText = t('APPS_MATCH_PROFILE_MATCHED_AT', {
+  const secondaryText = t('MATCH.MESSAGES.PROFILE_MATCHED_AT', {
     matchedAt: match.matchedAtFormatted,
   });
 
diff --git a/phone/src/apps/match/components/profile/Profile.tsx b/phone/src/apps/match/components/profile/Profile.tsx
index 28e82d9d0..32a8ccd1f 100644
--- a/phone/src/apps/match/components/profile/Profile.tsx
+++ b/phone/src/apps/match/components/profile/Profile.tsx
@@ -59,7 +59,7 @@ const Profile = ({ profile }: IProps) => {
           {profile.name}
         </Typography>
         <Typography gutterBottom color="textSecondary" component="p">
-          {t('APPS_MATCH_PROFILE_LAST_ACTIVE', { lastActive: profile.lastActiveFormatted })}
+          {t('MATCH.MESSAGES.PROFILE_LAST_ACTIVE', { lastActive: profile.lastActiveFormatted })}
         </Typography>
         {bioSecondary && (
           <Typography gutterBottom variant="body1" color="textSecondary" component="p">
diff --git a/phone/src/apps/match/components/profile/ProfileForm.tsx b/phone/src/apps/match/components/profile/ProfileForm.tsx
index 50f4784c7..ed81d55f0 100644
--- a/phone/src/apps/match/components/profile/ProfileForm.tsx
+++ b/phone/src/apps/match/components/profile/ProfileForm.tsx
@@ -77,7 +77,7 @@ export function ProfileForm({ profile, showPreview }: IProps) {
     fetchNui<ServerPromiseResp<FormattedProfile>>(event, updatedProfile).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MATCH_UPDATE_PROFILE_FAILED'),
+          message: t('MATCH.FEEDBACK.UPDATE_PROFILE_FAILED'),
           type: 'error',
         });
       }
@@ -85,14 +85,14 @@ export function ProfileForm({ profile, showPreview }: IProps) {
       setMyProfile(resp.data);
 
       addAlert({
-        message: t('APPS_MATCH_UPDATE_PROFILE_SUCCEEDED'),
+        message: t('MATCH.FEEDBACK.UPDATE_PROFILE_SUCCEEDED'),
         type: 'success',
       });
     });
   };
 
   if (!profile && !ResourceConfig.match.allowEditableProfileName) {
-    return <PageText text={t('APPS_MATCH_PROFILE_CONFIGURATION')} />;
+    return <PageText text={t('MATCH.PROFILE_CONFIGURATION')} />;
   }
 
   if (showPreview) {
@@ -106,36 +106,36 @@ export function ProfileForm({ profile, showPreview }: IProps) {
   return (
     <div className={classes.root}>
       <ProfileField
-        label={t('APPS_MATCH_EDIT_PROFILE_IMAGE')}
+        label={t('MATCH.EDIT_PROFILE_IMAGE')}
         value={update.image}
         handleChange={setImage}
         allowChange
       />
       <ProfileField
-        label={t('APPS_MATCH_EDIT_PROFILE_NAME')}
+        label={t('MATCH.EDIT_PROFILE_NAME')}
         value={name}
         handleChange={setName}
         allowChange={ResourceConfig.match.allowEditableProfileName}
       />
       <ProfileField
-        label={t('APPS_MATCH_EDIT_PROFILE_BIO')}
+        label={t('MATCH.EDIT_PROFILE_BIO')}
         value={update.bio}
         handleChange={setBio}
         multiline
         maxLength={250}
       />
       <ProfileField
-        label={t('APPS_MATCH_EDIT_PROFILE_LOCATION')}
+        label={t('MATCH.EDIT_PROFILE_LOCATION')}
         value={update.location}
         handleChange={setLocation}
       />
       <ProfileField
-        label={t('APPS_MATCH_EDIT_PROFILE_JOB')}
+        label={t('MATCH.EDIT_PROFILE_JOB')}
         value={update.job}
         handleChange={setJob}
         maxLength={50}
       />
-      <ProfileField label={t('APPS_MATCH_EDIT_PROFILE_TAGS')} value={tags} handleChange={setTags} />
+      <ProfileField label={t('MATCH.EDIT_PROFILE_TAGS')} value={tags} handleChange={setTags} />
       <UpdateButton handleClick={handleUpdate} />
     </div>
   );
diff --git a/phone/src/apps/match/components/views/MatchList.tsx b/phone/src/apps/match/components/views/MatchList.tsx
index 6115c41e0..b8d4b94cd 100644
--- a/phone/src/apps/match/components/views/MatchList.tsx
+++ b/phone/src/apps/match/components/views/MatchList.tsx
@@ -20,9 +20,9 @@ function MatchList() {
   const [t] = useTranslation();
   const { matches, error } = useMatches();
 
-  if (error) return <PageText text={t('APPS_MATCH_MATCHES_ERROR')} />;
+  if (error) return <PageText text={t('MATCH.FEEDBACK.MATCHES_ERROR')} />;
   if (!matches) return <Loader />;
-  if (matches.length === 0) return <PageText text={t('APPS_MATCH_NO_MATCHES')} />;
+  if (matches.length === 0) return <PageText text={t('MATCH.FEEDBACK.NO_MATCHES')} />;
 
   return (
     <Box className={classes.root}>
diff --git a/phone/src/apps/match/components/views/MatchPage.tsx b/phone/src/apps/match/components/views/MatchPage.tsx
index ce637e530..c7e49ab3b 100644
--- a/phone/src/apps/match/components/views/MatchPage.tsx
+++ b/phone/src/apps/match/components/views/MatchPage.tsx
@@ -41,9 +41,9 @@ const MatchPage = () => {
     setViewed(id, liked);
   };
 
-  if (error) return <PageText text={t('APPS_MATCH_PROFILES_ERROR')} />;
+  if (error) return <PageText text={t('MATCH.FEEDBACK.PROFILES_ERROR')} />;
   if (!loaded || !profiles) return <Loader />;
-  if (!activeProfile) return <PageText text={t('APPS_MATCH_NO_PROFILES')} />;
+  if (!activeProfile) return <PageText text={t('MATCH.FEEDBACK.NO_PROFILES')} />;
 
   return (
     <Paper className={classes.root} square>
diff --git a/phone/src/apps/match/components/views/ProfileEditor.tsx b/phone/src/apps/match/components/views/ProfileEditor.tsx
index 055cfe576..a2dadd3f9 100644
--- a/phone/src/apps/match/components/views/ProfileEditor.tsx
+++ b/phone/src/apps/match/components/views/ProfileEditor.tsx
@@ -33,7 +33,7 @@ function ProfileEditor() {
       <Box className={classes.switch}>
         <FormControlLabel
           control={<Switch checked={showPreview} onChange={toggleSwitch} />}
-          label={t<string>('APPS_MATCH_EDIT_PROFILE_PREVIEW')}
+          label={t<string>('MATCH.EDIT_PROFILE_PREVIEW')}
         />
       </Box>
       <ProfileForm showPreview={showPreview} profile={profile} />
diff --git a/phone/src/apps/match/hooks/useMatchActions.ts b/phone/src/apps/match/hooks/useMatchActions.ts
index c43745155..753d6ffe2 100644
--- a/phone/src/apps/match/hooks/useMatchActions.ts
+++ b/phone/src/apps/match/hooks/useMatchActions.ts
@@ -24,7 +24,7 @@ export const useMatchActions = () => {
       fetchNui<ServerPromiseResp<boolean>>(MatchEvents.SAVE_LIKES, [{ id, liked }]).then((resp) => {
         if (resp.status !== 'ok') {
           return addAlert({
-            message: t('APPS_MATCH_SAVE_LIKES_FAILED'),
+            message: t('MATCH.FEEDBACK.SAVE_LIKES_FAILED'),
             type: 'error',
           });
         }
@@ -35,7 +35,7 @@ export const useMatchActions = () => {
 
         if (resp.data) {
           addAlert({
-            message: t('APPS_MATCH_NEW_LIKE_FOUND'),
+            message: t('MATCH.FEEDBACK.NEW_LIKE_FOUND'),
             type: 'info',
           });
           fetchNui<ServerPromiseResp<FormattedMatch[]>>(MatchEvents.GET_MATCHES).then((resp) => {
diff --git a/phone/src/apps/messages/components/form/MessageInput.tsx b/phone/src/apps/messages/components/form/MessageInput.tsx
index 6163aa4fc..174ed3867 100644
--- a/phone/src/apps/messages/components/form/MessageInput.tsx
+++ b/phone/src/apps/messages/components/form/MessageInput.tsx
@@ -32,7 +32,7 @@ const MessageInput = ({ messageConversationId, onAddImageClick }: IProps) => {
           setMessage('');
 
           return addAlert({
-            message: t('APPS_MESSAGES_NEW_MESSAGE_FAILED'),
+            message: t('MESSAGES.FEEDBACK.NEW_MESSAGE_FAILED'),
             type: 'error',
           });
         }
@@ -63,7 +63,7 @@ const MessageInput = ({ messageConversationId, onAddImageClick }: IProps) => {
           inputProps={{ style: { fontSize: '1.3em' } }}
           value={message}
           onChange={(e) => setMessage(e.target.value)}
-          placeholder={t('APPS_MESSAGES_NEW_MESSAGE')}
+          placeholder={t('MESSAGES.NEW_MESSAGE')}
         />
       </Box>
       <Box>
diff --git a/phone/src/apps/messages/components/form/NewMessageGroupButton.tsx b/phone/src/apps/messages/components/form/NewMessageGroupButton.tsx
index cb41b7742..8d5010bd8 100644
--- a/phone/src/apps/messages/components/form/NewMessageGroupButton.tsx
+++ b/phone/src/apps/messages/components/form/NewMessageGroupButton.tsx
@@ -36,7 +36,7 @@ export const NewMessageGroupButton: React.FC<NewMessageGroupButtonProps> = ({ on
     }).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MESSAGES_DELETE_CONVERSATION_FAILED'),
+          message: t('MESSAGES.DELETE_CONVERSATION_FAILED'),
           type: 'error',
         });
       }
diff --git a/phone/src/apps/messages/components/form/NewMessageGroupForm.tsx b/phone/src/apps/messages/components/form/NewMessageGroupForm.tsx
index 9f122b0c4..824ff1607 100644
--- a/phone/src/apps/messages/components/form/NewMessageGroupForm.tsx
+++ b/phone/src/apps/messages/components/form/NewMessageGroupForm.tsx
@@ -47,7 +47,9 @@ const NewMessageGroupForm = ({ phoneNumber }: { phoneNumber?: string }) => {
       ).then((resp) => {
         if (resp.status !== 'ok') {
           return addAlert({
-            message: t('APPS_MESSAGES_MESSAGE_GROUP_CREATE_ONE_NUMBER_FAILED'),
+            message: t('MESSAGES.FEEDBACK.MESSAGE_GROUP_CREATE_ONE_NUMBER_FAILED', {
+              number: participant.number || participant,
+            }),
             type: 'error',
           });
         }
@@ -57,7 +59,7 @@ const NewMessageGroupForm = ({ phoneNumber }: { phoneNumber?: string }) => {
         );
         if (doesConversationExist)
           return addAlert({
-            message: 'This conversation does already exist',
+            message: t('MESSAGES.FEEDBACK.MESSAGE_CONVERSATION_DUPLICATE'),
             type: 'error',
           });
 
@@ -95,7 +97,7 @@ const NewMessageGroupForm = ({ phoneNumber }: { phoneNumber?: string }) => {
     <TextField
       {...params}
       fullWidth
-      label={t('APPS_MESSAGES_INPUT_NAME_OR_NUMBER')}
+      label={t('MESSAGES.INPUT_NAME_OR_NUMBER')}
       onChange={(e) => setParticipant(e.currentTarget.value)}
     />
   );
@@ -128,7 +130,7 @@ const NewMessageGroupForm = ({ phoneNumber }: { phoneNumber?: string }) => {
           color="primary"
           type="submit"
         >
-          {t('APPS_MESSAGES_NEW_MESSAGE_GROUP_SUBMIT')}
+          {t('MESSAGES.NEW_MESSAGE_GROUP_SUBMIT')}
         </Button>
         <Button onClick={handleCancel} variant="contained" fullWidth color="error">
           {t('GENERIC_CANCEL')}
diff --git a/phone/src/apps/messages/components/list/MessagesList.tsx b/phone/src/apps/messages/components/list/MessagesList.tsx
index d5b8f37b6..a68a77f2c 100644
--- a/phone/src/apps/messages/components/list/MessagesList.tsx
+++ b/phone/src/apps/messages/components/list/MessagesList.tsx
@@ -62,7 +62,7 @@ const MessagesList = (): any => {
         <SearchField
           value={searchValue}
           onChange={(e) => setSearchValue(e.target.value)}
-          placeholder={t('APPS_MESSAGES_SEARCH_PLACEHOLDER')}
+          placeholder={t('MESSAGES.SEARCH_PLACEHOLDER')}
         />
       </Box>
       <Box display="flex" flexDirection="column">
diff --git a/phone/src/apps/messages/components/modal/Conversation.tsx b/phone/src/apps/messages/components/modal/Conversation.tsx
index d0746b08f..447e9e8a1 100644
--- a/phone/src/apps/messages/components/modal/Conversation.tsx
+++ b/phone/src/apps/messages/components/modal/Conversation.tsx
@@ -40,7 +40,7 @@ const Conversation: React.FC<IProps> = ({ activeMessageGroup, messages }) => {
     }).then((resp) => {
       if (resp.status !== 'ok') {
         addAlert({
-          message: t('APPS_MESSAGES_FETCHED_MESSAGES_FAILED'),
+          message: t('MESSAGES.FEEDBACK.FETCHED_MESSAGES_FAILED'),
           type: 'error',
         });
 
diff --git a/phone/src/apps/messages/components/modal/MessageBubbleMenu.tsx b/phone/src/apps/messages/components/modal/MessageBubbleMenu.tsx
index 4dd3291d6..78a2f6aa2 100644
--- a/phone/src/apps/messages/components/modal/MessageBubbleMenu.tsx
+++ b/phone/src/apps/messages/components/modal/MessageBubbleMenu.tsx
@@ -24,7 +24,7 @@ const MessageBubbleMenu: React.FC<MessageBubbleMenuProps> = ({ open, handleClose
     fetchNui<ServerPromiseResp<any>>(MessageEvents.DELETE_MESSAGE, selectedMessage).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MESSAGES_DELETE_MESSAGE_FAILED'),
+          message: t('MESSAGES.FEEDBACK.DELETE_MESSAGE_FAILED'),
           type: 'error',
         });
       }
@@ -36,7 +36,7 @@ const MessageBubbleMenu: React.FC<MessageBubbleMenuProps> = ({ open, handleClose
   const menuOptions = useMemo(
     () => [
       {
-        label: t('APPS_MESSAGE_DELETE_MESSAGE'),
+        label: t('MESSAGES.FEEDBACK.DELETE_MESSAGE'),
         icon: <PhotoLibraryIcon />,
         onClick: handleDeleteMessage,
       },
diff --git a/phone/src/apps/messages/components/modal/MessageImageModal.tsx b/phone/src/apps/messages/components/modal/MessageImageModal.tsx
index 9ae609aad..28628011b 100644
--- a/phone/src/apps/messages/components/modal/MessageImageModal.tsx
+++ b/phone/src/apps/messages/components/modal/MessageImageModal.tsx
@@ -40,7 +40,7 @@ export const MessageImageModal = ({ isOpen, messageGroupId, onClose, image }: IP
           if (resp !== 'ok') {
             onClose();
             return addAlert({
-              message: t('APPS_MESSAGES_NEW_MESSAGE_FAILED'),
+              message: t('MESSAGES.FEEDBACK.NEW_MESSAGE_FAILED'),
               type: 'error',
             });
           }
diff --git a/phone/src/apps/messages/components/modal/MessageModal.tsx b/phone/src/apps/messages/components/modal/MessageModal.tsx
index 11dd27c18..fdf6935e8 100644
--- a/phone/src/apps/messages/components/modal/MessageModal.tsx
+++ b/phone/src/apps/messages/components/modal/MessageModal.tsx
@@ -93,7 +93,7 @@ export const MessageModal = () => {
     ).then((resp) => {
       if (resp.status !== 'ok') {
         addAlert({
-          message: t('APPS_MESSAGES_FETCHED_MESSAGES_FAILED'),
+          message: t('MESSAGES.FEEDBACK.FETCHED_MESSAGES_FAILED'),
           type: 'error',
         });
 
@@ -164,7 +164,7 @@ export const MessageModal = () => {
     }).then((resp) => {
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_MESSAGES_DELETE_CONVERSATION_FAILED'),
+          message: t('MESSAGES.FEEDBACK.DELETE_CONVERSATION_FAILED'),
           type: 'error',
         });
       }
@@ -181,7 +181,7 @@ export const MessageModal = () => {
       <Modal visible={groupActionsOpen} handleClose={() => setGroupActionsOpen(false)}>
         <Box>
           <Button variant="contained" color="primary" onClick={handleDeleteConversation}>
-            {t('APPS_MESSAGES_DELETE_CONVERSATION')}
+            {t('MESSAGES.DELETE_CONVERSATION')}
           </Button>
         </Box>
       </Modal>
@@ -206,7 +206,7 @@ export const MessageModal = () => {
             </Typography>
             <Tooltip
               classes={{ tooltip: classes.tooltip }}
-              title={t('APPS_MESSAGES_ACTIONS_TITLE')}
+              title={t('MESSAGES.ACTIONS_TITLE')}
               placement="left"
             >
               <IconButton onClick={() => setGroupActionsOpen(true)}>
diff --git a/phone/src/apps/messages/hooks/useMessageNotifications.ts b/phone/src/apps/messages/hooks/useMessageNotifications.ts
index 770a0b144..998b6690c 100644
--- a/phone/src/apps/messages/hooks/useMessageNotifications.ts
+++ b/phone/src/apps/messages/hooks/useMessageNotifications.ts
@@ -52,7 +52,7 @@ export const useMessageNotifications = () => {
         addNotification({
           ...n,
           title: group.phoneNumber || group.display,
-          content: t('APPS_MESSAGES_UNREAD_MESSAGES', {
+          content: t('MESSAGES.MESSAGES.UNREAD_MESSAGES', {
             count: group.unread,
           }),
         });
diff --git a/phone/src/apps/notes/hooks/useNotesAPI.ts b/phone/src/apps/notes/hooks/useNotesAPI.ts
index e9d131401..560074332 100644
--- a/phone/src/apps/notes/hooks/useNotesAPI.ts
+++ b/phone/src/apps/notes/hooks/useNotesAPI.ts
@@ -26,7 +26,7 @@ export const useNotesAPI = (): NotesAPIValue => {
 
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_NOTES_ADD_FAILED'),
+          message: t('NOTES.FEEDBACK.ADD_FAILED'),
           type: 'error',
         });
       }
@@ -34,7 +34,7 @@ export const useNotesAPI = (): NotesAPIValue => {
       addLocalNote(resp.data);
 
       addAlert({
-        message: t('APPS_NOTES_ADD_SUCCESS'),
+        message: t('NOTES.FEEDBACK.ADD_SUCCESS'),
         type: 'success',
       });
     },
@@ -47,7 +47,7 @@ export const useNotesAPI = (): NotesAPIValue => {
 
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_NOTES_DELETE_FAILED'),
+          message: t('NOTES.FEEDBACK.DELETE_FAILED'),
           type: 'error',
         });
       }
@@ -55,7 +55,7 @@ export const useNotesAPI = (): NotesAPIValue => {
       deleteLocalNote(resp.data.id);
 
       addAlert({
-        message: t('APPS_NOTES_DELETE_SUCCESS'),
+        message: t('NOTES.FEEDBACK.DELETE_SUCCESS'),
         type: 'success',
       });
     },
@@ -71,7 +71,7 @@ export const useNotesAPI = (): NotesAPIValue => {
       });
       if (resp.status !== 'ok') {
         return addAlert({
-          message: t('APPS_NOTES_UPDATE_FAILED'),
+          message: t('NOTES.FEEDBACK.UPDATE_FAILED'),
           type: 'error',
         });
       }
@@ -79,7 +79,7 @@ export const useNotesAPI = (): NotesAPIValue => {
       updateLocalNote({ id, title, content });
 
       addAlert({
-        message: t('APPS_NOTES_UPDATE_SUCCESS'),
+        message: t('NOTES.FEEDBACK.UPDATE_SUCCESS'),
         type: 'success',
       });
     },
diff --git a/phone/src/apps/settings/components/SettingsApp.tsx b/phone/src/apps/settings/components/SettingsApp.tsx
index 24fc5a43e..13fcb4337 100644
--- a/phone/src/apps/settings/components/SettingsApp.tsx
+++ b/phone/src/apps/settings/components/SettingsApp.tsx
@@ -138,7 +138,7 @@ export const SettingsApp = () => {
     selected: false,
     onClick: () => setCustomWallpaperState(true),
     key: 'CUSTOM_WALLPAPER',
-    label: t('APPS_SETTINGS_OPTIONS_CUSTOM_WALLPAPER'),
+    label: t('SETTINGS.OPTIONS.CUSTOM_WALLPAPER.DIALOG_TITLE'),
   };
 
   const handleCopyPhoneNumber = () => {
@@ -180,7 +180,7 @@ export const SettingsApp = () => {
       >
         <List disablePadding subheader={<SubHeaderComp text={t('SETTINGS.CATEGORY.PHONE')} />}>
           <SettingItemIconAction
-            label={t('APPS_SETTINGS_PHONE_NUMBER')}
+            label={t('SETTINGS.PHONE_NUMBER')}
             labelSecondary={myNumber}
             actionLabel={t('GENERIC.WRITE_TO_CLIPBOARD_TOOLTIP', {
               content: 'number',
@@ -190,34 +190,34 @@ export const SettingsApp = () => {
             handleAction={handleCopyPhoneNumber}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_RINGTONE')}
+            label={t('SETTINGS.OPTIONS.RINGTONE')}
             value={settings.ringtone.label}
             options={ringtones}
             onClick={openMenu}
             icon={<LibraryMusic />}
           />
           <SettingItemSlider
-            label={t('APPS_SETTINGS_OPTION_RINGTONEVOL')}
+            label={t('SETTINGS.OPTIONS.RINGTONE_VOLUME')}
             icon={<VolumeUp />}
             value={settings.ringtoneVol}
             onCommit={(e, val) => handleSettingChange('ringtoneVol', val)}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_NOTIFICATION')}
+            label={t('SETTINGS.OPTIONS.NOTIFICATION')}
             value={settings.notiSound.label}
             options={notifications}
             onClick={openMenu}
             icon={<LibraryMusic />}
           />
           <SettingItemSlider
-            label={t('APPS_SETTINGS_OPTION_NOTIFICATIONVOL')}
+            label={t('SETTINGS.OPTIONS.NOTIFICATION_VOLUME')}
             icon={<VolumeUp />}
             value={settings.notiSoundVol}
             onCommit={(e, val) => handleSettingChange('notiSoundVol', val)}
           />
           <SettingSwitch
-            label={t('APPS_SETTINGS_OPTION_STREAMER_MODE')}
-            secondary={t('APPS_SETTING_STREAMER_MODE_DESC')}
+            label={t('SETTINGS.OPTIONS.STREAMER_MODE.TITLE')}
+            secondary={t('SETTINGS.OPTIONS.STREAMER_MODE.DESCRIPTION')}
             icon={<VisibilityOffIcon />}
             value={settings.streamerMode}
             onClick={(curr) => handleSettingChange('streamerMode', !curr)}
@@ -232,7 +232,7 @@ export const SettingsApp = () => {
             icon={<Book />}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_THEME')}
+            label={t('SETTINGS.OPTIONS.THEME')}
             value={settings.theme.label}
             options={themes}
             onClick={openMenu}
@@ -246,21 +246,21 @@ export const SettingsApp = () => {
             icon={<Apps />}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_WALLPAPER')}
+            label={t('SETTINGS.OPTIONS.WALLPAPER')}
             value={t(settings.wallpaper.label)}
             options={[...wallpapers, customWallpaper]}
             onClick={openMenu}
             icon={<Wallpaper />}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_FRAME')}
+            label={t('SETTINGS.OPTIONS.FRAME')}
             value={settings.frame.label}
             options={frames}
             onClick={openMenu}
             icon={<Smartphone />}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_ZOOM')}
+            label={t('SETTINGS.OPTIONS.ZOOM')}
             value={settings.zoom.label}
             options={zoomOptions}
             onClick={openMenu}
@@ -269,21 +269,21 @@ export const SettingsApp = () => {
         </List>
         <List disablePadding subheader={<SubHeaderComp text={t('APPS_TWITTER')} />}>
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_NOTIFICATION_FILTER')}
+            label={t('SETTINGS.OPTIONS.NOTIFICATION_FILTER')}
             value={settings.TWITTER_notiFilter.label}
             options={twitterNotificationFilters}
             onClick={openMenu}
             icon={<FilterList />}
           />
           <SettingItem
-            label={t('APPS_SETTINGS_OPTION_NOTIFICATION')}
+            label={t('SETTINGS.OPTIONS.NOTIFICATION')}
             value={settings.TWITTER_notiSound.label}
             options={twitterNotifications}
             onClick={openMenu}
             icon={<LibraryMusic />}
           />
           <SettingItemSlider
-            label={t('APPS_SETTINGS_OPTION_NOTIFICATIONVOL')}
+            label={t('SETTINGS.OPTIONS.NOTIFICATION_VOLUME')}
             value={settings.TWITTER_notiSoundVol}
             onCommit={(e, val) => handleSettingChange('TWITTER_notiSoundVol', val)}
             icon={<VolumeUp />}
diff --git a/phone/src/apps/settings/components/WallpaperModal.tsx b/phone/src/apps/settings/components/WallpaperModal.tsx
index 4798077af..57285194b 100644
--- a/phone/src/apps/settings/components/WallpaperModal.tsx
+++ b/phone/src/apps/settings/components/WallpaperModal.tsx
@@ -23,7 +23,7 @@ const WallpaperModal: React.FC = () => {
   const handleNewWallpaper = () => {
     if (isImageAndUrl(value)) {
       handleSettingChange('wallpaper', {
-        label: 'APPS_SETTINGS_OPTIONS_CUSTOM_WALLPAPER',
+        label: t('SETTINGS.OPTIONS.CUSTOM_WALLPAPER.DIALOG_TITLE'),
         value,
       });
       setCustomWallpaperModal(false);
diff --git a/phone/src/apps/twitter/components/TwitterSearch.tsx b/phone/src/apps/twitter/components/TwitterSearch.tsx
index 799bf358c..adbc4aa13 100644
--- a/phone/src/apps/twitter/components/TwitterSearch.tsx
+++ b/phone/src/apps/twitter/components/TwitterSearch.tsx
@@ -60,8 +60,8 @@ function TwitterSearch() {
         <div className={classes.searchContainer}>
           <TextField
             className={classes.search}
-            placeholder={t('APPS_TWITTER_SEARCH_TWEETS_PLACEHOLDER')}
-            label={t('APPS_TWITTER_SEARCH_TWEETS')}
+            placeholder={t('TWITTER.SEARCH_TWEETS_PLACEHOLDER')}
+            label={t('TWITTER.SEARCH_TWEETS')}
             value={searchValue}
             onChange={handleChange}
             size="medium"
diff --git a/phone/src/apps/twitter/components/buttons/ControlButtons.tsx b/phone/src/apps/twitter/components/buttons/ControlButtons.tsx
index 4e87ffe4c..960c41315 100644
--- a/phone/src/apps/twitter/components/buttons/ControlButtons.tsx
+++ b/phone/src/apps/twitter/components/buttons/ControlButtons.tsx
@@ -22,9 +22,7 @@ export const ControlButtons = ({ showImagePrompt, showEmoji, onCloseClick, onPri
   const [t] = useTranslation();
 
   const imagePromptVisible = showImagePrompt && !showEmoji;
-  const primaryButtonText = imagePromptVisible
-    ? t('APPS_TWITTER_SUBMIT_IMAGE')
-    : t('APPS_TWITTER_TWEET');
+  const primaryButtonText = imagePromptVisible ? t('TWITTER.SUBMIT_IMAGE') : t('TWITTER.TWEET');
   const showCloseButton = showImagePrompt || showEmoji;
 
   return (
@@ -39,7 +37,7 @@ export const ControlButtons = ({ showImagePrompt, showEmoji, onCloseClick, onPri
           color="error"
           onClick={onCloseClick}
         >
-          {t('APPS_TWITTER_CLOSE_IMAGE')}
+          {t('GENERIC.CLOSE')}
         </StatusButton>
       )}
     </div>
diff --git a/phone/src/apps/twitter/components/buttons/ReportButton.tsx b/phone/src/apps/twitter/components/buttons/ReportButton.tsx
index 3ff4ac8a1..ede126e46 100644
--- a/phone/src/apps/twitter/components/buttons/ReportButton.tsx
+++ b/phone/src/apps/twitter/components/buttons/ReportButton.tsx
@@ -37,7 +37,7 @@ function ReportButton({ handleClose, tweetId, isReported }) {
     return (
       <MenuItem onClick={handleClose}>
         <DoneIcon />
-        <span style={{ marginLeft: '5px' }}>{t('APPS_TWITTER_REPORTED')}</span>
+        <span style={{ marginLeft: '5px' }}>{t('TWITTER.REPORTED')}</span>
       </MenuItem>
     );
   }
@@ -50,7 +50,7 @@ function ReportButton({ handleClose, tweetId, isReported }) {
     );
   }
 
-  return <MenuItem onClick={handleClick}>{t('APPS_TWITTER_REPORT')}</MenuItem>;
+  return <MenuItem onClick={handleClick}>{t('TWITTER.REPORT')}</MenuItem>;
 }
 
 export default ReportButton;
diff --git a/phone/src/apps/twitter/components/images/ImagePrompt.tsx b/phone/src/apps/twitter/components/images/ImagePrompt.tsx
index 8df1fbc3f..8f55b1eb1 100644
--- a/phone/src/apps/twitter/components/images/ImagePrompt.tsx
+++ b/phone/src/apps/twitter/components/images/ImagePrompt.tsx
@@ -34,7 +34,7 @@ export const ImagePrompt = ({ visible, value, handleChange }) => {
       onChange={handleImageChange}
       multiline
       size="small"
-      placeholder={t('APPS_TWITTER_IMAGE_PLACEHOLDER')}
+      placeholder={t('TWITTER.IMAGE_PLACEHOLDER')}
       inputRef={textFieldRef}
     />
   );
diff --git a/phone/src/apps/twitter/components/profile/DefaultProfilePrompt.tsx b/phone/src/apps/twitter/components/profile/DefaultProfilePrompt.tsx
index e7d8eb467..c5a64fd84 100644
--- a/phone/src/apps/twitter/components/profile/DefaultProfilePrompt.tsx
+++ b/phone/src/apps/twitter/components/profile/DefaultProfilePrompt.tsx
@@ -44,9 +44,7 @@ export const DefaultProfilePrompt: React.FC<DefaultProfilePromptProps> = ({
   return (
     <div className={classes.root}>
       <FormControl className={classes.formControl}>
-        <InputLabel htmlFor="profile-name">
-          {t('APPS_TWITTER_EDIT_DEFAULT_PROFILE_NAME')}
-        </InputLabel>
+        <InputLabel htmlFor="profile-name">{t('TWITTER.EDIT_DEFAULT_PROFILE_NAME')}</InputLabel>
         <Select
           value={profileName}
           onChange={handleChange}
diff --git a/phone/src/apps/twitter/components/profile/Profile.tsx b/phone/src/apps/twitter/components/profile/Profile.tsx
index 89245b384..2f7c20b72 100644
--- a/phone/src/apps/twitter/components/profile/Profile.tsx
+++ b/phone/src/apps/twitter/components/profile/Profile.tsx
@@ -75,30 +75,30 @@ export function Profile() {
       {enableAvatars && <Avatar avatarUrl={avatarUrl} showInvalidImage />}
       <div className={classes.spacer} />
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_AVATAR')}
+        label={t('TWITTER.EDIT_PROFILE_AVATAR')}
         value={avatarUrl}
         handleChange={handleAvatarChange}
         allowChange={enableAvatars}
       />
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_NAME')}
+        label={t('TWITTER.EDIT_PROFILE_NAME')}
         value={name}
         handleChange={handleNameChange}
         allowChange={allowEditableProfileName}
       />
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_BIO')}
+        label={t('TWITTER.EDIT_PROFILE_BIO')}
         value={bio}
         handleChange={handleBioChange}
         multiline
       />
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_LOCATION')}
+        label={t('TWITTER.EDIT_PROFILE_LOCATION')}
         value={location}
         handleChange={handleLocationChange}
       />
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_JOB')}
+        label={t('TWITTER.EDIT_PROFILE_JOB')}
         value={job}
         handleChange={handleJobChange}
       />
diff --git a/phone/src/apps/twitter/components/profile/ProfilePrompt.tsx b/phone/src/apps/twitter/components/profile/ProfilePrompt.tsx
index c6cc9a725..21344ffab 100644
--- a/phone/src/apps/twitter/components/profile/ProfilePrompt.tsx
+++ b/phone/src/apps/twitter/components/profile/ProfilePrompt.tsx
@@ -70,7 +70,7 @@ export function ProfilePrompt() {
   return (
     <div className={classes.root}>
       <ProfileField
-        label={t('APPS_TWITTER_EDIT_PROFILE_NAME')}
+        label={t('TWITTER.EDIT_PROFILE_NAME')}
         value={profileName}
         handleChange={setProfileName}
         allowChange
diff --git a/phone/src/apps/twitter/components/tweet/Retweet.tsx b/phone/src/apps/twitter/components/tweet/Retweet.tsx
index fca86d9bd..8ba925724 100644
--- a/phone/src/apps/twitter/components/tweet/Retweet.tsx
+++ b/phone/src/apps/twitter/components/tweet/Retweet.tsx
@@ -26,7 +26,7 @@ function Retweet({ profileName }: IProps) {
   const classes = useStyles();
   return (
     <div className={classes.root}>
-      <Repeat /> {profileName} {t('APPS_TWITTER_RETWEETED')}
+      <Repeat /> {profileName} {t('TWITTER.RETWEETED')}
     </div>
   );
 }
diff --git a/phone/src/apps/twitter/components/tweet/ShowMore.tsx b/phone/src/apps/twitter/components/tweet/ShowMore.tsx
index ef366bbac..cb9f1004c 100644
--- a/phone/src/apps/twitter/components/tweet/ShowMore.tsx
+++ b/phone/src/apps/twitter/components/tweet/ShowMore.tsx
@@ -70,9 +70,7 @@ export const ShowMore = ({ id, isReported, isMine }) => {
           horizontal: 'left',
         }}
       >
-        {allowedToDelete && (
-          <MenuItem onClick={handleDeleteTweet}>{t('APPS_TWITTER_DELETE')}</MenuItem>
-        )}
+        {allowedToDelete && <MenuItem onClick={handleDeleteTweet}>{t('GENERIC.DELETE')}</MenuItem>}
         {allowedToReport && (
           <ReportButton handleClose={handleClose} isReported={isReported} tweetId={id} />
         )}
diff --git a/phone/src/apps/twitter/components/tweet/TweetMessage.tsx b/phone/src/apps/twitter/components/tweet/TweetMessage.tsx
index 0bf1aeeaa..305e56b51 100644
--- a/phone/src/apps/twitter/components/tweet/TweetMessage.tsx
+++ b/phone/src/apps/twitter/components/tweet/TweetMessage.tsx
@@ -36,14 +36,10 @@ export const TweetMessage = ({ modalVisible, message, handleChange, onEnter }) =
   let errorMessage = null;
 
   const overCharacterLimit = message.trim().length > characterLimit;
-  const characterWarningPrompt = `${t(
-    'APPS_TWITTER_TWEET_MESSAGE_CHAR_LIMIT',
-  )} (${characterLimit})`;
+  const characterWarningPrompt = `${t('TWITTER,TWEET_MESSAGE_CHAR_LIMIT')} (${characterLimit})`;
 
   const overNewLineLimit = getNewLineCount(message) > newLineLimit;
-  const newLineWarningPrompt = `${t(
-    'APPS_TWITTER_TWEET_MESSAGE_NEW_LINE_LIMIT',
-  )} (${newLineLimit})`;
+  const newLineWarningPrompt = `${t('TWITTER.TWEET_MESSAGE_NEW_LINE_LIMIT')} (${newLineLimit})`;
 
   if (overCharacterLimit) {
     errorMessage = characterWarningPrompt;
@@ -66,7 +62,7 @@ export const TweetMessage = ({ modalVisible, message, handleChange, onEnter }) =
       onChange={(e) => handleChange(e.currentTarget.value)}
       onKeyPress={handleOnEnter}
       multiline
-      placeholder={t('APPS_TWITTER_TWEET_MESSAGE_PLACEHOLDER')}
+      placeholder={t('TWITTER.TWEET_MESSAGE_PLACEHOLDER')}
       inputRef={textFieldInputRef}
       error={errorMessage !== null}
       helperText={errorMessage || null}
diff --git a/phone/src/apps/twitter/hooks/useTwitterNotifications.ts b/phone/src/apps/twitter/hooks/useTwitterNotifications.ts
index 2eaad7f2f..daa946ee6 100644
--- a/phone/src/apps/twitter/hooks/useTwitterNotifications.ts
+++ b/phone/src/apps/twitter/hooks/useTwitterNotifications.ts
@@ -29,10 +29,9 @@ export const useTwitterNotifications = () => {
 
   const setNotification = ({ profile_name, message, isRetweet }: Tweet) => {
     if (profileLoading !== 'hasValue') return;
-
     const titleStr = isRetweet
-      ? 'APPS_TWITTER_NEW_RETWEET_BROADCAST'
-      : 'APPS_TWITTER_NEW_BROADCAST';
+      ? 'TWITTER.MESSAGES.NEW_RETWEET_BROADCAST'
+      : 'TWITTER.MESSAGES.NEW_BROADCAST';
 
     // profile defaults to null, if for some reason it is not initialized
     // defend against this case
@@ -70,7 +69,7 @@ export const useTwitterNotifications = () => {
       removeId(NOTIFICATION_ID);
       addNotification({
         ...notification,
-        title: t('APPS_TWITTER_UNREAD_MESSAGES', {
+        title: t('TWITTER.MESSAGES.UNREAD_MESSAGES', {
           count: newCount,
         }),
         content: null,
diff --git a/phone/src/apps/twitter/hooks/useTwitterService.ts b/phone/src/apps/twitter/hooks/useTwitterService.ts
index 9b26afbec..d090f4ffd 100644
--- a/phone/src/apps/twitter/hooks/useTwitterService.ts
+++ b/phone/src/apps/twitter/hooks/useTwitterService.ts
@@ -35,7 +35,6 @@ export const useTwitterService = () => {
   const handleTweetBroadcast = useCallback(
     (tweet: Tweet) => {
       if (profileLoading !== 'hasValue') return;
-
       if (!profileContent) return;
 
       setNotification(tweet);
diff --git a/phone/src/apps/twitter/utils/time.ts b/phone/src/apps/twitter/utils/time.ts
index 356238af5..c49b00a08 100644
--- a/phone/src/apps/twitter/utils/time.ts
+++ b/phone/src/apps/twitter/utils/time.ts
@@ -2,10 +2,10 @@ const ONE_MINUTE = 60;
 const ONE_HOUR = 60 * ONE_MINUTE;
 const ONE_DAY = 24 * ONE_HOUR;
 
-const JUST_NOW = 'APPS_TWITTER_TIME_JUST_NOW';
-const MINUTES = 'APPS_TWITTER_TIME_MINUTES';
-const HOURS = 'APPS_TWITTER_TIME_HOURS';
-const DAYS = 'APPS_TWITTER_TIME_DAYS';
+const JUST_NOW = 'TWITTER.TIME_JUST_NOW';
+const MINUTES = 'TWITTER.TIME_MINUTES';
+const HOURS = 'TWITTER.TIME_HOURS';
+const DAYS = 'TWITTER.TIME_DAYS';
 
 /**
  * Convert seconds to a human readable format i.e. "Just Now", "2m", "3d"
diff --git a/phone/src/locale/en.json b/phone/src/locale/en.json
index 11814610c..2341ce895 100644
--- a/phone/src/locale/en.json
+++ b/phone/src/locale/en.json
@@ -8,11 +8,6 @@
     "NOTIFICATIONS": {
       "NO_UNREAD": "No unread notifications"
     },
-    "NOTES": {
-      "FEEDBACK": {
-        "NO_NOTES": "You have no notes"
-      }
-    },
     "DATE_FORMAT": "MM/DD/YYYY",
     "DATE_TIME_FORMAT": "MM/DD/YYYY hh:mm A",
     "CALLS": {
@@ -30,6 +25,7 @@
       "NAME": "Browser"
     },
     "SETTINGS": {
+      "PHONE_NUMBER": "Phone Number",
       "CATEGORY": {
         "APPEARANCE": "Appearance",
         "PHONE": "Phone",
@@ -37,15 +33,28 @@
       },
       "OPTIONS": {
         "ICONSET": "Icon Set",
+        "THEME": "Theme",
         "LANGUAGE": "Language",
+        "FRAME": "Frame",
+        "ZOOM": "Zoom",
+        "WALLPAPER": "Wallpaper",
         "RESET_SETTINGS": "Reset Settings",
         "RESET_SETTINGS_DESC": "This will clear your locally stored data",
+        "STREAMER_MODE": {
+          "TITLE": "Streamer mode",
+          "DESCRIPTION": "Hide images before they are shown"
+        },
         "CUSTOM_WALLPAPER": {
           "DIALOG_TITLE": "Custom Wallpaper",
           "DIALOG_CONTENT": "Set a custom wallpaper by entering the URL of the image below!",
           "DIALOG_PLACEHOLDER": "Image URL",
           "DIALOG_ERROR": "Invalid image or link"
-        }
+        },
+        "RINGTONE": "Ringtone",
+        "RINGTONE_VOLUME": "Ringtone Volume",
+        "NOTIFICATION": "Notification",
+        "NOTIFICATION_VOLUME": "Notification Volume",
+        "NOTIFICATION_FILTER": "Notification Filters"
       },
       "MESSAGES": {
         "INVALID_SETTINGS": "Invalid stored settings! Please reset in the Settings App.",
@@ -59,17 +68,150 @@
       "FAILED_TO_TAKE_PHOTO": "Photo could not be saved :("
     },
     "CONTACTS": {
+      "FEEDBACK": {
+        "ADD_FAILED": "Failed to created contact!",
+        "ADD_SUCCESS": "Successfully created contact!",
+        "UPDATE_FAILED": "Failed to update contact!",
+        "UPDATE_SUCCESS": "Successfully updated contact!",
+        "DELETE_FAILED": "Failed to delete contact!",
+        "DELETE_SUCCESS": "Successfully deleted contact!"
+      },
       "PLACEHOLDER_SEARCH_CONTACTS": "Search contacts...",
       "FORM_NAME": "Name",
       "FORM_NUMBER": "Number",
       "FORM_AVATAR": "Avatar URL",
-      "MODAL_BUTTON_ADD": "Add Contact",
-      "ADD_FAILED": "Failed to created contact!",
-      "ADD_SUCCESS": "Successfully created contact!",
-      "UPDATE_FAILED": "Failed to update contact!",
-      "UPDATE_SUCCESS": "Successfully updated contact!",
-      "DELETE_FAILED": "Failed to delete contact!",
-      "DELETE_SUCCESS": "Successfully deleted contact!"
+      "MODAL_BUTTON_ADD": "Add Contact"
+    },
+    "DIALER": {
+      "MESSAGES": {
+        "CURRENT_CALL_TITLE": "Current Phone Call",
+        "INCOMING_CALL_TITLE": "Incoming Phone Call",
+        "CURRENT_CALL_WITH": "In call with {{ transmitter }}",
+        "TRANSMITTER_IS_CALLING": "{{ transmitter }} is calling you!"
+      },
+      "INPUT_PLACEHOLDER": "Enter a number",
+      "NAVBAR_HISTORY": "History",
+      "NAVBAR_DIAL": "Dial",
+      "NAVBAR_CONTACTS": "Contacts",
+      "NO_HISTORY": "You have no call history"
+    },
+    "TWITTER": {
+      "FEEDBACK": {
+        "CREATE_PROFILE_SUCCESS": "Successfully created your profile",
+        "CREATE_PROFILE_FAILURE": "Failed to create your profile",
+        "EDIT_PROFILE_SUCCESS": "Successfully updated your profile",
+        "EDIT_PROFILE_FAILURE": "Failed to update your profile",
+        "CREATE_FAILED": "Failed to send your tweet",
+        "RETWEET_EXISTS": "You have already retweeted this tweet!"
+      },
+      "MESSAGES": {
+        "NEW_RETWEET_BROADCAST": "@{{ profile_name }} retweeted someone!",
+        "NEW_BROADCAST": "New tweet from @{{ profile_name }}!",
+        "UNREAD_MESSAGES": "You have {{ count }} new tweets in your timeline!"
+      },
+      "SUBMIT_IMAGE": "Add Media",
+      "TWEET": "Tweet",
+      "REPORTED": " Reported",
+      "REPORT": "Report",
+      "IMAGE_PLACEHOLDER": "A link to your image or gif",
+      "EDIT_DEFAULT_PROFILE_NAME": "Choose Profile Name",
+      "EDIT_PROFILE_AVATAR": "Avatar URL",
+      "EDIT_PROFILE_NAME": "Profile name",
+      "EDIT_PROFILE_BIO": "Bio",
+      "EDIT_PROFILE_LOCATION": "Location",
+      "EDIT_PROFILE_JOB": "Job",
+      "RETWEETED": "Retweeted",
+      "TWEET_MESSAGE_CHAR_LIMIT": "Message is over the character limit",
+      "TWEET_MESSAGE_NEW_LINE_LIMIT": "Message is over the new line limit",
+      "TWEET_MESSAGE_PLACEHOLDER": "What's happening?",
+      "SEARCH_TWEETS_PLACEHOLDER": "Search by profile name or message",
+      "SEARCH_TWEETS": "Search for tweets",
+      "TIME_JUST_NOW": "Just now",
+      "TIME_MINUTES": "m",
+      "TIME_HOURS": "h",
+      "TIME_DAYS": "d"
+    },
+    "MATCH": {
+      "MESSAGES": {
+        "PROFILE_MATCHED_AT": "Matched: {{ matchedAt }}",
+        "PROFILE_LAST_ACTIVE": "Last Active: {{ lastActive }}",
+        "LIKED": "LIKE",
+        "NOPE": "NOPE"
+      },
+      "FEEDBACK": {
+        "UPDATE_PROFILE_FAILED": "Failed to update profile",
+        "UPDATE_PROFILE_SUCCEEDED": "Successfully updated profile",
+        "MATCHES_ERROR": "Error loading matches",
+        "NO_MATCHES": "No matches Found",
+        "NO_PROFILES": "No Recent Profiles Found",
+        "PROFILES_ERROR": "Error loading profiles",
+        "SAVE_LIKES_FAILED": "Failed to save likes",
+        "NEW_LIKE_FOUND": "New match found!"
+      },
+      "PROFILE_CONFIGURATION": "App is incorrectly configured - cannot create profile. Please contact an administrator.",
+      "EDIT_PROFILE_IMAGE": "Image URL",
+      "EDIT_PROFILE_NAME": "Profile name",
+      "EDIT_PROFILE_BIO": "Bio",
+      "EDIT_PROFILE_LOCATION": "Location",
+      "EDIT_PROFILE_JOB": "Job",
+      "EDIT_PROFILE_TAGS": "Tags",
+      "EDIT_PROFILE_PREVIEW": "Show Preview",
+      "LIKE": "Like",
+      "DISLIKE": "Dislike"
+    },
+    "NOTES": {
+      "FEEDBACK": {
+        "NO_NOTES": "You have no notes",
+        "ADD_FAILED": "Failed to save note.",
+        "ADD_SUCCESS": "Successfully saved note.",
+        "DELETE_SUCCESS": "Successfully deleted note.",
+        "DELETE_FAILED": "Failed to delete note.",
+        "UPDATE_FAILED": "Failed to update note.",
+        "UPDATE_SUCCESS": "Successfully updated note."
+      }
+    },
+    "MARKETPLACE": {
+      "FEEDBACK": {
+        "REQUIRED_FIELDS": "All required fields must be filled!",
+        "CREATE_LISTING_FAILED": "Failed to create a new listing",
+        "CREATE_LISTING_SUCCESS": "Successfully created a new listing",
+        "DELETE_LISTING_FAILED": "Failed to delete listing",
+        "DELETE_LISTING_SUCCESS": "Successfully delete listing",
+        "REPORT_LISTING_FAILED": "This listing has already been reported",
+        "REPORT_LISTING_SUCCESS": "Successfully reported listing"
+      },
+      "FORM_TITLE": "Title",
+      "FORM_IMAGE": "Image or URL",
+      "FORM_DESCRIPTION": "Description"
+    },
+    "MESSAGES": {
+      "MESSAGES": {
+        "MESSAGE_CONVERSATION_CREATE_ALL_NUMBERS_FAILED": "None of the phone numbers could be found!",
+        "UNREAD_MESSAGES": "You have {{ count }} unread messages",
+        "MESSAGE_GROUP_CREATE_SOME_NUMBERS_FAILED": "({{ numbers }}) are not registered numbers."
+      },
+      "FEEDBACK": {
+        "MESSAGE_CONVERSATION_CREATE_ONE_NUMBER_FAILED": "{{ number }} is not a registered number",
+        "NEW_MESSAGE_FAILED:": "Failed to send message",
+        "INVALID_PHONE_NUMBER": "Invalid phone number",
+        "MESSAGE_CONVERSATION_DUPLICATE": "This conversation already exists!",
+        "MESSAGE_GROUP_CREATE_FAILED": "Failed to create message group",
+        "MESSAGE_GROUP_CREATE_MINE": "You cannot add yourself!",
+        "FETCHED_MESSAGES_FAILED": "Failed to retrieve messages",
+        "DELETE_MESSAGE": "Delete message",
+        "DELETE_MESSAGE_FAILED": "Failed to delete message",
+        "DELETE_CONVERSATION_FAILED": "Failed to delete conversation"
+      },
+      "SEARCH_PLACEHOLDER": "Search messages...",
+      "DELETE_CONVERSATION": "Delete conversation",
+      "NEW_MESSAGE": "Message...",
+      "NEW_MESSAGE_GROUP": "Phone numbers...",
+      "GROUP_CHAT_LABEL": "Group chat label...",
+      "MEDIA_OPTION": "Camera / Gallery",
+      "NEW_MESSAGE_GROUP_SUBMIT": "Send",
+      "INPUT_NAME_OR_NUMBER": "Search contacts or type number and press enter",
+      "ACTIONS_TITLE": "Actions",
+      "ME": "Me"
     },
     "RELATIVE_TIME": {
       "future": "in %s",
@@ -104,10 +246,8 @@
       "WRITE_TO_CLIPBOARD_TOOLTIP": "Copy {{ content }}",
       "WRITE_TO_CLIPBOARD_MESSAGE": "Copied {{content}} to clipboard!"
     },
-
     "COMING_SOON": "Coming soon...",
     "INITIALIZING": "Initializing",
-
     "APPS_DIALER": "Phone",
     "APPS_CONTACTS": "Contacts",
     "APPS_MESSAGES": "Messages",
@@ -119,164 +259,8 @@
     "APPS_TWITTER": "Twitter",
     "APPS_MARKETPLACE": "Marketplace",
     "APPS_CAMERA": "Camera",
-
-    "APPS_DIALER_INCOMING_CALL_TITLE": "Incoming Phone Call",
-    "APPS_DIALER_CURRENT_CALL_TITLE": "Current Phone Call",
-    "APPS_DIALER_CURRENT_CALL_WITH": "In call with {{ transmitter }}",
-    "APPS_DIALER_TRANSMITTER_IS_CALLING": "{{ transmitter }} is calling you!",
-    "APPS_DIALER_ACCEPT_CALL": "Accept",
-    "APPS_DIALER_REJECT_CALL": "Reject",
-    "APPS_DIALER_END_CALL": "End",
-    "APPS_DIALER_INVALID_NUMBER": "Invalid number",
-    "APPS_DIALER_INPUT_PLACEHOLDER": "Enter a number",
-    "APPS_DIALER_NO_HISTORY": "You have no call history",
-    "APPS_DIALER_NAVBAR_HISTORY": "History",
-    "APPS_DIALER_NAVBAR_DIAL": "Dial",
-    "APPS_DIALER_NAVBAR_CONTACTS": "Contacts",
-    "APPS_DIALER_BUSY_LINE": "The line was busy.",
-
-    "APPS_TWITTER_TWEET": "Tweet",
-    "APPS_TWITTER_TWEET_MESSAGE_PLACEHOLDER": "What's happening?",
-    "APPS_TWITTER_IMAGE_PLACEHOLDER": "A link to your image or gif",
-    "APPS_TWITTER_SUBMIT_IMAGE": "Add Media",
-    "APPS_TWITTER_CLOSE_IMAGE": "Close",
-    "APPS_TWITTER_CLOSE": "Close",
-    "APPS_TWITTER_DELETE": "Delete",
-    "APPS_TWITTER_REPORT": "Report",
-    "APPS_TWITTER_REPORTED": " Reported",
-    "APPS_TWITTER_RETWEETED": "Retweeted",
-    "APPS_TWITTER_JUST_NOW": "Just now",
-    "APPS_TWITTER_SEARCH_TWEETS": "Search for tweets",
-    "APPS_TWITTER_SEARCH_TWEETS_PLACEHOLDER": "Search by profile name or message",
-    "APPS_TWITTER_TWEET_MESSAGE_CHAR_LIMIT": "Message is over the character limit",
-    "APPS_TWITTER_TWEET_MESSAGE_NEW_LINE_LIMIT": "Message is over the new line limit",
-    "APPS_TWITTER_CREATE_SUCCESS": "Successfully sent your tweet",
-    "APPS_TWITTER_CREATE_FAILED": "Failed to send your tweet",
-    "APPS_TWITTER_EDIT_PROFILE_AVATAR": "Avatar URL",
-    "APPS_TWITTER_EDIT_PROFILE_NAME": "Profile name",
-    "APPS_TWITTER_EDIT_DEFAULT_PROFILE_NAME": "Choose Profile Name",
-    "APPS_TWITTER_EDIT_PROFILE_BIO": "Bio",
-    "APPS_TWITTER_EDIT_PROFILE_LOCATION": "Location",
-    "APPS_TWITTER_EDIT_PROFILE_JOB": "Job",
-    "APPS_TWITTER_CREATE_PROFILE_SUCCESS": "Successfully created your profile",
-    "APPS_TWITTER_CREATE_PROFILE_FAILURE": "Failed to create your profile",
-    "APPS_TWITTER_EDIT_PROFILE_SUCCESS": "Successfully updated your profile",
-    "APPS_TWITTER_EDIT_PROFILE_FAILURE": "Failed to update your profile",
-    "APPS_TWITTER_RETWEET_EXISTS": "You have already retweeted this tweet!",
-    "APPS_TWITTER_FETCH_TWEETS_FAILED": "Failed to retrieve tweets",
-    "APPS_TWITTER_TIME_JUST_NOW": "Just now",
-    "APPS_TWITTER_TIME_MINUTES": "m",
-    "APPS_TWITTER_TIME_HOURS": "h",
-    "APPS_TWITTER_TIME_DAYS": "d",
-    "APPS_TWITTER_NEW_BROADCAST": "New tweet from @{{ profile_name }}!",
-    "APPS_TWITTER_NEW_RETWEET_BROADCAST": "@{{ profile_name }} retweeted someone!",
-    "APPS_TWITTER_UNREAD_MESSAGES": "You have {{ count }} new tweets in your timeline!",
-    "APPS_TWITTER_DELETE_TWEET_FAILED": "Failed to delete tweet",
-    "APPS_TWITTER_LIKE_TWEET_FAILED": "Failed to like tweet",
-    "APPS_TWITTER_RETWEET_FAILED": "Failed to retweet",
-    "APPS_TWITTER_REPORT_TWEET_FAILED": "Failed to report tweet",
-    "APPS_TWITTER_REPORT_TWEET_SUCCESS": "Successfully reported tweet",
-
     "APPS_MATCH": "Matchmaker",
-    "APPS_MATCH_LIKED": "LIKE",
-    "APPS_MATCH_NOPE": "NOPE",
-    "APPS_MATCH_LIKE": "Like",
-    "APPS_MATCH_DISLIKE": "Dislike",
-    "APPS_MATCH_NO_PROFILES": "No Recent Profiles Found",
-    "APPS_MATCH_NO_MATCHES": "No matches Found",
-    "APPS_MATCH_PROFILES_ERROR": "Error loading profiles",
-    "APPS_MATCH_MATCHES_ERROR": "Error loading matches",
-    "APPS_MATCH_PROFILE_CONFIGURATION": "App is incorrectly configured - cannot create profile. Please contact an administrator.",
-    "APPS_MATCH_MY_PROFILE_ERROR": "Error loading profile",
-    "APPS_MATCH_PROFILE_LAST_ACTIVE": "Last Active: {{ lastActive }}",
-    "APPS_MATCH_PROFILE_MATCHED_AT": "Matched: {{ matchedAt }}",
-    "APPS_MATCH_EDIT_PROFILE_PREVIEW": "Show Preview",
-    "APPS_MATCH_EDIT_PROFILE_IMAGE": "Image URL",
-    "APPS_MATCH_EDIT_PROFILE_NAME": "Profile name",
-    "APPS_MATCH_EDIT_PROFILE_BIO": "Bio",
-    "APPS_MATCH_EDIT_PROFILE_LOCATION": "Location",
-    "APPS_MATCH_EDIT_PROFILE_JOB": "Job",
-    "APPS_MATCH_EDIT_PROFILE_TAGS": "Tags",
-    "APPS_MATCH_GET_MY_PROFILE_FAILED": "Failed to retrieve player's profile",
-    "APPS_MATCH_GET_PROFILES_FAILED": "Failed to retrieve profiles",
-    "APPS_MATCH_GET_MATCHES_FAILED": "Failed to retrieve matches",
-    "APPS_MATCH_UPDATE_PROFILE_SUCCEEDED": "Successfully updated profile",
-    "APPS_MATCH_UPDATE_PROFILE_FAILED": "Failed to update profile",
-    "APPS_MATCH_CREATE_PROFILE_FAILED": "Failed to create profile",
-    "APPS_MATCH_SAVE_LIKES_FAILED": "Failed to save likes",
-    "APPS_MATCH_SAVE_LIKES_SUCCEDED": "Successfully saved likes",
-    "APPS_MATCH_NEW_LIKE_FOUND": "New match found!",
-
-    "APPS_BANK_TRANSFER": "Transfer",
-    "APPS_BANK_HOME_TITLE": "Welcome",
-    "APPS_BANK_ACCOUNT_LINK": "Account",
-    "APPS_BANK_TIME_JUST_NOW": "Just now",
-    "APPS_BANK_ACCOUNT_TITLE": "Account Summary",
-    "APPS_BANK_ACCOUNT_TRANSACTIONS": "Transactions",
-    "APPS_BANK_ACCOUNT_SEE_TRANSACTION": "See all",
-    "APPS_BANK_ACTIONS_TRANSFER": "Transfer",
-    "APPS_BANK_ALERT_TRANSFER_SUCCESS": "Transfer done successfully!",
-    "APPS_BANK_ALERT_TRANSFER_FAILURE": "Transfer failed!",
-
-    "APPS_MESSAGES_SEARCH_PLACEHOLDER": "Search messages...",
-    "APPS_MESSAGES_NEW_MESSAGE": "Message...",
-    "APPS_MESSAGES_NEW_MESSAGE_FAILED:": "Failed to send message",
-    "APPS_MESSAGES_NEW_MESSAGE_GROUP": "Phone numbers...",
-    "APPS_MESSAGES_GROUP_CHAT_LABEL": "Group chat label...",
-    "APPS_MESSAGE_MEDIA_OPTION": "Camera / Gallery",
-    "APPS_MESSAGES_NEW_MESSAGE_GROUP_SUBMIT": "Send",
-    "APPS_MESSAGES_INVALID_PHONE_NUMBER": "Invalid phone number",
-    "APPS_MESSAGES_MESSAGE_GROUP_DUPLICATE": "This message group already exists",
-    "APPS_MESSAGES_MESSAGE_GROUP_CREATE_FAILED": "Failed to create message group",
-    "APPS_MESSAGES_MESSAGE_GROUP_CREATE_MINE": "You cannot add yourself!",
-    "APPS_MESSAGES_MESSAGE_GROUP_CREATE_ALL_NUMBERS_FAILED": "None of the phone numbers could be found!",
-    "APPS_MESSAGES_MESSAGE_GROUP_CREATE_ONE_NUMBER_FAILED": "{{ number }} is not a registered number",
-    "APPS_MESSAGES_MESSAGE_GROUP_CREATE_SOME_NUMBERS_FAILED": "({{ numbers }}) are not registered numbers.",
-    "APPS_MESSAGES_INPUT_NAME_OR_NUMBER": "Search contacts or type number and press enter",
-    "APPS_MESSAGES_UNREAD_MESSAGES": "You have {{ count }} unread messages",
-    "APPS_MESSAGES_ACTIONS_TITLE": "Actions",
-    "APPS_MESSAGES_DELETE_CONVERSATION": "Delete conversation",
-    "APPS_MESSAGES_DELETE_CONVERSATION_FAILED": "Failed to delete conversation",
-    "APPS_MESSAGES_ME": "Me",
-    "APPS_MESSAGES_FETCHED_MESSAGES_FAILED": "Failed to retrieve messages",
-    "APPS_MESSAGE_DELETE_MESSAGE": "Delete message",
-    "APPS_MESSAGES_DELETE_MESSAGE_FAILED": "Failed to delete message",
-
-    "APPS_NOTES_ADD_SUCCESS": "Successfully saved note.",
-    "APPS_NOTES_ADD_FAILED": "Failed to save note.",
-    "APPS_NOTES_UPDATE_SUCCESS": "Successfully updated note.",
-    "APPS_NOTES_UPDATE_FAILED": "Failed to update note.",
-    "APPS_NOTES_DELETE_SUCCESS": "Successfully deleted note.",
-    "APPS_NOTES_DELETE_FAILED": "Failed to delete note.",
-
     "APPS_CALCULATOR_COPIED": "Result was copied to clipboard!",
-
-    "APPS_SETTINGS_PHONE_NUMBER": "Phone Number",
-    "APPS_SETTINGS_OPTION_WALLPAPER": "Wallpaper",
-    "APPS_SETTINGS_OPTIONS_CUSTOM_WALLPAPER": "Custom Wallpaper",
-    "APPS_SETTINGS_OPTION_FRAME": "Frame",
-    "APPS_SETTINGS_OPTION_THEME": "Theme",
-    "APPS_SETTINGS_OPTION_ZOOM": "Zoom",
-    "APPS_SETTINGS_OPTION_STREAMER_MODE": "Streamer Mode",
-    "APPS_SETTINGS_OPTION_RINGTONE": "Ringtone",
-    "APPS_SETTINGS_OPTION_RINGTONEVOL": "Ringtone Volume",
-    "APPS_SETTINGS_OPTION_NOTIFICATION_FILTER": "Notification Filters",
-    "APPS_SETTINGS_OPTION_NOTIFICATION": "Notification",
-    "APPS_SETTINGS_OPTION_NOTIFICATIONVOL": "Notification Volume",
-    "APPS_SETTING_STREAMER_MODE_DESC": "Hide images before they are shown",
-
-    "APPS_MARKETPLACE_CREATE_LISTING_SUCCESS": "Successfully created a new listing",
-    "APPS_MARKETPLACE_CREATE_LISTING_FAILED": "Failed to create a new listing",
-    "APPS_MARKETPLACE_DELETE_LISTING_SUCCESS": "Successfully delete listing",
-    "APPS_MARKETPLACE_DELETE_LISTING_FAILED": "Failed to delete listing",
-    "APPS_MARKETPLACE_REPORT_LISTING_FAILED": "This listing has already been reported",
-    "APPS_MARKETPLACE_DUPLICATE_LISTING": "You cannot upload a duplicated listing!",
-    "APPS_MARKETPLACE_REPORT_LISTING_SUCCESS": "Successfully reported listing",
-    "APPS_MARKETPLACE_REQUIRED_FIELDS": "All required fields must be filled!",
-    "APPS_MARKETPLACE_FORM_TITLE": "Title",
-    "APPS_MARKETPLACE_FORM_IMAGE": "Image or URL",
-    "APPS_MARKETPLACE_FORM_DESCRIPTION": "Description",
-
     "GENERIC_CLICK_TO_REVEAL": "Click to reveal",
     "GENERIC_LOADING": "Loading...",
     "GENERIC_WAIT": "Please wait...",
diff --git a/phone/src/os/call/hooks/useCallNotifications.tsx b/phone/src/os/call/hooks/useCallNotifications.tsx
index a9f30c9e4..5275e63b5 100644
--- a/phone/src/os/call/hooks/useCallNotifications.tsx
+++ b/phone/src/os/call/hooks/useCallNotifications.tsx
@@ -45,12 +45,12 @@ export const useCallNotifications = () => {
         ...callNotificationBase,
         content: (
           <CallNotification>
-            {t('APPS_DIALER_CURRENT_CALL_WITH', {
+            {t('DIALER.MESSAGES.CURRENT_CALL_WITH', {
               transmitter: call.transmitter,
             })}
           </CallNotification>
         ),
-        title: t('APPS_DIALER_CURRENT_CALL_TITLE'),
+        title: t('DIALER.MESSAGES.CURRENT_CALL_TITLE'),
       });
     }
     if (!call.isTransmitter && !call.is_accepted) {
@@ -59,13 +59,13 @@ export const useCallNotifications = () => {
       addNotificationAlert(
         {
           ...callNotificationBase,
-          title: t('APPS_DIALER_INCOMING_CALL_TITLE', {
+          title: t('DIALER.MESSAGES.INCOMING_CALL_TITLE', {
             transmitter: call.transmitter,
           }),
           keepWhenPhoneClosed: true,
           content: (
             <CallNotification>
-              {t('APPS_DIALER_TRANSMITTER_IS_CALLING', {
+              {t('DIALER.MESSAGES.TRANSMITTER_IS_CALLING', {
                 transmitter: call.transmitter,
               })}
             </CallNotification>
diff --git a/resources/client/cl_photo.ts b/resources/client/cl_photo.ts
index d6b795117..77acf93cc 100644
--- a/resources/client/cl_photo.ts
+++ b/resources/client/cl_photo.ts
@@ -43,11 +43,14 @@ RegisterNuiCB<void>(PhotoEvents.TAKE_PHOTO, async (_, cb) => {
   CellCamActivate(true, true);
   // Hide phone from rendering temporary
   closePhoneTemp();
-
   SetNuiFocus(false, false);
 
   inCameraMode = true;
 
+  // We want to emit this event for UI handling in other resources
+  // We hide nothing in NPWD by default
+  emit(PhotoEvents.NPWD_PHOTO_MODE_STARTED);
+
   while (inCameraMode) {
     await Delay(0);
     if (IsControlJustPressed(1, 27)) {
@@ -68,10 +71,14 @@ RegisterNuiCB<void>(PhotoEvents.TAKE_PHOTO, async (_, cb) => {
     }
     displayHelperText();
   }
+
   ClearHelp(true);
+  // We can now signal to other resources for ending photo mode
+  // and redisplaying HUD components
+  emit(PhotoEvents.NPWD_PHOTO_MODE_ENDED);
+
   emit('npwd:disableControlActions', true);
   await animationService.closeCamera();
-  console.log('anim - closing camera');
 });
 
 const handleTakePicture = async () => {
diff --git a/resources/server/marketplace/marketplace.db.ts b/resources/server/marketplace/marketplace.db.ts
index 88a91f175..416a85813 100644
--- a/resources/server/marketplace/marketplace.db.ts
+++ b/resources/server/marketplace/marketplace.db.ts
@@ -1,4 +1,9 @@
-import { MarketplaceListing, MarketplaceListingBase } from '../../../typings/marketplace';
+import {
+  MarketplaceDeleteDTO,
+  MarketplaceListing,
+  MarketplaceListingBase,
+  ReportListingDTO,
+} from '../../../typings/marketplace';
 import { ResultSetHeader } from 'mysql2';
 import DbInterface from '../db/db_wrapper';
 
@@ -53,14 +58,27 @@ export class _MarketplaceDB {
     return listings[0];
   }
 
-  async reportListing(listingId: number, profile: string): Promise<void> {
-    const query = `INSERT INTO npwd_marketplace_reports (listing_id, profile) VALUES (?, ?)`;
-    await DbInterface._rawExec(query, [listingId, profile]);
+  async getListingIdsByIdentifier(identifier: string): Promise<MarketplaceDeleteDTO[]> {
+    const query = `SELECT id FROM npwd_marketplace_listings WHERE identifier = ?`;
+    const [results] = await DbInterface._rawExec(query, [identifier]);
+
+    return <MarketplaceDeleteDTO[]>results;
+  }
+
+  async reportListing(listing: ReportListingDTO, profile: string): Promise<void> {
+    const query = `INSERT INTO npwd_marketplace_reports (listing_id, profile, title, description, url) VALUES (?, ?, ?, ?, ?)`;
+    await DbInterface._rawExec(query, [
+      listing.id,
+      profile,
+      listing.title,
+      listing.description,
+      listing.url,
+    ]);
   }
 
-  async doesListingExist(listing: MarketplaceListingBase): Promise<boolean> {
-    const query = `SELECT * FROM npwd_marketplace_listings WHERE title = ?`;
-    const [results] = await DbInterface._rawExec(query, [listing.title]);
+  async doesListingExist(listing: MarketplaceListingBase, identifier: string): Promise<boolean> {
+    const query = `SELECT * FROM npwd_marketplace_listings WHERE title = ? AND identifier = ?`;
+    const [results] = await DbInterface._rawExec(query, [listing.title, identifier]);
     const listings = <MarketplaceListingBase[]>results;
 
     return listings.length > 0;
diff --git a/resources/server/marketplace/marketplace.service.ts b/resources/server/marketplace/marketplace.service.ts
index b5db0e721..314089e39 100644
--- a/resources/server/marketplace/marketplace.service.ts
+++ b/resources/server/marketplace/marketplace.service.ts
@@ -28,9 +28,10 @@ class _MarketplaceService {
     marketplaceLogger.debug(reqObj.data);
 
     const player = PlayerService.getPlayer(reqObj.source);
+    const identifier = player.getIdentifier();
 
     try {
-      const doesListingExist = await this.marketplaceDB.doesListingExist(reqObj.data);
+      const doesListingExist = await this.marketplaceDB.doesListingExist(reqObj.data, identifier);
       if (doesListingExist) return resp({ status: 'error', data: ListingTypeResp.DUPLICATE });
 
       const listingId = await this.marketplaceDB.addListing(
@@ -90,11 +91,9 @@ class _MarketplaceService {
 
       resp({ status: 'ok' });
 
-      const returnObj: MarketplaceDeleteDTO = {
-        id: reqObj.data.id,
-      };
+      const returnObj = reqObj.data.id;
 
-      emitNet(MarketplaceEvents.BROADCAST_DELETE, -1, returnObj);
+      emitNet(MarketplaceEvents.BROADCAST_DELETE, -1, [returnObj]);
     } catch (e) {
       marketplaceLogger.error(`Error in handleDeleteListing, ${e.message}`);
 
@@ -104,6 +103,10 @@ class _MarketplaceService {
 
   async handleDeleteListingsOnDrop(identifier: string) {
     try {
+      const listingIds = await this.marketplaceDB.getListingIdsByIdentifier(identifier);
+
+      emitNet(MarketplaceEvents.BROADCAST_DELETE, -1, listingIds);
+
       await this.marketplaceDB.deleteListingsOnDrop(identifier);
     } catch (e) {
       marketplaceLogger.error(`Error when deleting listings on player drop, ${e.message}`);
@@ -129,7 +132,7 @@ class _MarketplaceService {
         return;
       }
 
-      await this.marketplaceDB.reportListing(rListing.id, rListing.name || rListing.username);
+      await this.marketplaceDB.reportListing(rListing, rListing.name || rListing.username);
       await reportListingToDiscord(rListing, reportingPlayer);
     } catch (e) {
       marketplaceLogger.error(`Failed to report listing ${e.message}`, {
diff --git a/resources/server/messages/messages.service.ts b/resources/server/messages/messages.service.ts
index fb47003e3..de10ce3a3 100644
--- a/resources/server/messages/messages.service.ts
+++ b/resources/server/messages/messages.service.ts
@@ -143,7 +143,7 @@ class _MessagesService {
       }
     } catch (e) {
       emitNet(MessageEvents.ACTION_RESULT, reqObj.source, {
-        message: 'APPS_MESSAGES_NEW_MESSAGE_FAILED',
+        message: 'MESSAGES.FEEDBACK.NEW_MESSAGE_FAILED',
         type: 'error',
       });
       messagesLogger.error(`Failed to send message, ${e.message}`, {
diff --git a/resources/server/messages/messages.utils.ts b/resources/server/messages/messages.utils.ts
index af9423739..7f48f0f62 100644
--- a/resources/server/messages/messages.utils.ts
+++ b/resources/server/messages/messages.utils.ts
@@ -126,12 +126,6 @@ export async function createMessageGroupsFromPhoneNumber(
   };
 }
 
-export async function restoreMessageConversation(
-  userIdentifier: string,
-  participantIdentifier: string,
-  conversationId: string,
-) {}
-
 // getting the participants from groupId.
 // this should return the source or and array of identifiers
 export function getIdentifiersFromParticipants(conversationId: string) {
diff --git a/resources/server/twitter/twitter.service.ts b/resources/server/twitter/twitter.service.ts
index eb43c2754..3835f5881 100644
--- a/resources/server/twitter/twitter.service.ts
+++ b/resources/server/twitter/twitter.service.ts
@@ -56,7 +56,6 @@ class _TwitterService {
       twitterLogger.error(`Failed to create twitter profile: ${e.message}`, {
         source: reqObj.source,
       });
-
       resp({ status: 'error', errorMsg: e.message });
     }
   }
@@ -185,7 +184,7 @@ class _TwitterService {
       if (await this.twitterDB.doesRetweetExist(reqObj.data.tweetId, identifier)) {
         resp({
           status: 'error',
-          errorMsg: 'TWITTER_RETWEET_EXISTS',
+          errorMsg: 'FEEDBACK.RETWEET_EXISTS',
         });
       }
 
diff --git a/typings/marketplace.ts b/typings/marketplace.ts
index ad4421873..93bbf04dc 100644
--- a/typings/marketplace.ts
+++ b/typings/marketplace.ts
@@ -43,3 +43,10 @@ export interface MarketplaceDeleteDTO {
 export interface MarketplaceReportDTO {
   id: number;
 }
+
+export type ReportListingDTO = {
+  id: number;
+  title: string;
+  description: string;
+  url: string;
+};
diff --git a/typings/photo.ts b/typings/photo.ts
index 410c4f923..76df4d64f 100644
--- a/typings/photo.ts
+++ b/typings/photo.ts
@@ -5,6 +5,8 @@ export interface GalleryPhoto {
 
 export enum PhotoEvents {
   TAKE_PHOTO = 'npwd:TakePhoto',
+  NPWD_PHOTO_MODE_STARTED = 'npwd:PhotoModeStarted',
+  NPWD_PHOTO_MODE_ENDED = 'npwd:PhotoModeEnded',
   TAKE_PHOTO_SUCCESS = 'npwd:TakePhotoSuccess',
   UPLOAD_PHOTO = 'npwd:UploadPhoto',
   FETCH_PHOTOS = 'npwd:FetchPhotos',
diff --git a/yarn.lock b/yarn.lock
index aa39046e9..2a30a89fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3730,10 +3730,10 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-prettier@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
+prettier@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893"
+  integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==
 
 pretty-quick@^3.1.2:
   version "3.1.2"