diff --git a/Assets/Scripts/Wallet/AccountManager.cs b/Assets/Scripts/Wallet/AccountManager.cs
index 9eb1538..c98eaaa 100644
--- a/Assets/Scripts/Wallet/AccountManager.cs
+++ b/Assets/Scripts/Wallet/AccountManager.cs
@@ -2057,7 +2057,8 @@ public void RefreshBalances(bool force, PlatformKind platforms = PlatformKind.No
 
                         case PlatformKind.Neo:
                         {
-                            var keys = NeoKeys.FromWIF(wif);
+                            ReportWalletBalance(platform, null);
+                            /*var keys = NeoKeys.FromWIF(wif);
 
                             var url = GetNeoscanAPIUrl($"get_balance/{keys.Address}");
 
@@ -2190,7 +2191,7 @@ public void RefreshBalances(bool force, PlatformKind platforms = PlatformKind.No
                                         }
                                     });
 
-                                }));
+                                }));*/
                         }
                             break;
 
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses.meta b/Assets/Scripts/Wallet/AccountManagerClasses.meta
new file mode 100644
index 0000000..c413779
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6f3a7e5b2fda445d99f5e91e2e5e9c59
+timeCreated: 1696405604
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs b/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs
new file mode 100644
index 0000000..e74fdc9
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Poltergeist
+{
+    public struct Account
+    {
+        public string name;
+        public PlatformKind platforms;
+        public string phaAddress;
+        public string neoAddress;
+        public string ethAddress;
+        public string WIF;
+        public bool passwordProtected;
+        public int passwordIterations;
+        public string salt;
+        public string iv;
+        public string password; // Not used after account upgrade to version 2.
+        public string misc;
+
+        public override string ToString()
+        {
+            return $"{name.ToUpper()} [{platforms}]";
+        }
+
+        public string GetWif(string passwordHash)
+        {
+            return String.IsNullOrEmpty(passwordHash) ? WIF : AccountManager.DecryptString(WIF, passwordHash, iv);
+        }
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs.meta
new file mode 100644
index 0000000..c50d844
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/Account.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55e4aae14f8e40989830659d80b6262f
+timeCreated: 1696405551
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs
new file mode 100644
index 0000000..10b6372
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs
@@ -0,0 +1,9 @@
+namespace Poltergeist
+{
+    public enum AccountFlags
+    {
+        None = 0x0,
+        Master = 0x1,
+        Validator = 0x2
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs.meta
new file mode 100644
index 0000000..4b00fbd
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlags.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 86c2a8d4b210490ba1b26257b14b65a9
+timeCreated: 1696405584
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs
new file mode 100644
index 0000000..a0f50a6
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using Phantasma.SDK;
+
+namespace Poltergeist
+{
+    public static class AccountFlagsExtensions
+    {
+        public static List<PlatformKind> Split(this PlatformKind kind)
+        {
+            var list = new List<PlatformKind>();
+            foreach (var platform in AccountManager.AvailablePlatforms)
+            {
+                if (kind.HasFlag(platform))
+                {
+                    list.Add(platform);
+                }
+            }
+            return list;
+        }
+
+        public static PlatformKind GetTransferTargets(this PlatformKind kind, Token token)
+        {
+            if (!token.IsSwappable())
+            {
+                return kind;
+            }
+
+            PlatformKind targets;
+
+            switch (kind)
+            {
+                case PlatformKind.Phantasma:
+                    targets = PlatformKind.Phantasma;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.Neo) ? PlatformKind.Neo : PlatformKind.None;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.Ethereum) ? PlatformKind.Ethereum : PlatformKind.None;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.BSC) ? PlatformKind.BSC : PlatformKind.None;
+                    return targets;
+
+                case PlatformKind.Neo:
+                    targets = PlatformKind.Neo;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.Phantasma) ? PlatformKind.Phantasma : PlatformKind.None;
+                    return targets;
+
+                case PlatformKind.Ethereum:
+                    targets = PlatformKind.Ethereum;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.Phantasma) ? PlatformKind.Phantasma : PlatformKind.None;
+                    return targets;
+
+                case PlatformKind.BSC:
+                    targets = PlatformKind.BSC;
+                    targets |= Tokens.HasSwappableToken(token.symbol, PlatformKind.Phantasma) ? PlatformKind.Phantasma : PlatformKind.None;
+                    return targets;
+
+                default:
+                    return PlatformKind.None;
+            }
+        }
+        public static bool ValidateTransferTarget(this PlatformKind kind, Token token, PlatformKind targetKind)
+        {
+            var targets = kind.GetTransferTargets(token);
+            return targets.HasFlag(targetKind);
+        }
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs.meta
new file mode 100644
index 0000000..fb973af
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountFlagsExtensions.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 51f0847db1e940bfb7baa44cc7a4b3c1
+timeCreated: 1696405683
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs b/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs
new file mode 100644
index 0000000..0ca596b
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs
@@ -0,0 +1,19 @@
+namespace Poltergeist
+{
+    public struct AccountLegacyV1
+    {
+        public static readonly int MinPasswordLength = 6;
+        public static readonly int MaxPasswordLength = 32;
+
+        public string name;
+        public PlatformKind platforms;
+        public string WIF;
+        public string password;
+        public string misc;
+
+        public override string ToString()
+        {
+            return $"{name.ToUpper()} [{platforms}]";
+        }
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs.meta
new file mode 100644
index 0000000..e3ab622
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountLegacyV1.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 16fbc0d82622431b8f0b66fd8bda592e
+timeCreated: 1696405562
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs b/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs
new file mode 100644
index 0000000..1c3bd66
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using Phantasma.Core.Types;
+using Phantasma.SDK;
+
+namespace Poltergeist
+{
+    public class AccountState
+    {
+        public PlatformKind platform;
+        public string name;
+        public string address;
+        public Balance[] balances;
+        public AccountFlags flags;
+        public Timestamp stakeTime;
+
+        public Archive[] archives;
+        public string avatarData;
+        public uint availableStorage;
+        public uint usedStorage;
+        public uint totalStorage => availableStorage + usedStorage;
+
+        public Dictionary<string, string> dappTokens = new Dictionary<string, string>();
+
+        public decimal GetAvailableAmount(string symbol)
+        {
+            for (int i = 0; i < balances.Length; i++)
+            {
+                var entry = balances[i];
+                if (entry.Symbol == symbol)
+                {
+                    return entry.Available;
+                }
+            }
+
+            return 0;
+        }
+
+        public void RegisterDappToken(string dapp, string token)
+        {
+            dappTokens[dapp] = token;
+        }
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs.meta
new file mode 100644
index 0000000..303527c
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountState.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a017eeb7b939479db336d200a0b9fc25
+timeCreated: 1696405636
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs b/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs
new file mode 100644
index 0000000..569fd13
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs
@@ -0,0 +1,13 @@
+namespace Poltergeist
+{
+    public struct AccountsExport
+    {
+        public string walletIdentifier;
+        public int accountsVersion;
+        public string accounts;
+        public bool passwordProtected;
+        public int passwordIterations;
+        public string salt;
+        public string iv;
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs.meta
new file mode 100644
index 0000000..1c935fd
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/AccountsExport.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8951add525a146ca98be6ecb9f400ffc
+timeCreated: 1696405568
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/Balance.cs b/Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs
similarity index 96%
rename from Assets/Scripts/Wallet/Balance.cs
rename to Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs
index 1120f89..00a56ef 100644
--- a/Assets/Scripts/Wallet/Balance.cs
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs
@@ -1,20 +1,20 @@
-namespace Poltergeist
-{
-    public class Balance
-    {
-        public string Symbol;
-        public decimal Available;
-        public decimal Staked;
-        public decimal Pending;
-        public decimal Claimable;
-        public string Chain;
-        public int Decimals;
-        public bool Burnable;
-        public bool Fungible;
-        public string PendingPlatform;
-        public string PendingHash;
-        public string[] Ids;
-
-        public decimal Total => Available + Staked + Pending + Claimable;
-    }
-}
\ No newline at end of file
+namespace Poltergeist
+{
+    public class Balance
+    {
+        public string Symbol;
+        public decimal Available;
+        public decimal Staked;
+        public decimal Pending;
+        public decimal Claimable;
+        public string Chain;
+        public int Decimals;
+        public bool Burnable;
+        public bool Fungible;
+        public string PendingPlatform;
+        public string PendingHash;
+        public string[] Ids;
+
+        public decimal Total => Available + Staked + Pending + Claimable;
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs.meta
new file mode 100644
index 0000000..f3a7ec6
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/Balance.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ceaf8239e15c49eba78116d43b744e1f
+timeCreated: 1696405658
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/HistoryEntry.cs b/Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs
similarity index 93%
rename from Assets/Scripts/Wallet/HistoryEntry.cs
rename to Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs
index cfeeb97..f585322 100644
--- a/Assets/Scripts/Wallet/HistoryEntry.cs
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs
@@ -1,11 +1,11 @@
-using System;
-
-namespace Poltergeist
-{
-    public struct HistoryEntry
-    {
-        public string hash;
-        public DateTime date;
-        public string url;
-    }
-}
\ No newline at end of file
+using System;
+
+namespace Poltergeist
+{
+    public struct HistoryEntry
+    {
+        public string hash;
+        public DateTime date;
+        public string url;
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs.meta
new file mode 100644
index 0000000..4f3f4ea
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/HistoryEntry.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0f6ace58c8674cff973b955cce922102
+timeCreated: 1696405577
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs b/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs
new file mode 100644
index 0000000..b129937
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Poltergeist
+{
+    [Flags]
+    public enum PlatformKind
+    {
+        None = 0x0,
+        Phantasma = 0x1,
+        Neo = 0x2,
+        Ethereum = 0x4,
+        BSC = 0x8,
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs.meta
new file mode 100644
index 0000000..eeb8171
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/PlatformKind.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ed93623151c34a7691532a855e67d7ea
+timeCreated: 1696405533
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/RefreshStatus.cs b/Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs
similarity index 96%
rename from Assets/Scripts/Wallet/RefreshStatus.cs
rename to Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs
index f92eed5..ff5a40a 100644
--- a/Assets/Scripts/Wallet/RefreshStatus.cs
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs
@@ -1,20 +1,20 @@
-using System;
-
-namespace Poltergeist
-{
-    public class RefreshStatus
-    {
-        // Balance
-        public bool BalanceRefreshing;
-        public DateTime LastBalanceRefresh;
-        public Action BalanceRefreshCallback;
-        // History
-        public bool HistoryRefreshing;
-        public DateTime LastHistoryRefresh;
-
-        public override string ToString()
-        {
-            return $"BalanceRefreshing: {BalanceRefreshing}, LastBalanceRefresh: {LastBalanceRefresh}, HistoryRefreshing: {HistoryRefreshing}, LastHistoryRefresh: {LastHistoryRefresh}";
-        }
-    }
-}
\ No newline at end of file
+using System;
+
+namespace Poltergeist
+{
+    public class RefreshStatus
+    {
+        // Balance
+        public bool BalanceRefreshing;
+        public DateTime LastBalanceRefresh;
+        public Action BalanceRefreshCallback;
+        // History
+        public bool HistoryRefreshing;
+        public DateTime LastHistoryRefresh;
+
+        public override string ToString()
+        {
+            return $"BalanceRefreshing: {BalanceRefreshing}, LastBalanceRefresh: {LastBalanceRefresh}, HistoryRefreshing: {HistoryRefreshing}, LastHistoryRefresh: {LastHistoryRefresh}";
+        }
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs.meta
new file mode 100644
index 0000000..d069874
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/RefreshStatus.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 46281b7c16534ef39e840eb857488d6b
+timeCreated: 1696405668
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/TransferRequest.cs b/Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs
similarity index 95%
rename from Assets/Scripts/Wallet/TransferRequest.cs
rename to Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs
index 0606e6d..20faea3 100644
--- a/Assets/Scripts/Wallet/TransferRequest.cs
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs
@@ -1,11 +1,11 @@
-namespace Poltergeist
-{
-    public struct TransferRequest
-    {
-        public PlatformKind platform;
-        public string destination;
-        public string symbol;
-        public decimal amount;
-        public string interop;
-    }
-}
\ No newline at end of file
+namespace Poltergeist
+{
+    public struct TransferRequest
+    {
+        public PlatformKind platform;
+        public string destination;
+        public string symbol;
+        public decimal amount;
+        public string interop;
+    }
+}
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs.meta
new file mode 100644
index 0000000..b95b2fd
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/TransferRequest.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 52a21ed4485e460d87aeccd341399029
+timeCreated: 1696405628
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/WalletState.cs b/Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs
similarity index 91%
rename from Assets/Scripts/Wallet/WalletState.cs
rename to Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs
index b2374ab..1abd116 100644
--- a/Assets/Scripts/Wallet/WalletState.cs
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs
@@ -1,9 +1,10 @@
-namespace Poltergeist
-{
-    public enum WalletState
-    {
-        Refreshing,
-        Ready,
-        Error
-    }
-}
+
+namespace Poltergeist
+{
+    public enum WalletState
+    {
+        Refreshing,
+        Ready,
+        Error
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs.meta b/Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs.meta
new file mode 100644
index 0000000..0f0b4f6
--- /dev/null
+++ b/Assets/Scripts/Wallet/AccountManagerClasses/WalletState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ab595f2b89c74988b8c7fc9532011c25
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Wallet/Balance.cs.meta b/Assets/Scripts/Wallet/Balance.cs.meta
deleted file mode 100644
index d08c746..0000000
--- a/Assets/Scripts/Wallet/Balance.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d4e0570b7c994fa18130e7df3fafdc8d
-timeCreated: 1689236507
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/Cache.cs b/Assets/Scripts/Wallet/Cache.cs
index 4db195d..6b9c228 100644
--- a/Assets/Scripts/Wallet/Cache.cs
+++ b/Assets/Scripts/Wallet/Cache.cs
@@ -11,6 +11,7 @@ public enum FileType
         JSON,
         PNG
     }
+    
     private static string FolderPath;
     private static string ImageFolderPath;
     private static string FilePath;
diff --git a/Assets/Scripts/Wallet/HistoryEntry.cs.meta b/Assets/Scripts/Wallet/HistoryEntry.cs.meta
deleted file mode 100644
index ebbad79..0000000
--- a/Assets/Scripts/Wallet/HistoryEntry.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 66aec8859b4143ad9af88d4b549c0192
-timeCreated: 1689236506
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/RefreshStatus.cs.meta b/Assets/Scripts/Wallet/RefreshStatus.cs.meta
deleted file mode 100644
index b1428ac..0000000
--- a/Assets/Scripts/Wallet/RefreshStatus.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3b66de3165d14b3499546cc67da18906
-timeCreated: 1689236507
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/Settings.cs b/Assets/Scripts/Wallet/Settings.cs
index 301c8b3..afa05bb 100644
--- a/Assets/Scripts/Wallet/Settings.cs
+++ b/Assets/Scripts/Wallet/Settings.cs
@@ -396,15 +396,15 @@ public string GetDefaultValue(string tag)
                     switch (nexusKind)
                     {
                         case NexusKind.Main_Net:
-                            _return_value = "http://pharpc1.phantasma.io:7077/rpc";
+                            _return_value = "https://pharpc1.phantasma.io/rpc";
                             break;
 
                         case NexusKind.Test_Net:
-                            _return_value = "http://testnet.phantasma.io:5101/rpc";
+                            _return_value = "https://testnet.phantasma.io/rpc";
                             break;
 
                         case NexusKind.Mankini_Test_Net:
-                            _return_value = "http://mankinitest.phantasma.io:7077/rpc";
+                            _return_value = "https://mankinitest.phantasma.io/rpc";
                             break;
 
                         case NexusKind.Local_Net:
@@ -412,7 +412,7 @@ public string GetDefaultValue(string tag)
                             break;
 
                         default:
-                            _return_value = "http://pharpc1.phantasma.io:7077/rpc";
+                            _return_value = "https://pharpc1.phantasma.io/rpc";
                             break;
                     }
                     break;
diff --git a/Assets/Scripts/Wallet/TransferRequest.cs.meta b/Assets/Scripts/Wallet/TransferRequest.cs.meta
deleted file mode 100644
index 461f730..0000000
--- a/Assets/Scripts/Wallet/TransferRequest.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 42eb70e8389d4ef09b9cca6b3a1a1f6c
-timeCreated: 1689236507
\ No newline at end of file
diff --git a/Assets/Scripts/Wallet/WalletState.cs.meta b/Assets/Scripts/Wallet/WalletState.cs.meta
deleted file mode 100644
index 8cca900..0000000
--- a/Assets/Scripts/Wallet/WalletState.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: ab595f2b89c74988b8c7fc9532011c25
-timeCreated: 1689236483
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 9648740..94579de 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -133,6 +133,12 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
+  m_SupportedAspectRatios:
+    4:3: 1
+    5:4: 1
+    16:10: 1
+    16:9: 1
+    Others: 1
   bundleVersion: 2.8.7
   preloadedAssets: []
   metroInputSource: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index e7e2f19..49431cf 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.4f1
-m_EditorVersionWithRevision: 2022.3.4f1 (35713cd46cd7)
+m_EditorVersion: 2022.3.7f1
+m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)
\ No newline at end of file