diff --git a/frontend/src/features/book/api/loader.js b/frontend/src/features/book/api/loader.js
index f7876848..99d87509 100644
--- a/frontend/src/features/book/api/loader.js
+++ b/frontend/src/features/book/api/loader.js
@@ -1,5 +1,5 @@
 import { getBookQuery, getPageQuery } from "./query";
-import { definedLangInfoQuery } from "@language/api/language";
+import { userLanguageQuery } from "@language/api/query";
 import { settingsQuery } from "@settings/api/settings";
 import { softwareInfoQuery } from "@settings/api/settings";
 
@@ -12,7 +12,7 @@ function loader(queryClient) {
 
     const settingsData = await queryClient.ensureQueryData(settingsQuery);
     const languageData = await queryClient.ensureQueryData(
-      definedLangInfoQuery(bookData?.languageId)
+      userLanguageQuery(bookData?.languageId)
     );
     const softwareInfoData =
       await queryClient.ensureQueryData(softwareInfoQuery);
diff --git a/frontend/src/features/book/components/Book/Book.jsx b/frontend/src/features/book/components/Book/Book.jsx
index 41041268..d263741f 100644
--- a/frontend/src/features/book/components/Book/Book.jsx
+++ b/frontend/src/features/book/components/Book/Book.jsx
@@ -3,7 +3,7 @@ import { useParams, useSearchParams } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
 import { Box } from "@mantine/core";
 import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels";
-import { definedLangInfoQuery } from "@language/api/language";
+import { userLanguageQuery } from "@language/api/query";
 import { getTermQuery } from "@term/api/query";
 import { paneResizeStorage } from "@actions/utils";
 import PageSpinner from "@common/PageSpinner/PageSpinner";
@@ -50,7 +50,7 @@ function Book({ themeFormOpen, onThemeFormOpen, onDrawerOpen }) {
       : activeTerm.data);
 
   const { data: book } = useQuery(getBookQuery(id));
-  const { data: language } = useQuery(definedLangInfoQuery(book.languageId));
+  const { data: language } = useQuery(userLanguageQuery(book.languageId));
   const { data: term } = useQuery(getTermQuery(key));
 
   const [state, dispatch] = useBookState();
@@ -81,7 +81,7 @@ function Book({ themeFormOpen, onThemeFormOpen, onDrawerOpen }) {
     <>
       {!editMode && <ContextMenu contextMenuAreaRef={contextMenuAreaRef} />}
 
-      {editMode && <EditPane book={book} isRtl={language.isRightToLeft} />}
+      {editMode && <EditPane book={book} isRtl={language.right_to_left} />}
 
       <FocusPane
         book={book}
@@ -109,7 +109,7 @@ function Book({ themeFormOpen, onThemeFormOpen, onDrawerOpen }) {
             className={classes.paneLeft}>
             <ReadPane
               book={book}
-              isRtl={language.isRightToLeft}
+              isRtl={language.right_to_left}
               state={state}
               dispatch={dispatch}
               activeTerm={activeTerm}
diff --git a/frontend/src/features/book/components/NewBookForm/NewBookForm.jsx b/frontend/src/features/book/components/NewBookForm/NewBookForm.jsx
index 7d61d946..b81361dd 100644
--- a/frontend/src/features/book/components/NewBookForm/NewBookForm.jsx
+++ b/frontend/src/features/book/components/NewBookForm/NewBookForm.jsx
@@ -33,7 +33,7 @@ import {
 } from "@tabler/icons-react";
 import LanguageCards from "@language/components/LanguageCards/LanguageCards";
 import FormButtons from "@common/FormButtons/FormButtons";
-import { defFormSettingsQuery } from "@language/api/language";
+import { userLanguageQuery } from "@language/api/query";
 import { initialQuery } from "@settings/api/settings";
 import { errorMessage } from "@resources/notifications";
 import { createBook, getBookDataFromUrl } from "../../api/api";
@@ -45,9 +45,9 @@ function NewBookForm({ openDrawer }) {
   const [params] = useSearchParams();
   const langId = params.get("langId");
   const isLangSelected = langId && langId !== "0";
-  const { data } = useQuery(defFormSettingsQuery(langId));
+  const { data: language } = useQuery(userLanguageQuery(langId));
   const { data: initial } = useQuery(initialQuery);
-  const dir = data?.right_to_left ? "rtl" : "ltr";
+  const dir = language?.right_to_left ? "rtl" : "ltr";
 
   const form = useForm({
     initialValues: {
diff --git a/frontend/src/features/book/components/common/LoadSampleBooksField/LoadSampleBooksField.jsx b/frontend/src/features/book/components/common/LoadSampleBooksField/LoadSampleBooksField.jsx
index 0ea5c575..e24d7b22 100644
--- a/frontend/src/features/book/components/common/LoadSampleBooksField/LoadSampleBooksField.jsx
+++ b/frontend/src/features/book/components/common/LoadSampleBooksField/LoadSampleBooksField.jsx
@@ -3,7 +3,7 @@ import { useQueryClient, useQuery, useMutation } from "@tanstack/react-query";
 import { ActionIcon, Select } from "@mantine/core";
 import { notifications } from "@mantine/notifications";
 import { IconCheck, IconSelector } from "@tabler/icons-react";
-import { predefinedListQuery } from "@language/api/language";
+import { predefinedLanguagesQuery } from "@language/api/query";
 import { keys as bookKeys } from "@book/api/keys";
 import { keys as settingsKeys } from "@settings/api/keys";
 import { keys as languageKeys } from "@language/api/keys";
@@ -19,7 +19,7 @@ function LoadSampleBooksField({
   onConfirm,
 }) {
   const queryClient = useQueryClient();
-  const { data: predefined } = useQuery(predefinedListQuery);
+  const { data: predefined } = useQuery(predefinedLanguagesQuery);
   const [langName, setLangName] = useState("");
 
   const loadSampleStoriesMutation = useMutation({
@@ -28,8 +28,10 @@ function LoadSampleBooksField({
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: bookKeys.books }),
         queryClient.invalidateQueries({ queryKey: settingsKeys.initial }),
-        queryClient.invalidateQueries({ queryKey: languageKeys.user }),
-        queryClient.invalidateQueries({ queryKey: languageKeys.predefined }),
+        queryClient.invalidateQueries({ queryKey: languageKeys.userLanguages }),
+        queryClient.invalidateQueries({
+          queryKey: languageKeys.predefinedLanguages,
+        }),
       ]);
       notifications.show(
         sampleBooksAdded(`Sample book(s) for "${langName}" added`)
diff --git a/frontend/src/features/language/api/api.js b/frontend/src/features/language/api/api.js
index fbd926af..d340595a 100644
--- a/frontend/src/features/language/api/api.js
+++ b/frontend/src/features/language/api/api.js
@@ -1,3 +1,34 @@
+async function getUserLanguages() {
+  const response = await fetch("http://localhost:5001/api/languages/user");
+  return await response.json();
+}
+
+async function getPredefinedLanguages() {
+  const response = await fetch(
+    "http://localhost:5001/api/languages/predefined"
+  );
+  return await response.json();
+}
+
+async function getUserLanguage(id) {
+  const response = await fetch(
+    `http://localhost:5001/api/languages/user/${id}`
+  );
+  return await response.json();
+}
+
+async function getPredefinedLanguage(langName) {
+  const response = await fetch(
+    `http://localhost:5001/api/languages/predefined/${langName}`
+  );
+  return await response.json();
+}
+
+async function getLanguageParsers() {
+  const response = await fetch("http://localhost:5001/api/languages/parsers");
+  return await response.json();
+}
+
 async function createLanguage(data) {
   const response = await fetch(`http://localhost:5001/api/languages`, {
     method: "POST",
@@ -15,4 +46,11 @@ async function createLanguage(data) {
   return await response.json();
 }
 
-export { createLanguage };
+export {
+  getUserLanguages,
+  getPredefinedLanguages,
+  getLanguageParsers,
+  getUserLanguage,
+  getPredefinedLanguage,
+  createLanguage,
+};
diff --git a/frontend/src/features/language/api/keys.js b/frontend/src/features/language/api/keys.js
index 08723a8f..f2b219f8 100644
--- a/frontend/src/features/language/api/keys.js
+++ b/frontend/src/features/language/api/keys.js
@@ -1,12 +1,7 @@
 export const keys = {
-  user: ["userLanguages"],
-  predefined: ["predefinedLanguages"],
-
-  defined: (id) => ["definedLanguage", id],
-
-  definedFormSettings: (id) => ["definedLanguageFormSettings", id],
-  predefinedFormSettings: (name) => ["predefinedLanguageFormSettings", name],
-
+  userLanguages: ["userLanguages"],
+  predefinedLanguages: ["predefinedLanguages"],
+  userLanguage: (id) => ["definedLanguage", id],
+  predefinedLanguage: (name) => ["predefinedLanguage", name],
   parsers: ["languageParsers"],
-  samples: (langName) => ["sampleStories", langName],
 };
diff --git a/frontend/src/features/language/api/language.jsx b/frontend/src/features/language/api/language.jsx
deleted file mode 100644
index 5d25df3d..00000000
--- a/frontend/src/features/language/api/language.jsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { keys } from "./keys";
-
-const definedLangInfoQuery = (id) => ({
-  queryKey: keys.defined(id),
-  queryFn: async () => {
-    const response = await fetch(`http://localhost:5001/api/languages/${id}`);
-    return await response.json();
-  },
-  enabled: id != null && id !== "0",
-  refetchOnWindowFocus: false,
-});
-
-const defFormSettingsQuery = (id) => ({
-  queryKey: keys.definedFormSettings(id),
-  queryFn: async () => {
-    const response = await fetch(
-      `http://localhost:5001/api/languages/${id}/settings`
-    );
-    return await response.json();
-  },
-  enabled: id != null && id !== "0",
-});
-
-const predefFormSettingsQuery = (langName) => ({
-  queryKey: keys.predefinedFormSettings(langName),
-  queryFn: async () => {
-    const response = await fetch(
-      `http://localhost:5001/api/languages/new/${langName}`
-    );
-    return await response.json();
-  },
-  staleTime: Infinity,
-});
-
-const predefinedListQuery = {
-  queryKey: keys.predefined,
-  queryFn: async () => {
-    const response = await fetch(
-      `http://localhost:5001/api/languages/predefined`
-    );
-    return await response.json();
-  },
-  staleTime: Infinity,
-};
-
-const definedListQuery = {
-  queryKey: keys.user,
-  queryFn: async () => {
-    const response = await fetch(`http://localhost:5001/api/languages/user`);
-    return await response.json();
-  },
-};
-
-const parsersQuery = {
-  queryKey: keys.parsers,
-  queryFn: async () => {
-    const response = await fetch("http://localhost:5001/api/languages/parsers");
-    return await response.json();
-  },
-  staleTime: Infinity,
-};
-
-export {
-  definedListQuery,
-  predefinedListQuery,
-  parsersQuery,
-  definedLangInfoQuery,
-  defFormSettingsQuery,
-  predefFormSettingsQuery,
-};
diff --git a/frontend/src/features/language/api/loader.js b/frontend/src/features/language/api/loader.js
index dc516d28..3cff4f33 100644
--- a/frontend/src/features/language/api/loader.js
+++ b/frontend/src/features/language/api/loader.js
@@ -1,28 +1,24 @@
 import { initialQuery } from "@settings/api/settings";
 import {
-  definedListQuery,
+  userLanguagesQuery,
   parsersQuery,
-  predefFormSettingsQuery,
-  predefinedListQuery,
-} from "./language";
+  predefinedLanguagesQuery,
+} from "./query";
 
 function loader(queryClient) {
   return async () => {
-    const predefListData =
-      await queryClient.ensureQueryData(predefinedListQuery);
-    const defListData = await queryClient.ensureQueryData(definedListQuery);
+    const predefListData = await queryClient.ensureQueryData(
+      predefinedLanguagesQuery
+    );
+    const defListData = await queryClient.ensureQueryData(userLanguagesQuery);
     const parsersData = await queryClient.ensureQueryData(parsersQuery);
     const initialData = await queryClient.ensureQueryData(initialQuery);
-    const predefinedSettingsData = await queryClient.ensureQueryData(
-      predefFormSettingsQuery(null)
-    );
 
     return {
       predefListData,
       defListData,
       parsersData,
       initialData,
-      predefinedSettingsData,
     };
   };
 }
diff --git a/frontend/src/features/language/api/query.js b/frontend/src/features/language/api/query.js
new file mode 100644
index 00000000..f2665c50
--- /dev/null
+++ b/frontend/src/features/language/api/query.js
@@ -0,0 +1,46 @@
+import {
+  getLanguageParsers,
+  getPredefinedLanguage,
+  getPredefinedLanguages,
+  getUserLanguage,
+  getUserLanguages,
+} from "./api";
+import { keys } from "./keys";
+
+const userLanguageQuery = (id) => ({
+  queryKey: keys.userLanguage(id),
+  queryFn: () => getUserLanguage(id),
+  enabled: id != null && id !== "0",
+  refetchOnWindowFocus: false,
+});
+
+const predefinedLanguageQuery = (langName) => ({
+  queryKey: keys.predefinedLanguage(langName),
+  queryFn: () => getPredefinedLanguage(langName),
+  staleTime: Infinity,
+});
+
+const predefinedLanguagesQuery = {
+  queryKey: keys.predefinedLanguages,
+  queryFn: getPredefinedLanguages,
+  staleTime: Infinity,
+};
+
+const userLanguagesQuery = {
+  queryKey: keys.userLanguages,
+  queryFn: getUserLanguages,
+};
+
+const parsersQuery = {
+  queryKey: keys.parsers,
+  queryFn: getLanguageParsers,
+  staleTime: Infinity,
+};
+
+export {
+  userLanguagesQuery,
+  predefinedLanguagesQuery,
+  parsersQuery,
+  userLanguageQuery,
+  predefinedLanguageQuery,
+};
diff --git a/frontend/src/features/language/components/DictTabs/DictTabs.jsx b/frontend/src/features/language/components/DictTabs/DictTabs.jsx
index e0fde2ff..4a7d332b 100644
--- a/frontend/src/features/language/components/DictTabs/DictTabs.jsx
+++ b/frontend/src/features/language/components/DictTabs/DictTabs.jsx
@@ -28,9 +28,11 @@ function DictTabs({
     onChange: onSetActiveTab,
   });
 
-  const allDicts = language.dictionaries.term;
-  const visibleDicts = allDicts.slice(0, MAX_VISIBLE_DICT_TABS);
-  const dropdownDicts = allDicts.slice(MAX_VISIBLE_DICT_TABS);
+  const termDicts = language.dictionaries.filter(
+    (dict) => dict.for === "terms"
+  );
+  const visibleDicts = termDicts.slice(0, MAX_VISIBLE_DICT_TABS);
+  const dropdownDicts = termDicts.slice(MAX_VISIBLE_DICT_TABS);
   // %E2%80%8B is the zero-width string.  The term is reparsed
   // on the server, so this doesn't need to be sent.
   const encodedTermText = encodeURIComponent(termText).replaceAll(
@@ -68,7 +70,7 @@ function DictTabs({
               label={dict.label}
               openDelay={150}
               refProp="innerRef">
-              {dict.isExternal ? (
+              {dict.type === "popup" ? (
                 <DictTabExternal
                   dict={dict}
                   termText={termText}
@@ -136,7 +138,7 @@ function DictTabs({
 
       {visibleDicts.map((dict, index) => {
         return (
-          !dict.isExternal && (
+          dict.type === "embedded" && (
             <Tabs.Panel
               style={{ height: "100%" }}
               key={dict.label}
diff --git a/frontend/src/features/language/components/LanguageCards/LanguageCards.jsx b/frontend/src/features/language/components/LanguageCards/LanguageCards.jsx
index f2318105..f92e5ee8 100644
--- a/frontend/src/features/language/components/LanguageCards/LanguageCards.jsx
+++ b/frontend/src/features/language/components/LanguageCards/LanguageCards.jsx
@@ -1,19 +1,22 @@
 import { useQuery } from "@tanstack/react-query";
 import { useSearchParams } from "react-router-dom";
 import { Group, Radio, rem, ScrollArea, Stack, Text } from "@mantine/core";
-import { definedListQuery } from "../../api/language";
+import { userLanguagesQuery } from "../../api/query";
 import classes from "./LanguageCards.module.css";
 
 function LanguageCards({ label, description }) {
-  const { data: languages } = useQuery(definedListQuery);
+  const { data: languages } = useQuery(userLanguagesQuery);
   const [params, setParams] = useSearchParams();
   const currentId = params.get("langId");
 
   function handleLanguageChange(id) {
-    if (id === currentId) {
-      return;
+    if (id === params.get("langId")) {
+      params.delete("langId");
+    } else {
+      params.set("langId", id);
     }
-    setParams({ langId: id });
+
+    setParams(params);
   }
 
   return (
@@ -27,7 +30,7 @@ function LanguageCards({ label, description }) {
       <ScrollArea type="scroll" offsetScrollbars="x">
         <Group gap={2} wrap="nowrap" align="stretch">
           {languages
-            .toSorted((a, b) => a.id > b.id)
+            .toSorted((a, b) => b.id - a.id)
             .map((data) => (
               <Radio.Card
                 key={data.id}
diff --git a/frontend/src/features/language/components/LanguageForm/LanguageForm.jsx b/frontend/src/features/language/components/LanguageForm/LanguageForm.jsx
index b8b00e7d..ede1e633 100644
--- a/frontend/src/features/language/components/LanguageForm/LanguageForm.jsx
+++ b/frontend/src/features/language/components/LanguageForm/LanguageForm.jsx
@@ -27,10 +27,10 @@ import LanguageRadioLabel from "./components/LanguageRadioLabel";
 import InsertDictionaryButton from "./components/InsertDictionaryButton";
 import {
   parsersQuery,
-  predefinedListQuery,
-  defFormSettingsQuery,
-  predefFormSettingsQuery,
-} from "../../api/language";
+  predefinedLanguagesQuery,
+  userLanguageQuery,
+  predefinedLanguageQuery,
+} from "../../api/query";
 import { initialQuery } from "@settings/api/settings";
 import classes from "./LanguageForm.module.css";
 
@@ -41,17 +41,23 @@ function LanguageForm() {
   const langId = params.get("langId");
   const predefinedSelected = langId === "0";
   const predefSettingsQuery = useQuery(
-    predefFormSettingsQuery(params.get("name", null))
+    predefinedLanguageQuery(params.get("name", null))
   );
-  const defSettingsQuery = useQuery(defFormSettingsQuery(langId));
-  const { data: predefined } = useQuery(predefinedListQuery);
+  const defSettingsQuery = useQuery(userLanguageQuery(langId));
+  const { data: predefined } = useQuery(predefinedLanguagesQuery);
   const { data: parsers } = useQuery(parsersQuery);
   const { data: initial } = useQuery(initialQuery);
 
   const form = useForm({
     mode: "uncontrolled",
     initialValues: {
-      ...predefSettingsQuery.data,
+      character_substitutions: "´='|`='|’='|‘='|...=…|..=‥",
+      split_sentences: ".!?",
+      split_sentence_exceptions: "Mr.|Mrs.|Dr.|[A-Z].|Vd.|Vds.",
+      word_chars: "a-zA-ZÀ-ÖØ-öø-ȳáéíóúÁÉÍÓÚñÑ",
+      right_to_left: false,
+      show_romanization: false,
+      parser_type: "spacedel",
       // minimum dictionaries should be defined on backend with other settings
       dictionaries: [
         {
@@ -88,6 +94,13 @@ function LanguageForm() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defSettingsQuery.data, defSettingsQuery.isSuccess]);
 
+  useEffect(() => {
+    if (!langId) {
+      form.reset();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [langId]);
+
   return (
     <form>
       {openedFromLanguages && initial.haveLanguages && (
diff --git a/frontend/src/features/language/components/LanguageForm/LanguageSelect.jsx b/frontend/src/features/language/components/LanguageForm/LanguageSelect.jsx
index b18fd957..54fec2ec 100644
--- a/frontend/src/features/language/components/LanguageForm/LanguageSelect.jsx
+++ b/frontend/src/features/language/components/LanguageForm/LanguageSelect.jsx
@@ -9,7 +9,7 @@ import {
 } from "@mantine/core";
 import { IconLanguage } from "@tabler/icons-react";
 
-function LanguageSelect({ form, languages }) {
+function LanguageSelect({ languages }) {
   const [params, setParams] = useSearchParams();
   const { pathname } = useLocation();
 
@@ -30,7 +30,6 @@ function LanguageSelect({ form, languages }) {
   function handleClearField() {
     setSearch("");
     setValue(null);
-    form.reset();
     params.delete("name");
     params.delete("langId");
     setParams(params);
diff --git a/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/DictionaryBar.jsx b/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/DictionaryBar.jsx
index 75a3a1ad..2eaf9e44 100644
--- a/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/DictionaryBar.jsx
+++ b/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/DictionaryBar.jsx
@@ -8,12 +8,17 @@ import {
   Tooltip,
 } from "@mantine/core";
 import {
-  IconExternalLink,
   IconGripVertical,
   IconSquareRoundedMinusFilled,
 } from "@tabler/icons-react";
+import TestDictionaryButton from "./components/TestDictionaryButton";
 
 function DictionaryBar({ form, index, dndProvided }) {
+  const testUrl = form
+    .getValues()
+    .dictionaries[index]?.url.replace("###", "test")
+    .replace("[LUTE]", "test");
+
   return (
     <Group
       mb={5}
@@ -32,7 +37,7 @@ function DictionaryBar({ form, index, dndProvided }) {
       <Tooltip label="Is active?" openDelay={300} withinPortal={false}>
         <Checkbox
           size="xs"
-          disabled={form.getValues().dictionaries.length > 2 ? false : true}
+          disabled={form.getValues().dictionaries.length <= 2}
           key={form.key(`dictionaries.${index}.active`)}
           {...form.getInputProps(`dictionaries.${index}.active`, {
             type: "checkbox",
@@ -46,11 +51,7 @@ function DictionaryBar({ form, index, dndProvided }) {
         placeholder="Dictionary URL"
         rightSection={
           form.getValues().dictionaries[index]?.url.length > 0 ? (
-            <Tooltip label="Test dictionary" openDelay={300}>
-              <ActionIcon variant="transparent" size="sm">
-                <IconExternalLink />
-              </ActionIcon>
-            </Tooltip>
+            <TestDictionaryButton src={testUrl} />
           ) : null
         }
         key={form.key(`dictionaries.${index}.url`)}
diff --git a/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/components/TestDictionaryButton.jsx b/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/components/TestDictionaryButton.jsx
new file mode 100644
index 00000000..fe360438
--- /dev/null
+++ b/frontend/src/features/language/components/LanguageForm/components/DictionaryBar/components/TestDictionaryButton.jsx
@@ -0,0 +1,42 @@
+import {
+  ActionIcon,
+  Divider,
+  Popover,
+  Stack,
+  Text,
+  Tooltip,
+} from "@mantine/core";
+import { IconExternalLink } from "@tabler/icons-react";
+
+function TestDictionaryButton({ src }) {
+  return (
+    <Popover>
+      <Popover.Target>
+        <Tooltip label="Test dictionary" openDelay={300}>
+          <ActionIcon variant="subtle" size="sm">
+            <IconExternalLink />
+          </ActionIcon>
+        </Tooltip>
+      </Popover.Target>
+      <Popover.Dropdown>
+        <Stack w={500} h={350}>
+          <Text mb={5} size="sm">
+            If you see the expected content, this dictionary can be embedded; if
+            not, change the type to &quot;Pop-up&quot;.
+          </Text>
+
+          <Divider mb={5} />
+
+          <iframe
+            style={{ border: "none" }}
+            height="100%"
+            src={src}
+            loading="lazy"
+          />
+        </Stack>
+      </Popover.Dropdown>
+    </Popover>
+  );
+}
+
+export default TestDictionaryButton;
diff --git a/frontend/src/features/term/api/loader.js b/frontend/src/features/term/api/loader.js
index 525d2750..ca099693 100644
--- a/frontend/src/features/term/api/loader.js
+++ b/frontend/src/features/term/api/loader.js
@@ -1,10 +1,10 @@
-import { definedListQuery } from "@language/api/language";
+import { userLanguagesQuery } from "@language/api/query";
 import { initialQuery } from "@settings/api/settings";
 import { getTagsQuery, getTagSuggestionsQuery } from "./query";
 
 function loader(queryClient) {
   return async () => {
-    const defListData = await queryClient.ensureQueryData(definedListQuery);
+    const defListData = await queryClient.ensureQueryData(userLanguagesQuery);
     const tagSuggestionsData = await queryClient.ensureQueryData(
       getTagSuggestionsQuery
     );
diff --git a/frontend/src/features/term/components/TermForm/TermForm.jsx b/frontend/src/features/term/components/TermForm/TermForm.jsx
index 8809830e..37ef4751 100644
--- a/frontend/src/features/term/components/TermForm/TermForm.jsx
+++ b/frontend/src/features/term/components/TermForm/TermForm.jsx
@@ -46,7 +46,7 @@ const termBlank = {
   // "currentImg": term.current_image,
 };
 
-const languageBlank = { id: 0, isRightToLeft: false, showPronunciation: true };
+const languageBlank = { id: 0, right_to_left: false, show_romanization: true };
 
 function TermForm({
   term = termBlank,
@@ -62,11 +62,11 @@ function TermForm({
   const editMode = term.id !== null;
   const blankMode = !term.text;
   const { id: bookId } = useParams();
-  const dir = language.isRightToLeft ? "rtl" : "ltr";
+  const dir = language.right_to_left ? "rtl" : "ltr";
 
   const [notesOpened, setNotesOpened] = useState(blankMode);
   const [pronunciationOpened, setPronunciationOpened] = useState(
-    !blankMode ? language.showPronunciation : true
+    !blankMode ? language.show_romanization : true
   );
   const [parents, setParents] = useState(form.getValues().parents || []);
 
diff --git a/frontend/src/initial-loader.js b/frontend/src/initial-loader.js
index a7546e4e..59f52aef 100644
--- a/frontend/src/initial-loader.js
+++ b/frontend/src/initial-loader.js
@@ -1,5 +1,5 @@
 import { getBooksQuery } from "@book/api/query";
-import { predefinedListQuery } from "@language/api/language";
+import { predefinedLanguagesQuery } from "@language/api/query";
 import {
   initialQuery,
   settingsQuery,
@@ -13,8 +13,9 @@ function loader(queryClient) {
     const settingsData = await queryClient.ensureQueryData(settingsQuery);
     const allBooksData = await queryClient.ensureQueryData(getBooksQuery);
     const initialData = await queryClient.ensureQueryData(initialQuery);
-    const predefLangListData =
-      await queryClient.ensureQueryData(predefinedListQuery);
+    const predefLangListData = await queryClient.ensureQueryData(
+      predefinedLanguagesQuery
+    );
 
     return {
       settingsData,
diff --git a/frontend/src/pages/NewEditTermPage.jsx b/frontend/src/pages/NewEditTermPage.jsx
index 093f415d..82683f09 100644
--- a/frontend/src/pages/NewEditTermPage.jsx
+++ b/frontend/src/pages/NewEditTermPage.jsx
@@ -7,7 +7,7 @@ import PageTitle from "@common/PageTitle/PageTitle";
 import LanguageCards from "@language/components/LanguageCards/LanguageCards";
 import DictTabs from "@language/components/DictTabs/DictTabs";
 import TermForm from "@term/components/TermForm/TermForm";
-import { definedLangInfoQuery } from "@language/api/language";
+import { userLanguageQuery } from "@language/api/query";
 import { getTermQuery } from "@term/api/query";
 
 function NewEditTermPage() {
@@ -15,7 +15,7 @@ function NewEditTermPage() {
   const [params] = useSearchParams();
   const langId = params.get("langId");
   const termId = params.get("termId");
-  const { data: language } = useQuery(definedLangInfoQuery(langId));
+  const { data: language } = useQuery(userLanguageQuery(langId));
   const { data: term } = useQuery(getTermQuery(termId));
 
   const editMode = termId && language && term;
@@ -34,7 +34,7 @@ function NewEditTermPage() {
         <Group
           justify="center"
           align="flex-start"
-          dir={language.isRightToLeft ? "rtl" : "ltr"}>
+          dir={language.right_to_left ? "rtl" : "ltr"}>
           <Box flex={0.3}>
             <TermForm
               key={term}
diff --git a/lute/api/language.py b/lute/api/language.py
index 2b83cf74..bfceaeaa 100644
--- a/lute/api/language.py
+++ b/lute/api/language.py
@@ -2,7 +2,7 @@
 Languages endpoints
 """
 
-from urllib.parse import urlparse, quote
+from urllib.parse import urlparse
 from flask import Blueprint, jsonify, request
 
 from sqlalchemy import text as SQLText
@@ -11,7 +11,6 @@
 from lute.db import db
 from lute.models.language import Language as LanguageModel
 from lute.language.service import Service as LangService
-from lute.models.repositories import LanguageRepository
 
 bp = Blueprint("api_languages", __name__, url_prefix="/api/languages")
 
@@ -76,24 +75,26 @@ def create_language():
     return jsonify(None)
 
 
-@bp.route("/new/", defaults={"langname": None}, methods=["GET"])
-@bp.route("/new/<string:langname>", methods=["GET"])
-def new_language(langname=None):
-    "get language"
+@bp.route("/predefined/<string:langname>", methods=["GET"])
+def get_predefined_language(langname):
+    "get predefined language form data"
 
-    language = LanguageModel()
-    if langname is not None:
-        service = LangService(db.session)
-        predefined = service.supported_predefined_languages()
-        candidates = [lang for lang in predefined if lang.name == langname]
-        if len(candidates) == 1:
-            language = candidates[0]
+    if langname is None:
+        return jsonify(None)
+
+    service = LangService(db.session)
+    predefined = service.supported_predefined_languages()
+    candidates = [lang for lang in predefined if lang.name == langname]
+    if len(candidates) == 1:
+        language = candidates[0]
+    else:
+        return jsonify(None)
 
-    return jsonify(language.to_dict())
+    return jsonify(_lang_to_dict(language))
 
 
-@bp.route("/<int:langid>/settings", methods=["GET"])
-def get_existing_lang_settings(langid):
+@bp.route("/user/<int:langid>", methods=["GET"])
+def get_user_languag(langid):
     """
     get existing language form data
     """
@@ -102,36 +103,8 @@ def get_existing_lang_settings(langid):
         return jsonify("Language does not exist")
 
     language = db.session.get(LanguageModel, langid)
-    return jsonify(language.to_dict())
-
-
-@bp.route("/<int:langid>", methods=["GET"])
-def get_existing_lang_info(langid):
-    """
-    get existing language data
-    to create dict tabs, book view and term form
-    """
-
-    language = db.session.get(LanguageModel, langid)
-    lang_repo = LanguageRepository(db.session)
-    term_dicts = lang_repo.all_dictionaries()[langid]["term"]
-    sentence_dicts = lang_repo.all_dictionaries()[langid]["sentence"]
-
-    term_dicts = [
-        _get_dict_info(dict, index, langid) for index, dict in enumerate(term_dicts)
-    ]
-    sentence_dicts = [
-        _get_dict_info(dict, index, langid) for index, dict in enumerate(sentence_dicts)
-    ]
 
-    return jsonify(
-        {
-            "id": langid,
-            "isRightToLeft": language.right_to_left,
-            "showPronunciation": language.show_romanization,
-            "dictionaries": {"term": term_dicts, "sentence": sentence_dicts},
-        }
-    )
+    return jsonify(_lang_to_dict(language))
 
 
 @bp.route("/parsers", methods=["GET"])
@@ -139,22 +112,31 @@ def get_parsers():
     return jsonify([{"value": a[0], "label": a[1].name()} for a in supported_parsers()])
 
 
-def _get_dict_info(dictURL, dictID, langid):
-    url = dictURL.replace("*", "")
-    # label = url if len(url) <= 10 else f"{url[:10]}..."
-    hostname = urlparse(url).hostname
-    label = hostname.split("www.")[-1] if hostname.startswith("www.") else hostname
-
-    if "www.bing.com" in url:
-        bing_hash = url.replace("https://www.bing.com/images/search?", "")
-        url = "http://localhost:5001/bing/search/{}/###/{}".format(
-            langid, quote(bing_hash, safe="()*!.'")
-        )
-
-    return {
-        "id": dictID,
-        "url": url,
-        "label": label,
-        "isExternal": dictURL[0] == "*",
-        "hostname": hostname,
-    }
+def _lang_to_dict(language):
+    ret = {}
+    ret["id"] = language.id
+    ret["name"] = language.name
+    ret["show_romanization"] = language.show_romanization
+    ret["right_to_left"] = language.right_to_left
+    ret["parser_type"] = language.parser_type
+    ret["character_substitutions"] = language.character_substitutions
+    ret["split_sentences"] = language.regexp_split_sentences
+    ret["split_sentence_exceptions"] = language.exceptions_split_sentences
+    ret["word_chars"] = language.word_characters
+    ret["dictionaries"] = []
+    for d in language.dictionaries:
+        url = d.dicturi
+        hostname = urlparse(url).hostname
+        dictionary = {
+            "for": d.usefor,
+            "type": d.dicttype.replace("html", ""),
+            "url": url,
+            "active": d.is_active,
+            "hostname": hostname,
+            "label": (
+                hostname.split("www.")[-1] if hostname.startswith("www.") else hostname
+            ),
+        }
+        ret["dictionaries"].append(dictionary)
+
+    return ret