diff --git a/apps/astraplusplus/widget/Common/Components/Button.jsx b/apps/astraplusplus/widget/Common/Components/Button.jsx
new file mode 100644
index 0000000..cf55f30
--- /dev/null
+++ b/apps/astraplusplus/widget/Common/Components/Button.jsx
@@ -0,0 +1,61 @@
+const children = props.children ?? "Button";
+const onClick = props.onClick ?? (() => {});
+const href = props.href;
+const variant = props.variant ?? "primary"; // primary, success, danger
+
+const tag = href ? "a" : "button";
+
+const Wrapper = styled[tag]`
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  border-radius: 100px;
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 15px;
+  text-align: center;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 12px 32px;
+  border: 1px solid #d7dbdf;
+
+  color: ${(p) => {
+    switch (p.variant) {
+      case "primary":
+        return "#11181c";
+      case "success":
+        return "#000";
+      case "danger":
+        return "#fff";
+    }
+  }} !important;
+  background: ${(p) => {
+    switch (p.variant) {
+      case "primary":
+        return "#FBFCFD";
+      case "success":
+        return "#59e692";
+      case "danger":
+        return "#e5484d";
+    }
+  }};
+
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    outline: none;
+    opacity: 0.9;
+  }
+
+  &:disabled {
+    opacity: 0.7;
+    cursor: not-allowed;
+  }
+`;
+
+return (
+  <Wrapper onClick={() => onClick} href={href} variant={variant} {...props}>
+    {children}
+  </Wrapper>
+);
\ No newline at end of file
diff --git a/apps/astraplusplus/widget/Common/Components/Markdown.jsx b/apps/astraplusplus/widget/Common/Components/Markdown.jsx
new file mode 100644
index 0000000..7c5edff
--- /dev/null
+++ b/apps/astraplusplus/widget/Common/Components/Markdown.jsx
@@ -0,0 +1,51 @@
+const initialText = props.initialText ?? "# Hello World\n\n";
+const height = props.height ?? "500px";
+
+const code = `
+<script src="https://unpkg.com/react@18/umd/react.development.js" crossorigin></script>
+<script src="https://unpkg.com/react-dom@18/umd/react-dom.development.js" crossorigin></script>
+<script src="https://unpkg.com/react-markdown-editor-lite@1.3.4/lib/index.js" crossorigin></script>
+<link rel="stylesheet" href="https://unpkg.com/react-markdown-editor-lite@1.3.4/lib/index.css" />
+
+
+<div id="react-root"></div>
+
+<script>
+function TestReact(props) {
+  const [value, setValue] = React.useState(props.initialText || "");
+  return React.createElement(ReactMarkdownEditorLite.default, {
+      value,
+      view: { menu: true, md: true, html: false },
+      canView: { menu: true, md: false, html: false, fullScreen: false, hideMenu: true },
+      onChange: ({ text }) => {
+        setValue(text);
+        window.top.postMessage(text, "*");
+      },
+      renderHTML: () => {},
+      className: "full",
+    }); 
+}
+
+const domContainer = document.querySelector('#react-root');
+const root = ReactDOM.createRoot(domContainer);
+
+window.addEventListener("message", (event) => {
+  root.render(React.createElement(TestReact, {
+    initialText: event.data,
+  }));
+});
+
+</script>
+`;
+
+return (
+  <iframe
+    className="w-100"
+    style={{ 
+        height: height,
+     }}
+    srcDoc={code}
+    message={initialText}
+    onMessage={props.onChange}
+  />
+);
\ No newline at end of file
diff --git a/apps/astraplusplus/widget/Common/Components/Select.jsx b/apps/astraplusplus/widget/Common/Components/Select.jsx
new file mode 100644
index 0000000..b2a2f6c
--- /dev/null
+++ b/apps/astraplusplus/widget/Common/Components/Select.jsx
@@ -0,0 +1,198 @@
+const label = props.label ?? "Label";
+const noLabel = props.noLabel ?? false;
+const placeholder = props.placeholder ?? "Select an option";
+const value = props.value ?? "";
+const options = props.options ?? [];
+const onChange = props.onChange ?? (() => {});
+const validate = props.validate ?? (() => {});
+const error = props.error ?? "";
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 0px;
+  gap: 0.45em;
+  width: 100%;
+`;
+
+const Label = styled.label`
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 1.2;
+  color: #6c757d;
+`;
+
+const Error = styled.span`
+  display: inline-block;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 0.75em;
+  line-height: 1.25em;
+  color: #ff4d4f;
+  height: 0;
+  overflow: hidden;
+  transition: height 0.3s ease-in-out;
+
+  &.show {
+    height: 1.25em;
+  }
+`;
+
+const Input = styled.div`
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5em 0.75em;
+  gap: 0.5em;
+  background: #ffffff;
+  border: 1px solid #d0d5dd;
+  box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
+  border-radius: 4px;
+  color: #101828;
+  width: 100%;
+`;
+
+const Placeholder = styled.span`
+  color: #a0a3a8;
+`;
+
+const scaleOut = styled.keyframes`
+  from {
+    transform: scaleY(0);
+  }
+  to {
+    transform: scaleY(1);
+  }
+`;
+
+const Content = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 0;
+  gap: 0.5em;
+  width: 100%;
+  border: 1px solid #d0d5dd;
+  border-radius: 4px;
+  background: #ffffff;
+  z-index: 3 !important;
+
+  /* &[data-state="open"] { */
+  /*   animation: ${scaleOut} 0.2s ease-in-out; */
+  /* } */
+  /**/
+  /* &[data-state="closed"] { */
+  /*   animation: ${scaleOut} 0.2s ease-in-out reverse; */
+  /* } */
+`;
+
+const Viewport = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 0;
+  width: 100%;
+`;
+
+const Item = styled.button`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5em 0.75em;
+  gap: 0.5em;
+  width: 100%;
+  cursor: pointer;
+  background: transparent;
+  border: none;
+  transition: background 0.2s ease-in-out;
+
+  &:nth-child(n + 1) {
+    border-top: 1px solid #d0d5dd;
+  }
+
+  &:hover {
+    background: #d0d5dd;
+    boder: none;
+  }
+
+  &:focus {
+    outline: none;
+  }
+`;
+
+return (
+  <Container>
+    {noLabel ? <></> : <Label>{label}</Label>}
+    <Select.Root
+      value={value?.value}
+      onValueChange={(value) =>
+        onChange(options.find((option) => option.value === value))
+      }
+    >
+      <Select.Trigger asChild={true}>
+        <Input>
+          <Select.Value
+            aria-label={value.value}
+            placeholder={<Placeholder>{placeholder}</Placeholder>}
+          />
+          <Select.Icon>
+            <svg
+              width="12"
+              height="8"
+              viewBox="0 0 12 8"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M1 1.5L6 6.5L11 1.5"
+                stroke="currentColor"
+                stroke-width="1.66667"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+              />
+            </svg>
+          </Select.Icon>
+        </Input>
+      </Select.Trigger>
+
+      <Select.Content asChild={true}>
+        <Content>
+          <Select.Viewport asChild={true}>
+            <Viewport>
+              {props.options.map(({ text, value }) => (
+                <Select.Item value={value} asChild={true}>
+                  <Item>
+                    <Select.ItemText>{text}</Select.ItemText>
+                    <Select.ItemIndicator>
+                      <svg
+                        width="15"
+                        height="15"
+                        viewBox="0 0 15 15"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M11.4669 3.72684C11.7558 3.91574 11.8369 4.30308 11.648 4.59198L7.39799 11.092C7.29783 11.2452 7.13556 11.3467 6.95402 11.3699C6.77247 11.3931 6.58989 11.3355 6.45446 11.2124L3.70446 8.71241C3.44905 8.48022 3.43023 8.08494 3.66242 7.82953C3.89461 7.57412 4.28989 7.55529 4.5453 7.78749L6.75292 9.79441L10.6018 3.90792C10.7907 3.61902 11.178 3.53795 11.4669 3.72684Z"
+                          fill="currentColor"
+                          fill-rule="evenodd"
+                          clip-rule="evenodd"
+                        />
+                      </svg>
+                    </Select.ItemIndicator>
+                  </Item>
+                </Select.Item>
+              ))}
+            </Viewport>
+          </Select.Viewport>
+        </Content>
+      </Select.Content>
+    </Select.Root>
+  </Container>
+);
\ No newline at end of file
diff --git a/apps/astraplusplus/widget/Common/Components/TokenAmount.jsx b/apps/astraplusplus/widget/Common/Components/TokenAmount.jsx
new file mode 100644
index 0000000..d66dabf
--- /dev/null
+++ b/apps/astraplusplus/widget/Common/Components/TokenAmount.jsx
@@ -0,0 +1,98 @@
+const address = props.address ?? ""; // Empty string for NEAR
+const amountWithDecimals = props.amountWithDecimals ?? 0;
+const amountWithoutDecimals = props.amountWithoutDecimals; // Automatically converted to the correct value
+
+const isNEAR = address === "" || address.toLowerCase() === "near";
+
+let ftMetadata = {
+  symbol: "NEAR",
+  decimals: 24,
+};
+
+if (!isNEAR) {
+  ftMetadata = Near.view(address, "ft_metadata", {});
+  if (ftMetadata === null) return null;
+}
+
+let amount = amountWithDecimals;
+if (amountWithoutDecimals !== undefined) {
+  amount = Big(amountWithoutDecimals)
+    .div(Big(10).pow(ftMetadata.decimals))
+    .toString();
+}
+
+const NEAR = () => {
+  return (
+    <svg
+      width={"32px"}
+      height={"32px"}
+      viewBox="0 0 32 32"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <circle cx="16" cy="16" r="16" fill="black"></circle>
+      <g clip-path="url(#clip0000000003)">
+        <path
+          d="M20.8422 8.84471L17.4978 13.776C17.4501 13.847 17.43 13.9328 17.4411 14.0174C17.4522 14.102 17.4938 14.1798 17.5582 14.2363C17.6225 14.2928 17.7053 14.3243 17.7913 14.3249C17.8772 14.3254 17.9604 14.2951 18.0256 14.2395L21.3178 11.4036C21.3371 11.3865 21.361 11.3753 21.3866 11.3714C21.4122 11.3675 21.4383 11.3711 21.4619 11.3818C21.4855 11.3924 21.5054 11.4096 21.5193 11.4314C21.5331 11.4531 21.5403 11.4783 21.54 11.504V20.3824C21.54 20.4095 21.5316 20.4361 21.5158 20.4583C21.5001 20.4806 21.4779 20.4975 21.4522 20.5068C21.4265 20.516 21.3985 20.5172 21.3721 20.5102C21.3456 20.5031 21.322 20.4882 21.3044 20.4673L11.3533 8.63726C11.1933 8.44956 10.994 8.29873 10.7693 8.19525C10.5446 8.09178 10.2999 8.03815 10.0522 8.03809H9.70444C9.2524 8.03809 8.81887 8.21642 8.49922 8.53386C8.17957 8.8513 8 9.28185 8 9.73078V22.2351C8 22.684 8.17957 23.1145 8.49922 23.432C8.81887 23.7494 9.2524 23.9277 9.70444 23.9277V23.9277C9.99591 23.9278 10.2825 23.8537 10.537 23.7125C10.7914 23.5713 11.0051 23.3677 11.1578 23.1211L14.5022 18.1898C14.5499 18.1188 14.57 18.033 14.5589 17.9484C14.5478 17.8638 14.5062 17.7861 14.4418 17.7295C14.3775 17.673 14.2947 17.6415 14.2087 17.641C14.1228 17.6404 14.0396 17.6707 13.9744 17.7264L10.6822 20.5622C10.6629 20.5794 10.639 20.5906 10.6134 20.5944C10.5878 20.5983 10.5617 20.5947 10.5381 20.5841C10.5145 20.5734 10.4946 20.5562 10.4807 20.5345C10.4669 20.5128 10.4597 20.4875 10.46 20.4618V11.5813C10.46 11.5541 10.4684 11.5276 10.4842 11.5053C10.4999 11.483 10.5221 11.4661 10.5478 11.4568C10.5735 11.4476 10.6015 11.4464 10.6279 11.4534C10.6544 11.4605 10.678 11.4755 10.6956 11.4963L20.6456 23.3286C20.8056 23.5163 21.0049 23.6671 21.2296 23.7706C21.4543 23.874 21.699 23.9277 21.9467 23.9277H22.2944C22.5184 23.9279 22.7401 23.8842 22.947 23.7992C23.154 23.7142 23.342 23.5895 23.5004 23.4324C23.6588 23.2752 23.7844 23.0885 23.8702 22.8831C23.9559 22.6776 24 22.4574 24 22.2351V9.73078C24 9.28185 23.8204 8.8513 23.5008 8.53386C23.1811 8.21642 22.7476 8.03809 22.2956 8.03809C22.0041 8.03801 21.7175 8.11211 21.4631 8.25332C21.2086 8.39453 20.9949 8.59814 20.8422 8.84471V8.84471Z"
+          fill="white"
+        ></path>
+      </g>
+      <defs>
+        <clipPath id="clip00033">
+          <rect
+            width="16"
+            height="16"
+            fill="white"
+            transform="translate(8 7.9834)"
+          ></rect>
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
+
+const Wrapper = styled.div`
+  display: inline-grid;
+  grid-template-columns: 32px 1fr;
+  grid-template-rows: 1fr 1fr;
+  grid-column-gap: 8px;
+
+  .icon {
+    grid-row: span 2;
+  }
+  .amount {
+    font-size: 18px;
+    font-weight: 500;
+    line-height: 1.15;
+  }
+  .symbol {
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 1;
+  }
+`;
+return (
+  <Wrapper>
+    <div className="icon">
+      <OverlayTrigger
+        placement="auto"
+        overlay={
+          <Tooltip id={`tooltip-${address}`}>
+            Token address:
+            <strong>{address}</strong>
+          </Tooltip>
+        }
+        show={address === "" ? false : undefined}
+        show={isNEAR ? false : undefined}
+      >
+        {!isNEAR ? (
+          <img width="32px" height="32px" src={ftMetadata.icon} />
+        ) : (
+          <NEAR />
+        )}
+      </OverlayTrigger>
+    </div>
+    <span className="amount">{amount}</span>
+    <span className="symbol">{ftMetadata.symbol}</span>
+  </Wrapper>
+);
\ No newline at end of file
diff --git a/apps/astraplusplus/widget/Common/Modals/ProposalArguments.jsx b/apps/astraplusplus/widget/Common/Modals/ProposalArguments.jsx
index 76a76ce..f052b52 100644
--- a/apps/astraplusplus/widget/Common/Modals/ProposalArguments.jsx
+++ b/apps/astraplusplus/widget/Common/Modals/ProposalArguments.jsx
@@ -201,7 +201,7 @@ if (proposal_type === "Transfer")
         <b>Amount</b>
         <div>
           <Widget
-            src="sking.near/widget/Common.TokenAmount"
+            src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
             props={{
               amountWithoutDecimals: kind.Transfer.amount,
               address: kind.Transfer.token_id
@@ -234,7 +234,7 @@ if (
         <b>Amount</b>
         <div>
           <Widget
-            src="sking.near/widget/Common.TokenAmount"
+            src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
             props={{
               amountWithoutDecimals: kind[proposal_type],
               address: kind.Transfer.token_id
@@ -252,7 +252,7 @@ if (proposal_type === "UpdateBonds")
         <b>Pre Vote Bond Amount</b>
         <div>
           <Widget
-            src="sking.near/widget/Common.TokenAmount"
+            src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
             props={{
               amountWithoutDecimals: kind[proposal_type].pre_vote_bond,
               address: ""
@@ -264,7 +264,7 @@ if (proposal_type === "UpdateBonds")
         <b>Active Queue Bond Amount</b>
         <div>
           <Widget
-            src="sking.near/widget/Common.TokenAmount"
+            src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
             props={{
               amountWithoutDecimals: kind[proposal_type].active_queue_bond,
               address: ""
@@ -323,7 +323,7 @@ if (proposal_type === "FunctionCall") {
                 <b>Deposit</b>
                 <div style={{ zoom: 0.7 }}>
                   <Widget
-                    src="sking.near/widget/Common.TokenAmount"
+                    src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
                     props={{
                       amountWithoutDecimals: deposit,
                       address: ""
@@ -385,7 +385,7 @@ if (proposal_type === "AddBounty")
         <b>Amount</b>
         <div>
           <Widget
-            src="sking.near/widget/Common.TokenAmount"
+            src="/*__@appAccount__*//widget/Common.Components.TokenAmount"
             props={{
               amountWithoutDecimals: kind.AddBounty.bounty.amount,
               address: kind.AddBounty.bounty.token
diff --git a/apps/astraplusplus/widget/DAO/Funds/TransactionLine.jsx b/apps/astraplusplus/widget/DAO/Funds/TransactionLine.jsx
index b071781..6487e86 100644
--- a/apps/astraplusplus/widget/DAO/Funds/TransactionLine.jsx
+++ b/apps/astraplusplus/widget/DAO/Funds/TransactionLine.jsx
@@ -144,7 +144,7 @@ return (
                         ),
                         content: (
                             <Widget
-                                src="sking.near/widget/DAO.Proposal"
+                            src="/*__@appAccount__*//widget/DAO.Proposals.index"
                                 props={{ daoId: daoId, proposalId: proposalId }}
                             />
                         )
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Common/CongressHouseDropdown.jsx b/apps/astraplusplus/widget/DAO/Proposal/Common/CongressHouseDropdown.jsx
index 5b620f2..c8036b2 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Common/CongressHouseDropdown.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Common/CongressHouseDropdown.jsx
@@ -23,7 +23,7 @@ State.init({
 return (
     <div className="mb-3">
         <Widget
-            src={`sking.near/widget/Common.Inputs.Select`}
+            src={`/*__@appAccount__*//widget/Common.Components.Select`}
             props={{
                 label: label,
                 noLabel: false,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create.jsx
index ec4d0c3..b16685b 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create.jsx
@@ -250,7 +250,7 @@ return (
       </div>
     </div>
     <Widget
-      src={`sking.near/widget/Common.Inputs.Select`}
+      src={`/*__@appAccount__*//widget/Common.Components.Select`}
       props={{
         label: "Proposal Type",
         noLabel: false,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/AddMemberToRole.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/AddMemberToRole.jsx
index bc9e8cf..cbb6df6 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/AddMemberToRole.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/AddMemberToRole.jsx
@@ -147,7 +147,7 @@ return (
     </div>
     <div className="mb-2">
       <Widget
-        src={`sking.near/widget/Common.Inputs.Select`}
+        src={`/*__@appAccount__*//widget/Common.Components.Select`}
         props={{
           label: "Role",
           noLabel: false,
@@ -189,7 +189,8 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+     
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Propose To Add Member",
           onClick: handleProposal,
@@ -199,7 +200,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/ApproveBudget.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/ApproveBudget.jsx
index 3252058..3d0443e 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/ApproveBudget.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/ApproveBudget.jsx
@@ -172,7 +172,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -182,7 +182,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/Dismiss.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/Dismiss.jsx
index 64aecfb..c68adc2 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/Dismiss.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/Dismiss.jsx
@@ -202,7 +202,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -212,7 +212,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/Dissolve.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/Dissolve.jsx
index 40ee35d..6b5dfb1 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/Dissolve.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/Dissolve.jsx
@@ -147,7 +147,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -157,7 +157,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/FunctionCall.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/FunctionCall.jsx
index 2906f60..e88fe5e 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/FunctionCall.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/FunctionCall.jsx
@@ -436,7 +436,7 @@ return (
             <div className="mb-3">
               <h5>Memo</h5>
               <Widget
-                src="sking.near/widget/Common.Inputs.Markdown"
+                src="/*__@appAccount__*//widget/Common.Components.Markdown"
                 props={{
                   value: state.memo,
                   onChange: (value) => onChangeMemo(value),
@@ -560,7 +560,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Propose Function Call",
           onClick: handleFunctionCall,
@@ -570,7 +570,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/FundingRequest.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/FundingRequest.jsx
index 8575e96..d23b19b 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/FundingRequest.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/FundingRequest.jsx
@@ -104,7 +104,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -114,7 +114,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/RemoveMemberFromRole.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/RemoveMemberFromRole.jsx
index f77a22e..31fd603 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/RemoveMemberFromRole.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/RemoveMemberFromRole.jsx
@@ -143,7 +143,7 @@ return (
     </div>
     <div className="mb-3">
       <Widget
-        src={`sking.near/widget/Common.Inputs.Select`}
+        src={`/*__@appAccount__*//widget/Common.Components.Select`}
         props={{
           label: "Role",
           noLabel: false,
@@ -184,7 +184,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Propose To Remove Member",
           onClick: handleProposal,
@@ -194,7 +194,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/Text.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/Text.jsx
index bdec0e9..2372a25 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/Text.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/Text.jsx
@@ -161,7 +161,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -171,7 +171,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/Transfer.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/Transfer.jsx
index da0085c..e5ff1b6 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/Transfer.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/Transfer.jsx
@@ -255,7 +255,7 @@ return (
     </div>
     <div className="mb-3">
       <Widget
-        src={`sking.near/widget/Common.Inputs.Select`}
+        src={`/*__@appAccount__*//widget/Common.Components.Select`}
         props={{
           label: "Token",
           noLabel: false,
@@ -306,7 +306,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Propose Transfer",
           onClick: handleProposal,
@@ -316,7 +316,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateBonds.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateBonds.jsx
index 03e56f8..d05fec2 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateBonds.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateBonds.jsx
@@ -166,7 +166,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -176,7 +176,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateVoteDuration.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateVoteDuration.jsx
index 9345dc3..1762810 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateVoteDuration.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/UpdateVoteDuration.jsx
@@ -205,7 +205,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -215,7 +215,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,
diff --git a/apps/astraplusplus/widget/DAO/Proposal/Create/Veto.jsx b/apps/astraplusplus/widget/DAO/Proposal/Create/Veto.jsx
index 24e4d80..89466c0 100644
--- a/apps/astraplusplus/widget/DAO/Proposal/Create/Veto.jsx
+++ b/apps/astraplusplus/widget/DAO/Proposal/Create/Veto.jsx
@@ -212,7 +212,7 @@ return (
     {state.error && <div className="text-danger">{state.error}</div>}
     <div className="ms-auto">
       <Widget
-        src="sking.near/widget/Common.Button"
+        src="/*__@appAccount__*//widget/Common.Components.Button"
         props={{
           children: "Create Proposal",
           onClick: handleProposal,
@@ -222,7 +222,7 @@ return (
       />
       {onClose && (
         <Widget
-          src="sking.near/widget/Common.Button"
+          src="/*__@appAccount__*//widget/Common.Components.Button"
           props={{
             children: "Close",
             onClick: onClose,