From d7d2fec5368b7dfa627c1d2011a21e5caf15c5d1 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:57:18 +0800
Subject: [PATCH 1/8] ui: extract PledgerSkin common visual components and
 refactor WalletWindow

---
 src/Decentralized/PledgerSkin.cs  | 255 ++++++++++++++++++++++++++++++
 src/Decentralized/WalletWindow.cs |  79 ++-------
 2 files changed, 265 insertions(+), 69 deletions(-)
 create mode 100644 src/Decentralized/PledgerSkin.cs

diff --git a/src/Decentralized/PledgerSkin.cs b/src/Decentralized/PledgerSkin.cs
new file mode 100644
index 0000000..bbcfd01
--- /dev/null
+++ b/src/Decentralized/PledgerSkin.cs
@@ -0,0 +1,255 @@
+using System;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Decentralized
+{
+    /// <summary>
+    /// PLEDGER 硬件风格公共皮肤与组件：
+    /// - 机身：自画像素九宫格 ui_hw_shell（圆角石墨，左上受光边、右下背光边），3× 像素放大
+    /// - 刻字：游戏 machinery 窗口的标题栏与分隔线设为透明；标题当机身刻字（灰色粗体、字距 18、居中）
+    /// - 屏幕：黑色边框 ui_hw_bezel 包一块浅色墨水屏 ui_hw_paper（#D8DAD0），左右对称居中
+    /// - 文字：深墨色 Ink，次要信息灰 _dim，警示暗红 _note
+    /// - 按钮：黑底白字触控键 Key / KeyText；选中的项反色（白底黑框黑字加粗）加准星角标 ui_hw_sel，不用 [方括号]
+    /// - 数据表：列右对齐，整行可点，选中行整行反色（黑底白字）
+    /// - 滚动区：背景透明露出墨水屏底色，滚动条滑块为墨色
+    /// </summary>
+    public static class PledgerSkin
+    {
+        public static readonly Color Ink = new Color(0.12f, 0.12f, 0.14f);
+        public static readonly Color Key = new Color(0.16f, 0.16f, 0.19f);
+        public static readonly Color KeyText = new Color(0.93f, 0.93f, 0.90f);
+        public static readonly Color Dim = new Color(0.38f, 0.39f, 0.40f);
+        public static readonly Color Alert = new Color(0.62f, 0.16f, 0.12f);
+        public static readonly Color Title = new Color(0.62f, 0.64f, 0.70f);
+        public static readonly Color Paper = new Color(0.847f, 0.855f, 0.816f); // #D8DAD0
+        public static readonly Color RowNormal = new Color(0f, 0f, 0f, 0.04f);
+        public static readonly Color Transparent = new Color(0f, 0f, 0f, 0f);
+        public static readonly Color Separator = new Color(0.12f, 0.12f, 0.14f, 0.18f);
+
+        private static readonly Dictionary<string, Sprite> Sliced = new Dictionary<string, Sprite>();
+
+        /// <summary>把本 mod 的像素图做成九宫格贴到 Image 上：边角 border 像素不拉伸，一个像素放大成 3 个界面单位。</summary>
+        public static void Slice(Image img, string key, int border)
+        {
+            var src = Items.ModSprite(key);
+            if (img == null || src == null) return;
+            if (!Sliced.TryGetValue(key, out var sp))
+            {
+                src.texture.filterMode = FilterMode.Point;
+                sp = Sprite.Create(src.texture, src.rect, new Vector2(0.5f, 0.5f), src.pixelsPerUnit, 0, SpriteMeshType.FullRect, new Vector4(border, border, border, border));
+                Sliced[key] = sp;
+            }
+            img.sprite = sp;
+            img.type = Image.Type.Sliced;
+            img.pixelsPerUnitMultiplier = 100f / (3f * sp.pixelsPerUnit);
+            img.color = Color.white;
+        }
+
+        /// <summary>屏上的选择按钮（币种、档位、子页）：选中的一个画成白底黑框黑字、四角带准星角标。</summary>
+        public static void Pick(CustomUIBuilder b, string text, bool selected, Action onClick, ICollection<GameObject> picked)
+        {
+            b.AddButton(text, onClick);
+            if (selected && picked != null) picked.Add(b.Last.root);
+        }
+
+        /// <summary>数据表行定义：整行高亮与点击回调。</summary>
+        public sealed class RowDef
+        {
+            public GameObject Root;
+            public Image Image;
+            public bool Selected;
+            public Action OnClick;
+        }
+
+        /// <summary>数据表的一行：列右对齐（第一列默认左对齐），整行可点击，选中行反色。</summary>
+        public static void TableRow(CustomUIBuilder b, float totalW, float height, float[] widths, TextAnchor[] aligns, string[] texts, bool selected, Action onClick, ICollection<RowDef> rows, ICollection<Image> clear)
+        {
+            b.BeginPanel(totalW, height, TextAnchor.MiddleLeft, 6f, 0f);
+            var root = b.Last.root;
+            var img = b.Last.image;
+            if (rows != null) rows.Add(new RowDef { Root = root, Image = img, Selected = selected, OnClick = onClick });
+            b.BeginRow(0f, TextAnchor.MiddleLeft);
+            for (int i = 0; i < widths.Length; i++)
+            {
+                float w = widths[i];
+                var align = (aligns != null && i < aligns.Length) ? aligns[i] : (i == 0 ? TextAnchor.MiddleLeft : TextAnchor.MiddleRight);
+                b.BeginPanel(w, height - 6f, align, 0f, 0f);
+                if (clear != null) clear.Add(b.Last.image);
+                b.AddLabel(i < texts.Length ? texts[i] : "");
+                b.End();
+            }
+            b.End();
+            b.End();
+        }
+
+        /// <summary>数据表表头：与表行同对齐方式，加粗，无底色。</summary>
+        public static void TableHeader(CustomUIBuilder b, float totalW, float height, float[] widths, TextAnchor[] aligns, string[] headers, ICollection<Image> clear)
+        {
+            b.BeginPanel(totalW, height, TextAnchor.MiddleLeft, 6f, 0f);
+            if (clear != null) clear.Add(b.Last.image);
+            b.BeginRow(0f, TextAnchor.MiddleLeft);
+            for (int i = 0; i < widths.Length; i++)
+            {
+                float w = widths[i];
+                var align = (aligns != null && i < aligns.Length) ? aligns[i] : (i == 0 ? TextAnchor.MiddleLeft : TextAnchor.MiddleRight);
+                b.BeginPanel(w, height - 6f, align, 0f, 0f);
+                if (clear != null) clear.Add(b.Last.image);
+                b.AddLabel(i < headers.Length ? "<b>" + headers[i] + "</b>" : "");
+                b.End();
+            }
+            b.End();
+            b.End();
+        }
+
+        /// <summary>应用整套 PLEDGER 皮肤：机身、边框、墨水屏、刻字、文字颜色、触控键、滚动条与数据表行。</summary>
+        public static void Apply(CustomUIWindow win, RectTransform screen, Image bezel, Image paper, ICollection<GameObject> picked, ICollection<Image> clear, IEnumerable<RowDef> rows = null)
+        {
+            if (win?.root == null) return;
+            Slice(win.root.GetComponent<Image>(), "ui_hw_shell", 10);
+            if (bezel != null) Slice(bezel, "ui_hw_bezel", 5);
+            if (paper != null) Slice(paper, "ui_hw_paper", 3);
+
+            // 标题栏和分隔线透明，标题当机身刻字
+            foreach (var name in new[] { "header", "rule" })
+            {
+                var img = win.root.transform.Find(name)?.GetComponent<Image>();
+                if (img != null) img.color = Transparent;
+            }
+            if (win.frame?.titleText != null)
+            {
+                var t = win.frame.titleText;
+                t.color = Title;
+                t.fontStyle = FontStyles.Bold;
+                t.characterSpacing = 18f;
+                t.fontSize = 16f;
+                t.horizontalAlignment = HorizontalAlignmentOptions.Center;
+            }
+            var content = win.frame?.contentRoot?.GetComponent<VerticalLayoutGroup>();
+            if (content != null) content.childAlignment = TextAnchor.UpperCenter;
+
+            if (screen == null) return;
+
+            // 收集所有表格行 root，避免按钮样式覆盖整行
+            var rowRoots = new HashSet<GameObject>();
+            if (rows != null)
+            {
+                foreach (var r in rows)
+                    if (r?.Root != null) rowRoots.Add(r.Root);
+            }
+
+            // 屏上文字：note 暗红，dim 灰，其余深墨色
+            foreach (var t in screen.GetComponentsInChildren<TextMeshProUGUI>(true))
+            {
+                if (t.GetComponentInParent<Button>() != null || t.GetComponentInParent<TMP_InputField>() != null) continue;
+                t.color = t.gameObject.name.Contains("_note") ? Alert : t.gameObject.name.Contains("_dim") ? Dim : Ink;
+            }
+
+            // 屏上输入框
+            foreach (var inp in screen.GetComponentsInChildren<TMP_InputField>(true))
+            {
+                if (inp.textComponent != null) inp.textComponent.color = Ink;
+                if (inp.placeholder is TextMeshProUGUI ph) ph.color = Dim;
+            }
+
+            // 分隔线：墨水屏上为淡墨色细线
+            foreach (var img in screen.GetComponentsInChildren<Image>(true))
+            {
+                if (img.gameObject.name.Contains("separator"))
+                {
+                    img.sprite = MachineryStyle.White;
+                    img.color = Separator;
+                }
+            }
+
+            // 屏上普通按钮与选择按钮
+            foreach (var btn in screen.GetComponentsInChildren<Button>(true))
+            {
+                if (rowRoots.Contains(btn.gameObject)) continue;
+                bool on = picked != null && picked.Contains(btn.gameObject);
+                var img = btn.GetComponent<Image>();
+                if (img != null)
+                {
+                    if (on)
+                    {
+                        Slice(img, "ui_hw_sel", 5);
+                        btn.transition = Selectable.Transition.None;
+                    }
+                    else
+                    {
+                        img.color = Key;
+                    }
+                }
+                foreach (var t in btn.GetComponentsInChildren<TextMeshProUGUI>(true))
+                {
+                    t.color = on ? Ink : KeyText;
+                    if (on) t.fontStyle |= FontStyles.Bold;
+                }
+            }
+
+            // 滚动视图：背景全透明露出墨水屏底色，滑块墨色
+            foreach (var scroll in screen.GetComponentsInChildren<ScrollRect>(true))
+            {
+                var bg = scroll.GetComponent<Image>();
+                if (bg != null) bg.color = Transparent;
+                if (scroll.viewport != null)
+                {
+                    var vpImg = scroll.viewport.GetComponent<Image>();
+                    if (vpImg != null) vpImg.color = Transparent;
+                }
+                if (scroll.verticalScrollbar != null)
+                {
+                    var sb = scroll.verticalScrollbar;
+                    var track = sb.GetComponent<Image>();
+                    if (track != null) track.color = Transparent;
+                    if (sb.handleRect != null)
+                    {
+                        var handleImg = sb.handleRect.GetComponent<Image>();
+                        if (handleImg != null)
+                        {
+                            handleImg.sprite = MachineryStyle.White;
+                            handleImg.color = Ink;
+                        }
+                    }
+                }
+            }
+
+            // 清理辅助 Panel 底图
+            if (clear != null)
+            {
+                foreach (var img in clear)
+                    if (img != null) img.color = Transparent;
+            }
+
+            // 数据表行：反色高亮与整行点击
+            if (rows != null)
+            {
+                foreach (var r in rows)
+                {
+                    if (r?.Root == null || r.Image == null) continue;
+                    r.Image.sprite = MachineryStyle.White;
+                    r.Image.type = Image.Type.Simple;
+                    r.Image.raycastTarget = true;
+                    r.Image.color = r.Selected ? Ink : RowNormal;
+                    foreach (var t in r.Root.GetComponentsInChildren<TextMeshProUGUI>(true))
+                    {
+                        // 避免修改行内子按钮的文字颜色
+                        var pBtn = t.GetComponentInParent<Button>();
+                        if (pBtn != null && pBtn.gameObject != r.Root) continue;
+                        t.color = r.Selected ? KeyText : Ink;
+                    }
+                    if (r.OnClick != null)
+                    {
+                        var btn = r.Root.GetComponent<Button>() ?? r.Root.AddComponent<Button>();
+                        btn.transition = Selectable.Transition.None;
+                        btn.onClick.RemoveAllListeners();
+                        var act = r.OnClick;
+                        btn.onClick.AddListener(() => act());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Decentralized/WalletWindow.cs b/src/Decentralized/WalletWindow.cs
index 7be3c74..5050e8e 100644
--- a/src/Decentralized/WalletWindow.cs
+++ b/src/Decentralized/WalletWindow.cs
@@ -89,9 +89,6 @@ namespace Decentralized
             return t.ToArray();
         }
 
-        private static readonly Color Ink = new Color(0.12f, 0.12f, 0.14f),
-            Key = new Color(0.16f, 0.16f, 0.19f), KeyText = new Color(0.93f, 0.93f, 0.90f),
-            Dim = new Color(0.38f, 0.39f, 0.40f), Alert = new Color(0.62f, 0.16f, 0.12f);
 
         public static string NameOf(Wallet w)
         {
@@ -190,83 +187,27 @@ namespace Decentralized
         private static void Skin(CustomUIWindow win, RectTransform screen, Image bezel, Image paper, Image plate, GameObject ok, Device dev)
         {
             if (win?.root == null) return;
-            Slice(win.root.GetComponent<Image>(), "ui_hw_shell", 10);
-            Slice(bezel, "ui_hw_bezel", 5);
-            Slice(paper, "ui_hw_paper", 3);
-            // 标题栏和分隔线透明，标题当作机身上的刻字
-            foreach (var name in new[] { "header", "rule" })
+            var rows = _rows.Select(x => new PledgerSkin.RowDef
             {
-                var img = win.root.transform.Find(name)?.GetComponent<Image>();
-                if (img != null) img.color = new Color(0, 0, 0, 0);
-            }
-            if (win.frame?.titleText != null)
-            {
-                var t = win.frame.titleText;
-                t.color = new Color(0.62f, 0.64f, 0.70f); t.fontStyle = FontStyles.Bold; t.characterSpacing = 18f; t.fontSize = 16f; t.horizontalAlignment = HorizontalAlignmentOptions.Center;
-            }
-            var content = win.frame?.contentRoot?.GetComponent<VerticalLayoutGroup>();
-            if (content != null) content.childAlignment = TextAnchor.UpperCenter;
-            if (plate != null) plate.color = new Color(0, 0, 0, 0);
-            foreach (var t in screen.GetComponentsInChildren<TextMeshProUGUI>(true))
-            {
-                if (t.GetComponentInParent<Button>() != null || t.GetComponentInParent<TMP_InputField>() != null) continue;
-                t.color = t.gameObject.name.Contains("_note") ? Alert : t.gameObject.name.Contains("_dim") ? Dim : Ink;
-            }
-            foreach (var btn in screen.GetComponentsInChildren<Button>(true))
-            {
-                var img = btn.GetComponent<Image>();
-                bool on = _picked.Contains(btn.gameObject);
-                if (img != null) { if (on) Slice(img, "ui_hw_sel", 5); else img.color = Key; }
-                foreach (var t in btn.GetComponentsInChildren<TextMeshProUGUI>(true)) { t.color = on ? Ink : KeyText; if (on) t.fontStyle |= FontStyles.Bold; }
-            }
-            foreach (var img in _clear) if (img != null) img.color = new Color(0, 0, 0, 0);
-            // 余额行：整行可点，选中的一行反色高亮
-            foreach (var (root, img, asset) in _rows)
-            {
-                if (root == null || img == null) continue;
-                bool on = asset == dev.Asset;
-                img.sprite = MachineryStyle.White; img.type = Image.Type.Simple; img.raycastTarget = true;
-                img.color = on ? Ink : new Color(0, 0, 0, 0.04f);
-                foreach (var t in root.GetComponentsInChildren<TextMeshProUGUI>(true)) t.color = on ? KeyText : Ink;
-                var btn = root.GetComponent<Button>() ?? root.AddComponent<Button>();
-                btn.transition = Selectable.Transition.None;
-                btn.onClick.RemoveAllListeners();
-                string a = asset;
-                btn.onClick.AddListener(() => { dev.Asset = a; dev.Note = null; Open(dev); });
-            }
+                Root = x.root,
+                Image = x.image,
+                Selected = (x.asset == dev.Asset),
+                OnClick = () => { dev.Asset = x.asset; dev.Note = null; Open(dev); }
+            });
+            PledgerSkin.Apply(win, screen, bezel, paper, _picked, _clear, rows);
+            if (plate != null) plate.color = PledgerSkin.Transparent;
             // 签名要按住 ✓：在按键上挂一个按住计时
             if (ok != null && dev.Screen == Screen.Review && ok.GetComponent<HoldToSign>() == null) ok.AddComponent<HoldToSign>().Device = dev.Address;
         }
 
-        /// <summary>把本 mod 的像素图做成九宫格贴到 Image 上：边角 border 像素不拉伸，一个像素放大成 3 个界面单位。</summary>
-        private static void Slice(Image img, string key, int border)
-        {
-            var src = Items.ModSprite(key);
-            if (img == null || src == null) return;
-            if (!Sliced.TryGetValue(key, out var sp))
-            {
-                src.texture.filterMode = FilterMode.Point;
-                sp = Sprite.Create(src.texture, src.rect, new Vector2(0.5f, 0.5f), src.pixelsPerUnit, 0, SpriteMeshType.FullRect, new Vector4(border, border, border, border));
-                Sliced[key] = sp;
-            }
-            img.sprite = sp;
-            img.type = Image.Type.Sliced;
-            img.pixelsPerUnitMultiplier = 100f / (3f * sp.pixelsPerUnit);
-            img.color = Color.white;
-        }
-
-        private static readonly Dictionary<string, Sprite> Sliced = new Dictionary<string, Sprite>();
         private const float RowW = ScreenW - 28f;
         private static readonly List<(GameObject root, Image image, string asset)> _rows = new List<(GameObject, Image, string)>();
         private static readonly List<Image> _clear = new List<Image>();
         private static readonly List<GameObject> _picked = new List<GameObject>();
 
         /// <summary>屏上的选择按钮（币种、手续费档位）：选中的一个画成白底黑框黑字、四角带准星角标。</summary>
-        private static void Pick(CustomUIBuilder b, string text, bool selected, Action onClick)
-        {
-            b.AddButton(text, onClick);
-            if (selected) _picked.Add(b.Last.root);
-        }
+        private static void Pick(CustomUIBuilder b, string text, bool selected, Action onClick) =>
+            PledgerSkin.Pick(b, text, selected, onClick, _picked);
 
         public static string Amt(double v) => v.ToString(v >= 100 ? "0.##" : "0.####", CultureInfo.InvariantCulture);
 

From 6926f994fd0077c6bd2307d61893e080042af0e2 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:59:03 +0800
Subject: [PATCH 2/8] ui: reskin terminal window shell, navigation tabs, and
 home page

---
 src/Decentralized/CandleChart.cs    | 15 +++--
 src/Decentralized/TerminalWindow.cs | 88 +++++++++++++++++++++--------
 2 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/src/Decentralized/CandleChart.cs b/src/Decentralized/CandleChart.cs
index a76086e..e6fcb04 100644
--- a/src/Decentralized/CandleChart.cs
+++ b/src/Decentralized/CandleChart.cs
@@ -212,17 +212,20 @@ namespace Decentralized
             }
         }
 
-        /// <summary>把一个币的图放进界面：说明一行、图、图例一行。</summary>
+        /// <summary>把一个币的图放进界面：说明一行、黑框包裹的图、图例一行。</summary>
         public static void Add(CustomUIBuilder b, string key, string asset, double threshold = 0)
         {
             var all = Session.Data.Candles.Of(asset);
-            b.AddLabel(Caption(asset, all));
+            b.AddLabel(Caption(asset, all), "chart_caption_dim");
+            b.BeginPanel(W * Scale + 4f, H * Scale + 4f, TextAnchor.MiddleCenter, 2f, 0f, "chart_bezel");
+            PledgerSkin.Slice(b.Last.image, "ui_hw_bezel", 5);
             b.AddImage(Render(key, all, threshold), W * Scale, H * Scale);
-            b.AddLabel(L.T(threshold > 0 ? "chart.legend.thr" : "chart.legend"));
+            b.End();
+            b.AddLabel(L.T(threshold > 0 ? "chart.legend.thr" : "chart.legend"), "chart_legend_dim");
         }
 
-        /// <summary>带币种切换的图：上面一排币种按钮（选中的加方括号），切换后重画。</summary>
-        public static void AddPicker(CustomUIBuilder b, string key, string fallback, Action refresh)
+        /// <summary>带币种切换的图：上面一排币种按钮（选中项带准星角标），切换后重画。</summary>
+        public static void AddPicker(CustomUIBuilder b, string key, string fallback, Action refresh, ICollection<GameObject> picked = null)
         {
             var list = ChartAssets.Where(a => a != Assets.Ponero || Unlock.BlackUnlocked).ToList();
             if (!Picked.TryGetValue(key, out var cur) || !list.Contains(cur)) cur = fallback;
@@ -230,7 +233,7 @@ namespace Decentralized
             foreach (var a in list)
             {
                 string asset = a;
-                b.AddButton(asset == cur ? "[" + asset + "]" : asset, () => { Picked[key] = asset; refresh(); });
+                PledgerSkin.Pick(b, asset, asset == cur, () => { Picked[key] = asset; refresh(); }, picked);
             }
             b.End();
             Add(b, key, cur);
diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 5544089..f7dacb7 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.UI;
 using Decentralized.Domain;
 
 namespace Decentralized
@@ -13,6 +15,8 @@ namespace Decentralized
     public static class TerminalWindow
     {
         public const string Id = "pd_terminal";
+        private const float WinW = 828f, WinH = 680f, ScreenW = 768f, ScreenH = 578f, Bezel = 6f;
+        private const float LeftW = 420f, RightW = 310f;
         private enum Page { Home, Bank, Poinbase, Web3, Wallets }
 
         private static Page _page = Page.Home;
@@ -22,22 +26,34 @@ namespace Decentralized
         private static string _amount = "";
         private static string _message;
 
+        private static readonly List<GameObject> _picked = new List<GameObject>();
+        private static readonly List<Image> _clear = new List<Image>();
+        private static readonly List<PledgerSkin.RowDef> _rows = new List<PledgerSkin.RowDef>();
+
         public static void Open()
         {
             if (Session.Data == null) return;
             var b = CustomUIManager.Window(Id, L.T("term.title"));
             if (b == null) return;
-            b.SetSize(780, 660).SetDraggable(true).SetCloseOnEscape(true).UseMachineryStyle();
-            b.BeginRow();
+            _picked.Clear(); _clear.Clear(); _rows.Clear();
+            b.SetSize(WinW, WinH).SetDraggable(true).SetCloseOnEscape(true).UseMachineryStyle();
+            // 黑色外边框包裹墨水屏
+            b.BeginPanel(ScreenW + Bezel * 2, ScreenH + Bezel * 2, TextAnchor.MiddleCenter, Bezel + 3f, 0f);
+            var bezel = b.Last.image;
+            b.BeginPanel(ScreenW, ScreenH, TextAnchor.UpperLeft, 12f, 4f);
+            var screen = b.CurrentContainer;
+            var paper = b.Last.image;
+            b.BeginRow(4f, TextAnchor.MiddleLeft);
             foreach (Page p in Enum.GetValues(typeof(Page)))
             {
                 var page = p;
                 string name = L.T("tab." + p.ToString().ToLowerInvariant());
-                b.AddButton(page == _page ? $"[{name}]" : name, () => { _page = page; _message = null; _edit = null; Open(); });
+                PledgerSkin.Pick(b, name, page == _page, () => { _page = page; _message = null; _edit = null; Open(); }, _picked);
             }
             b.End();
             b.AddSeparator();
-            b.BeginScroll(540);
+            b.BeginScroll(ScreenH - 52f);
+            _clear.Add(b.Last.image);
             switch (_page)
             {
                 case Page.Home: HomePage(b); break;
@@ -48,8 +64,11 @@ namespace Decentralized
                 default: break;
             }
             b.End();
-            if (!string.IsNullOrEmpty(_message)) b.AddLabel(_message);
-            b.Show();
+            if (!string.IsNullOrEmpty(_message)) b.AddLabel(_message, "term_note");
+            b.End();
+            b.End();
+            var win = b.Show();
+            Log.Guard("交易终端外观", () => PledgerSkin.Apply(win, screen, bezel, paper, _picked, _clear, _rows));
         }
 
         private static void Go(Page p) { _page = p; _message = null; _edit = null; Open(); }
@@ -63,11 +82,14 @@ namespace Decentralized
 
         private static void Entry(CustomUIBuilder b, string icon, string name, string line1, string line2, Page target)
         {
-            b.BeginPanel(220f, 250f, TextAnchor.UpperCenter, 10f, 6f);
+            b.BeginPanel(230f, 250f, TextAnchor.UpperCenter, 10f, 6f);
+            var cardImg = b.Last.image;
+            cardImg.sprite = MachineryStyle.White;
+            cardImg.color = PledgerSkin.RowNormal;
             b.AddImage(ModInfo.Id + ":" + icon, 96f, 96f);
             b.AddHeader(name);
             b.AddLabel(line1);
-            if (line2 != null) b.AddLabel(line2);
+            if (line2 != null) b.AddLabel(line2, "entry_l2_dim");
             b.AddFlexibleSpace();
             b.AddButton(L.T("home.enter"), () => Go(target));
             b.End();
@@ -87,40 +109,61 @@ namespace Decentralized
             b.AddSpace(8f);
             b.AddSeparator();
             var r = d.LastNight;
-            b.AddLabel(r == null ? L.T("report.none") : L.T("home.lastnight", r.Day, Fmt.Num(r.Mined), r.PoweredRigs, r.Rigs));
+            b.AddLabel(r == null ? L.T("report.none") : L.T("home.lastnight", r.Day, Fmt.Num(r.Mined), r.PoweredRigs, r.Rigs), "report_dim");
         }
 
-        private const float LeftW = 430f, RightW = 300f;
-
-        private static void Cell(CustomUIBuilder b, float w, string text, bool header = false)
+        private static void Cell(CustomUIBuilder b, float w, string text, bool header = false, TextAnchor align = TextAnchor.MiddleLeft)
         {
-            b.BeginPanel(w, 30f, TextAnchor.MiddleLeft, 6f, 0f);
+            b.BeginPanel(w, 26f, align, 0f, 0f);
+            _clear.Add(b.Last.image);
             b.AddLabel(header ? "<b>" + text + "</b>" : text);
             b.End();
         }
 
-        private static void TableRow(CustomUIBuilder b, float[] widths, params string[] cells)
+        private static void TableRow(CustomUIBuilder b, float totalW, float[] widths, TextAnchor[] aligns, string[] cells, bool selected = false, Action onClick = null)
         {
-            b.BeginRow(2f);
-            for (int i = 0; i < widths.Length; i++) Cell(b, widths[i], i < cells.Length ? cells[i] : "");
+            b.BeginPanel(totalW, 28f, TextAnchor.MiddleLeft, 4f, 0f);
+            _rows.Add(new PledgerSkin.RowDef { Root = b.Last.root, Image = b.Last.image, Selected = selected, OnClick = onClick });
+            b.BeginRow(0f, TextAnchor.MiddleLeft);
+            for (int i = 0; i < widths.Length; i++)
+            {
+                var align = (aligns != null && i < aligns.Length) ? aligns[i] : (i == 0 ? TextAnchor.MiddleLeft : TextAnchor.MiddleRight);
+                Cell(b, widths[i], i < cells.Length ? cells[i] : "", false, align);
+            }
+            b.End();
             b.End();
         }
 
-        private static void TableHeader(CustomUIBuilder b, float[] widths, params string[] cells)
+        private static void TableRow(CustomUIBuilder b, float[] widths, params string[] cells) =>
+            TableRow(b, widths.Sum() + 8f, widths, null, cells, false, null);
+
+        private static void TableHeader(CustomUIBuilder b, float totalW, float[] widths, TextAnchor[] aligns, params string[] cells)
         {
-            b.BeginRow(2f);
-            for (int i = 0; i < widths.Length; i++) Cell(b, widths[i], cells[i], true);
+            b.BeginPanel(totalW, 26f, TextAnchor.MiddleLeft, 4f, 0f);
+            _clear.Add(b.Last.image);
+            b.BeginRow(0f, TextAnchor.MiddleLeft);
+            for (int i = 0; i < widths.Length; i++)
+            {
+                var align = (aligns != null && i < aligns.Length) ? aligns[i] : (i == 0 ? TextAnchor.MiddleLeft : TextAnchor.MiddleRight);
+                Cell(b, widths[i], i < cells.Length ? cells[i] : "", true, align);
+            }
+            b.End();
             b.End();
         }
 
+        private static void TableHeader(CustomUIBuilder b, float[] widths, params string[] cells) =>
+            TableHeader(b, widths.Sum() + 8f, widths, null, cells);
+
         /// <summary>左右分栏：左边是账户与持仓表格，右边是操作区。</summary>
         private static void Columns(CustomUIBuilder b, Action<CustomUIBuilder> left, Action<CustomUIBuilder> right)
         {
             b.BeginRow(10f);
-            b.BeginPanel(LeftW, -1f, TextAnchor.UpperLeft, 8f, 4f);
+            b.BeginPanel(LeftW, -1f, TextAnchor.UpperLeft, 4f, 4f);
+            _clear.Add(b.Last.image);
             left(b);
             b.End();
-            b.BeginPanel(RightW, -1f, TextAnchor.UpperLeft, 8f, 6f);
+            b.BeginPanel(RightW, -1f, TextAnchor.UpperLeft, 4f, 6f);
+            _clear.Add(b.Last.image);
             right(b);
             b.End();
             b.End();
@@ -129,7 +172,8 @@ namespace Decentralized
         private static void AmountRow(CustomUIBuilder b)
         {
             b.AddLabel(L.T("trade.amount"));
-            b.BeginPanel(RightW - 30f, -1f, TextAnchor.MiddleCenter, 0f, 0f);   // 给输入框一个固定宽度，容得下大额数字
+            b.BeginPanel(RightW - 30f, -1f, TextAnchor.MiddleCenter, 0f, 0f);
+            _clear.Add(b.Last.image);
             b.AddInput("0", _amount, s => _amount = s, "amount", s => _amount = s);
             b.End();
         }

From 37c5362913494390b194840a3a06b73b68efef85 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:59:45 +0800
Subject: [PATCH 3/8] ui: skin bank page with right-aligned table and touch ops

---
 src/Decentralized/TerminalWindow.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index f7dacb7..0776974 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -182,7 +182,7 @@ namespace Decentralized
         private static void BankPage(CustomUIBuilder b)
         {
             var ps = PlayerStore.Instance;
-            var w = new[] { 200f, 220f };
+            var w = new[] { 180f, 220f };
             Columns(b, l =>
             {
                 l.AddHeader(L.T("entry.bank"));
@@ -194,8 +194,11 @@ namespace Decentralized
                 r.AddHeader(L.T("bank.ops"));
                 AmountRow(r);
                 AmlPreview(r);
+                r.AddSpace(4f);
+                r.BeginRow(6f);
                 r.AddButton(L.T("trade.deposit"), Deposit);
                 r.AddButton(L.T("trade.withdraw"), Withdraw);
+                r.End();
             });
         }
 
@@ -207,17 +210,17 @@ namespace Decentralized
             double rent = Session.Rent();
             double recent = d.Exchange.History.Where(h => h.Key > day - Tuning.AmlWindowDays).Sum(h => h.Value);
             b.AddSeparator();
-            b.AddLabel(L.T("aml.window", Tuning.AmlWindowDays, Fmt.Credits(recent), Fmt.Credits(Tuning.AmlCumRents * rent)));
+            b.AddLabel(L.T("aml.window", Tuning.AmlWindowDays, Fmt.Credits(recent), Fmt.Credits(Tuning.AmlCumRents * rent)), "aml_dim");
             var pb = d.Poinbase;
             double total = pb.Value(Session.Price);
             double taintRatio = total > 0 ? pb.Taint / total : 0;
-            b.AddLabel(L.T("aml.taint", (int)Math.Round(taintRatio * 100)));
+            b.AddLabel(L.T("aml.taint", (int)Math.Round(taintRatio * 100)), taintRatio > 0.05 ? "aml_note" : "aml_dim");
             if (double.TryParse((_amount ?? "").Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out double v) && v > 0)
             {
                 double value = Math.Min(v, pb.Get(Assets.CRC)) * Session.Price(Assets.CRC);
                 double taint = total > 0 ? pb.Taint * Math.Min(1, value / total) : 0;
                 double chance = Exchange.HitChance(value, taint, recent, rent, pb.Flagged);
-                b.AddLabel(L.T("aml.chance", (int)Math.Round(chance * 100)));
+                b.AddLabel(L.T("aml.chance", (int)Math.Round(chance * 100)), chance > 0.1 ? "aml_chance_note" : "aml_chance_dim");
             }
         }
 

From 698849c112afa54c5209e04e8f3f0327e305a4f0 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 10:00:25 +0800
Subject: [PATCH 4/8] ui: skin wallets page with right-aligned list and action
 buttons

---
 src/Decentralized/TerminalWindow.cs | 33 ++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 0776974..061c0e7 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -960,29 +960,41 @@ namespace Decentralized
         private static void WalletsPage(CustomUIBuilder b)
         {
             var d = Session.Data;
-            b.AddLabel(L.T("wallets.count", d.Wallets.Count, Tuning.WalletMax));
+            b.AddLabel(L.T("wallets.count", d.Wallets.Count, Tuning.WalletMax), "wallets_count_dim");
             var cols = new[] { 100f, 110f, 85f, 70f, 375f };
-            TableHeader(b, cols, L.T("wallets.col.name"), L.T("wallets.col.addr"), L.T("col.value"), L.T("wallets.col.taint"), "");
+            var aligns = new[] { TextAnchor.MiddleLeft, TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleLeft };
+            TableHeader(b, 740f, cols, aligns, L.T("wallets.col.name"), L.T("wallets.col.addr"), L.T("col.value"), L.T("wallets.col.taint"), "");
             for (int i = 0; i < d.Wallets.Count; i++)
             {
                 var w = d.Wallets[i];
                 int idx = i;
-                b.BeginRow(2f);
-                Cell(b, cols[0], (idx == d.Current ? "● " : "") + WalletWindow.NameOf(w));
-                Cell(b, cols[1], w.Address);
-                Cell(b, cols[2], Fmt.Credits(w.Value(Session.Price)));
-                Cell(b, cols[3], Fmt.Credits(w.Taint));
-                b.BeginPanel(cols[4], 30f, TextAnchor.MiddleLeft, 2f, 0f);
-                b.BeginRow(4f);
+                bool isCurrent = idx == d.Current;
+                b.BeginPanel(740f, 32f, TextAnchor.MiddleLeft, 4f, 0f);
+                _rows.Add(new PledgerSkin.RowDef
+                {
+                    Root = b.Last.root,
+                    Image = b.Last.image,
+                    Selected = isCurrent,
+                    OnClick = () => { d.Current = idx; Session.Save(); Open(); }
+                });
+                b.BeginRow(0f, TextAnchor.MiddleLeft);
+                Cell(b, cols[0], (isCurrent ? "● " : "") + WalletWindow.NameOf(w), false, TextAnchor.MiddleLeft);
+                Cell(b, cols[1], w.Address, false, TextAnchor.MiddleLeft);
+                Cell(b, cols[2], Fmt.Credits(w.Value(Session.Price)), false, TextAnchor.MiddleRight);
+                Cell(b, cols[3], Fmt.Credits(w.Taint), false, TextAnchor.MiddleRight);
+                b.BeginPanel(cols[4], 28f, TextAnchor.MiddleLeft, 0f, 0f);
+                _clear.Add(b.Last.image);
+                b.BeginRow(4f, TextAnchor.MiddleLeft);
                 b.AddButton(L.T("wallets.open"), () => WalletWindow.Open(w));
                 b.AddButton(L.T("hw.copy"), () => { Clipboard.Copy(w.Address); _message = L.T("hw.copied.addr", w.Address); Open(); });
                 b.AddButton(L.T("wallets.rename"), () => { _renamePick = w.Address; _renameText = w.Label ?? ""; _message = null; Open(); });
                 if (idx != d.Current) b.AddButton(L.T("wallets.use"), () => { d.Current = idx; Session.Save(); Open(); });
-                else b.AddLabel(L.T("wallets.current"));
+                else b.AddLabel(L.T("wallets.current"), "wallets_cur_dim");
                 if (idx > 0) b.AddButton(_destroyPick == w.Address ? L.T("wallets.destroy.sure") : L.T("wallets.destroy"), () => DestroyWallet(w));
                 b.End();
                 b.End();
                 b.End();
+                b.End();
             }
             if (_renamePick != null) RenameRow(b);
         }
@@ -998,6 +1010,7 @@ namespace Decentralized
             b.BeginRow(8f, TextAnchor.MiddleLeft);
             b.AddLabel(L.T("wallets.rename.h", w.Address));
             b.BeginPanel(220f, -1f, TextAnchor.MiddleLeft, 0f, 0f);
+            _clear.Add(b.Last.image);
             b.AddInput(WalletWindow.NameOf(w), _renameText, s => _renameText = s, "rename", s => _renameText = s);
             b.End();
             b.AddButton(L.T("wallets.rename.ok"), () =>

From 68a53f60976cd4b4b17a6c2286cb95d83bbe7945 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 10:01:41 +0800
Subject: [PATCH 5/8] ui: skin poinbase spot and perp pages with crosshair
 pickers and right-aligned tables

---
 src/Decentralized/TerminalWindow.cs | 79 ++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 061c0e7..2eeec6a 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -251,7 +251,7 @@ namespace Decentralized
             {
                 var p = pool;
                 b.AddLabel(L.T("trade.pair", p.Base, p.Quote, L.T("venue." + p.Venue)) + "  " + L.T("trade.price", Fmt.Num(p.Price)));
-                b.BeginRow();
+                b.BeginRow(4f);
                 b.AddButton(L.T("trade.buy"), () => Trade(p, buy: true));
                 b.AddButton(L.T("trade.sell"), () => Trade(p, buy: false));
                 b.End();
@@ -259,19 +259,25 @@ namespace Decentralized
         }
 
         private static readonly float[] HoldW = { 80f, 100f, 110f, 110f };
+        private static readonly TextAnchor[] HoldAligns = { TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight };
 
         private static void Holdings(CustomUIBuilder b, Wallet w, Func<string, bool> show)
         {
-            TableHeader(b, HoldW, L.T("col.asset"), L.T("col.amount"), L.T("col.value"), L.T("col.avg"));
+            TableHeader(b, HoldW.Sum() + 8f, HoldW, HoldAligns, L.T("col.asset"), L.T("col.amount"), L.T("col.value"), L.T("col.avg"));
             bool any = false;
             foreach (var kv in w.Balances.OrderBy(k => k.Key).Where(k => show(k.Key)))
             {
                 any = true;
-                TableRow(b, HoldW, kv.Key, Fmt.Num(kv.Value), Fmt.Credits(kv.Value * Session.Price(kv.Key)), AvgText(w, kv.Key));
+                string asset = kv.Key;
+                bool selected = (_page == Page.Poinbase && asset == _poinAsset);
+                TableRow(b, HoldW.Sum() + 8f, HoldW, HoldAligns,
+                    new[] { kv.Key, Fmt.Num(kv.Value), Fmt.Credits(kv.Value * Session.Price(kv.Key)), AvgText(w, kv.Key) },
+                    selected,
+                    () => { if (_page == Page.Poinbase) { _poinAsset = asset; Open(); } });
             }
-            if (!any) b.AddLabel(L.T(w == Session.Data.Poinbase ? "poin.empty" : "wallet.empty"));
+            if (!any) b.AddLabel(L.T(w == Session.Data.Poinbase ? "poin.empty" : "wallet.empty"), "hold_empty_dim");
             foreach (var kv in w.Frozen.OrderBy(k => k.Key).Where(k => show(k.Key)))
-                b.AddLabel(L.T("wallet.frozen", kv.Key, Fmt.Num(kv.Value), w.FrozenUntil.TryGetValue(kv.Key, out var u) ? u : 0));
+                b.AddLabel(L.T("wallet.frozen", kv.Key, Fmt.Num(kv.Value), w.FrozenUntil.TryGetValue(kv.Key, out var u) ? u : 0), "hold_frozen_note");
         }
 
         /// <summary>Poinbase：合规交易所。左边账户持仓，右边交易；信用点的存取在银行。</summary>
@@ -282,25 +288,25 @@ namespace Decentralized
         {
             var d = Session.Data;
             var w = d.Poinbase;
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (PoinTab t in Enum.GetValues(typeof(PoinTab)))
             {
                 var tab = t;
                 string name = L.T("poin.sub." + t.ToString().ToLowerInvariant());
-                b.AddButton(tab == _poinTab ? $"[{name}]" : name, () => { _poinTab = tab; _message = null; Open(); });
+                PledgerSkin.Pick(b, name, tab == _poinTab, () => { _poinTab = tab; _message = null; Open(); }, _picked);
             }
             b.End();
             if (_poinTab == PoinTab.Perp) { PerpPage(b); return; }
             Columns(b, l =>
             {
-                CandleChart.AddPicker(l, "poin", Assets.PSC, Open);
+                CandleChart.AddPicker(l, "poin", Assets.PSC, Open, _picked);
                 l.AddSeparator();
                 l.AddHeader(L.T("poin.account.h"));
                 Holdings(l, w, a => true);
-                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)));
+                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)), "taint_note");
                 l.AddSeparator();
                 l.BeginRow(8f, TextAnchor.MiddleLeft);
-                l.AddLabel(L.T("poin.deposit", d.Address("poinbase")));
+                l.AddLabel(L.T("poin.deposit", d.Address("poinbase")), "deposit_dim");
                 l.AddButton(L.T("hw.copy"), () => { Clipboard.Copy(d.Address("poinbase")); _message = L.T("hw.copied.addr", d.Address("poinbase")); Open(); });
                 l.End();
             }, r =>
@@ -309,11 +315,11 @@ namespace Decentralized
                 AmountRow(r);
                 TradeRows(r, venue);
                 r.AddSeparator();
-                r.BeginRow();
+                r.BeginRow(4f);
                 foreach (var a in new[] { Assets.CRC, Assets.PSC })
                 {
                     var asset = a;
-                    r.AddButton(asset == _poinAsset ? $"[{asset}]" : asset, () => { _poinAsset = asset; Open(); });
+                    PledgerSkin.Pick(r, asset, asset == _poinAsset, () => { _poinAsset = asset; Open(); }, _picked);
                 }
                 r.End();
                 r.AddButton(L.T("poin.out", WalletWindow.NameOf(d.Hot)), PoinbaseOut);
@@ -326,6 +332,7 @@ namespace Decentralized
         private static bool _perpLong = true;
         private static int _perpLev = 3;
         private static readonly float[] PerpW = { 118f, 60f, 104f, 60f, 58f };
+        private static readonly TextAnchor[] PerpAligns = { TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight };
 
         private static double PerpSpot(string p) => p == "SPARK" ? Session.Data.Stable.Spark : Session.Data.Market.Price;
 
@@ -341,46 +348,56 @@ namespace Decentralized
             {
                 l.AddHeader(L.T("perp.h"));
                 l.AddLabel(L.T("perp.acct", Fmt.Num(acct.Avail(Assets.CRC))));
-                if (bk.Debt > 0) l.AddLabel(L.T("perp.debt", Fmt.Credits(bk.Debt), Math.Max(0, Tuning.PerpDebtDays - (day - bk.DebtSince))));
-                if (bk.Banned(day)) l.AddLabel(L.T("perp.banned", bk.BannedUntil - day + 1));
+                if (bk.Debt > 0) l.AddLabel(L.T("perp.debt", Fmt.Credits(bk.Debt), Math.Max(0, Tuning.PerpDebtDays - (day - bk.DebtSince))), "perp_debt_note");
+                if (bk.Banned(day)) l.AddLabel(L.T("perp.banned", bk.BannedUntil - day + 1), "perp_banned_note");
                 l.AddSeparator();
-                if (bk.Positions.Count == 0) l.AddLabel(L.T("perp.none"));
+                if (bk.Positions.Count == 0) l.AddLabel(L.T("perp.none"), "perp_none_dim");
                 else
                 {
-                    TableHeader(l, PerpW, L.T("perp.col.pos"), L.T("perp.col.notional"), L.T("perp.col.price"), L.T("perp.col.pnl"), L.T("perp.col.liq"));
+                    TableHeader(l, PerpW.Sum() + 8f, PerpW, PerpAligns, L.T("perp.col.pos"), L.T("perp.col.notional"), L.T("perp.col.price"), L.T("perp.col.pnl"), L.T("perp.col.liq"));
                     foreach (var p in bk.Positions)
                     {
-                        double spot = PerpSpot(p.Product);
-                        TableRow(l, PerpW, p.Product + " " + L.T(p.Long ? "perp.long" : "perp.short") + " " + Math.Round(p.Leverage, 1) + "×", Fmt.Credits(p.Notional(spot)),
-                            Fmt.Num(p.Entry) + " → " + Fmt.Num(spot), Fmt.Credits(p.Pnl(spot)), Fmt.Num(p.LiqPrice));
+                        var pos = p;
+                        double spot = PerpSpot(pos.Product);
+                        bool selPos = pos.Product == _perpProduct;
+                        TableRow(l, PerpW.Sum() + 8f, PerpW, PerpAligns,
+                            new[] {
+                                pos.Product + " " + L.T(pos.Long ? "perp.long" : "perp.short") + " " + Math.Round(pos.Leverage, 1) + "×",
+                                Fmt.Credits(pos.Notional(spot)),
+                                Fmt.Num(pos.Entry) + " → " + Fmt.Num(spot),
+                                Fmt.Credits(pos.Pnl(spot)),
+                                Fmt.Num(pos.LiqPrice)
+                            },
+                            selPos,
+                            () => { _perpProduct = pos.Product; Open(); });
                     }
                 }
                 l.AddSeparator();
                 foreach (var p in PerpBook.Products)
-                    l.AddLabel(L.T("perp.rate", p, Fmt.Num(PerpSpot(p)), (bk.Rate(p) * 100).ToString("+0.00;-0.00;0.00", CultureInfo.InvariantCulture)));
-                l.AddLabel(L.T("perp.fund", Fmt.Credits(bk.InsuranceFund)));
+                    l.AddLabel(L.T("perp.rate", p, Fmt.Num(PerpSpot(p)), (bk.Rate(p) * 100).ToString("+0.00;-0.00;0.00", CultureInfo.InvariantCulture)), "perp_rate_dim");
+                l.AddLabel(L.T("perp.fund", Fmt.Credits(bk.InsuranceFund)), "perp_fund_dim");
                 l.AddSeparator();
                 CandleChart.Add(l, "perp", _perpProduct);
             }, r =>
             {
                 r.AddHeader(L.T("perp.open"));
-                r.BeginRow();
+                r.BeginRow(4f);
                 foreach (var p in PerpBook.Products)
                 {
                     var product = p;
-                    r.AddButton(product == _perpProduct ? $"[{product}]" : product, () => { _perpProduct = product; Open(); });
+                    PledgerSkin.Pick(r, product, product == _perpProduct, () => { _perpProduct = product; Open(); }, _picked);
                 }
                 r.End();
-                r.BeginRow();
-                r.AddButton(_perpLong ? "[" + L.T("perp.long") + "]" : L.T("perp.long"), () => { _perpLong = true; Open(); });
-                r.AddButton(!_perpLong ? "[" + L.T("perp.short") + "]" : L.T("perp.short"), () => { _perpLong = false; Open(); });
+                r.BeginRow(4f);
+                PledgerSkin.Pick(r, L.T("perp.long"), _perpLong, () => { _perpLong = true; Open(); }, _picked);
+                PledgerSkin.Pick(r, L.T("perp.short"), !_perpLong, () => { _perpLong = false; Open(); }, _picked);
                 r.End();
-                r.BeginRow();
+                r.BeginRow(4f);
                 foreach (int lev in new[] { 1, 2, 3, 5 })
                 {
                     if (lev > PerpBook.MaxLeverage(_perpProduct)) continue;
                     int lv = lev;
-                    r.AddButton(lv == _perpLev ? $"[{lv}×]" : lv + "×", () => { _perpLev = lv; Open(); });
+                    PledgerSkin.Pick(r, lv + "×", lv == _perpLev, () => { _perpLev = lv; Open(); }, _picked);
                 }
                 r.End();
                 r.AddLabel(L.T("perp.margin"));
@@ -389,10 +406,10 @@ namespace Decentralized
                 {
                     double notional = m * _perpLev, spot = PerpSpot(_perpProduct), exec = bk.Exec(spot, notional, _perpLong, day);
                     var ghost = new PerpPosition { Long = _perpLong, Entry = exec, Size = notional / exec, Margin = m };
-                    r.AddLabel(L.T("perp.preview", Fmt.Credits(notional), Fmt.Num(exec)));
-                    r.AddLabel(L.T("perp.preview2", Fmt.Num(notional * Tuning.PerpFee), Fmt.Num(ghost.LiqPrice)));
+                    r.AddLabel(L.T("perp.preview", Fmt.Credits(notional), Fmt.Num(exec)), "perp_preview_dim");
+                    r.AddLabel(L.T("perp.preview2", Fmt.Num(notional * Tuning.PerpFee), Fmt.Num(ghost.LiqPrice)), "perp_preview_dim");
                 }
-                r.BeginRow();
+                r.BeginRow(6f);
                 r.AddButton(L.T("perp.do.open"), PerpOpen);
                 r.AddButton(L.T("perp.do.add"), PerpAdd);
                 r.AddButton(L.T("perp.do.close"), PerpClose);

From b217620d4023f4c31fba0aef5603fb6fbf19ed95 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 10:04:00 +0800
Subject: [PATCH 6/8] ui: skin web3 trade, stake and ponzi pages

---
 src/Decentralized/TerminalWindow.cs | 65 +++++++++++++++++------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 2eeec6a..4fc1036 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -418,6 +418,7 @@ namespace Decentralized
         }
 
         private static readonly float[] PoolW = { 128f, 50f, 64f, 64f, 50f, 60f };
+        private static readonly TextAnchor[] PoolAligns = { TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight };
 
         /// <summary>第三方收益池：日息、储备、时间锁、审计、我的存款，存入 / 取出（合约调用，签名）。是不是骗局看不见。</summary>
         private static void YieldPools(CustomUIBuilder l, Wallet w, int day)
@@ -425,18 +426,27 @@ namespace Decentralized
             var sc = Session.Data.Scams;
             var pools = sc.Pools.Where(p => !p.Closed || p.Pending.Any(q => ChainAddress.Same(q.Wallet, w.Address))).ToList();
             l.AddHeader(L.T("pool.h"));
-            if (pools.Count == 0) { l.AddLabel(L.T("pool.none")); return; }
-            TableHeader(l, PoolW, L.T("pool.col.name"), L.T("pool.col.rate"), L.T("pool.col.reserve"), L.T("pool.col.lock"), L.T("pool.col.audit"), L.T("pool.col.mine"));
+            if (pools.Count == 0) { l.AddLabel(L.T("pool.none"), "pool_none_dim"); return; }
+            TableHeader(l, PoolW.Sum() + 8f, PoolW, PoolAligns, L.T("pool.col.name"), L.T("pool.col.rate"), L.T("pool.col.reserve"), L.T("pool.col.lock"), L.T("pool.col.audit"), L.T("pool.col.mine"));
             foreach (var p in pools)
             {
                 var pp = p;
                 string mine = Fmt.Num(p.Of(w.Address)) + (p.Pending.Any(q => ChainAddress.Same(q.Wallet, w.Address)) ? "+" + L.T("pool.pending") : "");
-                TableRow(l, PoolW, p.Name + (p.Closed ? " " + L.T("pool.closed") : ""), (p.Rate * 100).ToString("0", CultureInfo.InvariantCulture) + "%", Fmt.Num(p.Reserve), L.T(p.Timelock ? "pool.yes" : "pool.no"), L.T(p.Audited ? "pool.yes" : "pool.no"), mine);
+                TableRow(l, PoolW.Sum() + 8f, PoolW, PoolAligns,
+                    new[] {
+                        p.Name + (p.Closed ? " " + L.T("pool.closed") : ""),
+                        (p.Rate * 100).ToString("0", CultureInfo.InvariantCulture) + "%",
+                        Fmt.Num(p.Reserve),
+                        L.T(p.Timelock ? "pool.yes" : "pool.no"),
+                        L.T(p.Audited ? "pool.yes" : "pool.no"),
+                        mine
+                    });
                 if (p.Closed) continue;
                 l.BeginRow(4f);
                 l.AddButton(L.T("pool.deposit"), () => PoolCall(pp, true));
                 if (p.Of(w.Address) > 0) l.AddButton(L.T(p.Timelock ? "pool.withdraw.lock" : "pool.withdraw", Tuning.YieldLockDays), () => PoolCall(pp, false));
                 l.End();
+                l.AddSpace(2f);
             }
         }
 
@@ -554,12 +564,12 @@ namespace Decentralized
         /// <summary>理财页：两个子页。"存钱"是 NPC 开的第三方收益池，你存进去吃利息（可能是骗局）；"自己发"是你当庄开高息理财（庞氏），下层的人往你这儿存。</summary>
         private static void YieldPage(CustomUIBuilder b)
         {
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (YieldTab t in Enum.GetValues(typeof(YieldTab)))
             {
                 var tab = t;
                 string name = L.T("yield.sub." + t.ToString().ToLowerInvariant());
-                b.AddButton(tab == _yieldTab ? $"[{name}]" : name, () => { _yieldTab = tab; _message = null; Open(); });
+                PledgerSkin.Pick(b, name, tab == _yieldTab, () => { _yieldTab = tab; _message = null; Open(); }, _picked);
             }
             b.End();
             if (_yieldTab == YieldTab.Mine) { PonziPage(b); return; }
@@ -599,9 +609,9 @@ namespace Decentralized
                     l.AddLabel(L.T("ponzi.interest", Fmt.Num(pz.Pool * pz.Rate)));
                     l.AddLabel(L.T("ponzi.own", Fmt.Num(pz.OwnPaid)));
                     double risk = Ponzi.ReportChance(pz.Rate, pz.Pool, day);
-                    l.AddLabel(L.T("ponzi.wind", L.T(risk < 0.05 ? "ponzi.wind.low" : risk < 0.10 ? "ponzi.wind.mid" : "ponzi.wind.high")));
+                    l.AddLabel(L.T("ponzi.wind", L.T(risk < 0.05 ? "ponzi.wind.low" : risk < 0.10 ? "ponzi.wind.mid" : "ponzi.wind.high")), risk >= 0.10 ? "ponzi_risk_note" : risk >= 0.05 ? "ponzi_risk_dim" : "ponzi_risk_ok");
                 }
-                else l.AddLabel(pz.Done ? L.T("ponzi.done") : day < Tuning.PonziMinDay ? L.T("ponzi.early", Tuning.PonziMinDay) : L.T("ponzi.idle"));
+                else l.AddLabel(pz.Done ? L.T("ponzi.done") : day < Tuning.PonziMinDay ? L.T("ponzi.early", Tuning.PonziMinDay) : L.T("ponzi.idle"), "ponzi_status_dim");
             }, r =>
             {
                 if (pz.Open)
@@ -636,15 +646,15 @@ namespace Decentralized
                 }
                 if (pz.Done || day < Tuning.PonziMinDay) return;
                 r.AddHeader(L.T("ponzi.open"));
-                r.BeginRow();
+                r.BeginRow(4f);
                 foreach (double rate in Tuning.PonziRates)
                 {
                     double rt = rate;
                     string t = (rate * 100).ToString("0", CultureInfo.InvariantCulture) + "%";
-                    r.AddButton(Math.Abs(rt - _ponziRate) < 1e-9 ? "[" + t + "]" : t, () => { _ponziRate = rt; Open(); });
+                    PledgerSkin.Pick(r, t, Math.Abs(rt - _ponziRate) < 1e-9, () => { _ponziRate = rt; Open(); }, _picked);
                 }
                 r.End();
-                r.AddLabel(L.T("ponzi.ad", Fmt.Num(Tuning.PonziAdCost)));
+                r.AddLabel(L.T("ponzi.ad", Fmt.Num(Tuning.PonziAdCost)), "ponzi_ad_dim");
                 r.AddButton(L.T("ponzi.start"), () =>
                 {
                     if (d.Hot.Avail(Assets.CRC) + 1e-9 < Tuning.PonziAdCost) { _message = L.T("ponzi.err"); Open(); return; }
@@ -1085,13 +1095,13 @@ namespace Decentralized
                 if (_web3Tab == Web3Tab.Mixer && !Unlock.MixerUnlocked) _web3Tab = Web3Tab.Trade;
                 if (_web3Tab == Web3Tab.Black && !Unlock.BlackUnlocked) _web3Tab = Web3Tab.Trade;
                 if (_web3Tab == Web3Tab.Predict && !PredictGame.Available(StoreStation.GetDayCounter())) _web3Tab = Web3Tab.Trade;
-                b.BeginRow();
+                b.BeginRow(4f);
                 foreach (Web3Tab t in Enum.GetValues(typeof(Web3Tab)))
                 {
                     if ((t == Web3Tab.Mixer && !Unlock.MixerUnlocked) || (t == Web3Tab.Black && !Unlock.BlackUnlocked) || (t == Web3Tab.Predict && !PredictGame.Available(StoreStation.GetDayCounter()))) continue;
                     var tab = t;
                     string name = L.T("web3.sub." + t.ToString().ToLowerInvariant());
-                    b.AddButton(tab == _web3Tab ? $"[{name}]" : name, () => { _web3Tab = tab; _message = null; _edit = null; Open(); });
+                    PledgerSkin.Pick(b, name, tab == _web3Tab, () => { _web3Tab = tab; _message = null; _edit = null; Open(); }, _picked);
                 }
                 b.End();
                 if (_web3Tab == Web3Tab.Stake) { StakePage(b); return; }
@@ -1108,10 +1118,10 @@ namespace Decentralized
                 Holdings(l, w, a => true);
                 l.AddSeparator();
                 l.AddLabel(L.T("wallet.total", Fmt.Credits(w.Value(Session.Price))));
-                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)));
+                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)), "taint_note");
                 StableTable(l);
                 l.AddSeparator();
-                CandleChart.AddPicker(l, "web3", Assets.PSC, Open);
+                CandleChart.AddPicker(l, "web3", Assets.PSC, Open, _picked);
             }, r =>
             {
                 r.AddHeader(L.T("trade.h"));
@@ -1528,15 +1538,15 @@ namespace Decentralized
             int day = StoreStation.GetDayCounter();
             r.AddSeparator();
             r.AddLabel(L.T("black.desk.pair", Fmt.Num(Session.Price(Assets.Ponero))));
-            r.AddLabel(L.T("black.desk.left", Fmt.Credits(d.Black.DeskLeft(day)), Fmt.Credits(Tuning.PoneroDailyCap)));
-            r.BeginRow();
+            r.AddLabel(L.T("black.desk.left", Fmt.Credits(d.Black.DeskLeft(day)), Fmt.Credits(Tuning.PoneroDailyCap)), "desk_left_dim");
+            r.BeginRow(4f);
             foreach (var a in new[] { Assets.PSC, Assets.CRT, Assets.CRA })
             {
                 var asset = a;
-                r.AddButton(asset == _deskAsset ? $"[{asset}]" : asset, () => { _deskAsset = asset; Open(); });
+                PledgerSkin.Pick(r, asset, asset == _deskAsset, () => { _deskAsset = asset; Open(); }, _picked);
             }
             r.End();
-            r.BeginRow();
+            r.BeginRow(6f);
             r.AddButton(L.T("black.desk.in"), () => { _deskIn = true; Swap(); });
             r.AddButton(L.T("black.desk.out"), () => { _deskIn = false; Swap(); });
             r.End();
@@ -1638,6 +1648,7 @@ namespace Decentralized
         }
 
         private static readonly float[] StakeW = { 110f, 90f, 200f };
+        private static readonly TextAnchor[] StakeAligns = { TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight };
 
         /// <summary>质押页：革命军 CRA 质押池（日息、解锁排队）和平衡代币 SPARK 的铸销。都是合约调用，要在钱包上签名。</summary>
         private static void StakePage(CustomUIBuilder b)
@@ -1649,18 +1660,19 @@ namespace Decentralized
             Columns(b, l =>
             {
                 l.AddHeader(L.T("stake.h"));
-                l.AddLabel(L.T("stake.rate", (st.CraRate * 100).ToString("0.0", CultureInfo.InvariantCulture), Tuning.CraUnlockDays) + (st.CraSubsidyLow ? "　" + L.T("stake.low") : ""));
+                l.AddLabel(L.T("stake.rate", (st.CraRate * 100).ToString("0.0", CultureInfo.InvariantCulture), Tuning.CraUnlockDays) + (st.CraSubsidyLow ? "　" + L.T("stake.low") : ""), st.CraSubsidyLow ? "stake_low_note" : "stake_rate_dim");
                 l.AddLabel(L.T("stake.cra", Fmt.Num(st.Cra), StableStatus(st, Assets.CRA, day)));
                 l.AddSeparator();
-                if (d.Staking.Lots.Count == 0) l.AddLabel(L.T("stake.none"));
+                if (d.Staking.Lots.Count == 0) l.AddLabel(L.T("stake.none"), "stake_none_dim");
                 else
                 {
-                    TableHeader(l, StakeW, L.T("stake.col.wallet"), L.T("stake.col.amount"), L.T("stake.col.queue"));
+                    TableHeader(l, StakeW.Sum() + 8f, StakeW, StakeAligns, L.T("stake.col.wallet"), L.T("stake.col.amount"), L.T("stake.col.queue"));
                     foreach (var lot in d.Staking.Lots)
                     {
                         var ow = d.Own(lot.Wallet);
                         string queue = lot.Unlocking.Count == 0 ? "—" : string.Join(" ", lot.Unlocking.Select(u => Fmt.Num(u.Value) + L.T("stake.day", u.Key)));
-                        TableRow(l, StakeW, ow != null ? WalletWindow.NameOf(ow) : lot.Wallet, Fmt.Num(lot.Amount), queue);
+                        TableRow(l, StakeW.Sum() + 8f, StakeW, StakeAligns,
+                            new[] { ow != null ? WalletWindow.NameOf(ow) : lot.Wallet, Fmt.Num(lot.Amount), queue });
                     }
                 }
                 l.AddSeparator();
@@ -1668,16 +1680,17 @@ namespace Decentralized
             }, r =>
             {
                 r.AddHeader(L.T("stake.ops", WalletWindow.NameOf(w)));
-                r.AddLabel(L.T("stake.avail", Fmt.Num(w.Avail(Assets.CRA)), Fmt.Num(d.Staking.Of(w.Address)?.Amount ?? 0)));
-                r.AddLabel(L.T("stake.avail2", Fmt.Num(w.Avail(Assets.SPARK))));
+                r.AddLabel(L.T("stake.avail", Fmt.Num(w.Avail(Assets.CRA)), Fmt.Num(d.Staking.Of(w.Address)?.Amount ?? 0)), "stake_avail_dim");
+                r.AddLabel(L.T("stake.avail2", Fmt.Num(w.Avail(Assets.SPARK))), "stake_avail2_dim");
                 AmountRow(r);
-                r.BeginRow();
+                r.AddSpace(4f);
+                r.BeginRow(6f);
                 r.AddButton(L.T("stake.do"), () => StakeCall(true));
                 r.AddButton(L.T("stake.undo"), () => StakeCall(false));
                 r.End();
                 r.AddSeparator();
                 r.AddHeader(L.T("spark.h"));
-                r.BeginRow();
+                r.BeginRow(6f);
                 r.AddButton(L.T("spark.mint"), () => SparkCall(true));
                 r.AddButton(L.T("spark.burn"), () => SparkCall(false));
                 r.End();

From 96be937daa1cea3a6ab30f638c593b2aa40dc363 Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 10:06:07 +0800
Subject: [PATCH 7/8] ui: skin web3 airdrop, predict, intel and mixer pages

---
 src/Decentralized/TerminalWindow.cs | 86 +++++++++++++++--------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 4fc1036..671d176 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -492,23 +492,25 @@ namespace Decentralized
             {
                 l.AddHeader(L.T("air.h"));
                 var list = d.Scams.Airdrops.Where(a => !a.Claimed && a.Expire >= day).ToList();
-                if (list.Count == 0) l.AddLabel(L.T("air.none"));
+                if (list.Count == 0) l.AddLabel(L.T("air.none"), "air_none_dim");
                 foreach (var a in list)
                 {
                     var ad = a;
                     l.AddLabel(L.T("air.row", a.Name, Fmt.Num(a.Reward), ApproveText(a.Approve, a.Asset), a.Expire));
                     l.AddButton(L.T("air.claim"), () => ClaimAirdrop(ad));
+                    l.AddSpace(4f);
                 }
             }, r =>
             {
                 r.AddHeader(L.T("air.approvals", WalletWindow.NameOf(w)));
                 var aps = d.Scams.Approvals.Where(x => ChainAddress.Same(x.Wallet, w.Address)).ToList();
-                if (aps.Count == 0) r.AddLabel(L.T("air.approvals.none"));
+                if (aps.Count == 0) r.AddLabel(L.T("air.approvals.none"), "air_app_none_dim");
                 foreach (var ap in aps)
                 {
                     int id = ap.Id;
                     r.AddLabel(L.T("air.approval", ap.Spender, ApproveText(ap.Limit, ap.Asset)));
                     r.AddButton(L.T("air.revoke"), () => RevokeApproval(id));
+                    r.AddSpace(4f);
                 }
             });
         }
@@ -688,12 +690,12 @@ namespace Decentralized
             if (_predTab == PredTab.Intel && !Unlock.BlackUnlocked) _predTab = PredTab.Markets;
             if (Unlock.BlackUnlocked)
             {
-                b.BeginRow();
+                b.BeginRow(4f);
                 foreach (PredTab t in Enum.GetValues(typeof(PredTab)))
                 {
                     var tab = t;
                     string name = L.T("predict.tab." + t.ToString().ToLowerInvariant());
-                    b.AddButton(tab == _predTab ? $"[{name}]" : name, () => { _predTab = tab; _message = null; Open(); });
+                    PledgerSkin.Pick(b, name, tab == _predTab, () => { _predTab = tab; _message = null; Open(); }, _picked);
                 }
                 b.End();
             }
@@ -712,31 +714,31 @@ namespace Decentralized
                 l.AddSeparator();
                 // 选中 PSC 价格盘时，在列表上方画日 K 和阈值线
                 if (sel != null && sel.Kind == PredictKind.Price) { CandleChart.Add(l, "predict", Assets.PSC, sel.Param); l.AddSeparator(); }
-                if (open.Count == 0) l.AddLabel(L.T("predict.none"));
+                if (open.Count == 0) l.AddLabel(L.T("predict.none"), "pred_none_dim");
                 foreach (var m in open)
                 {
                     var mk = m;
                     var all = bk.PosAll(m.Id);
                     string q = PredictGame.Question(m);
                     l.BeginRow(4f);
-                    l.AddButton(m.Id == _predPick ? "[" + q + "]" : q, () => { _predPick = mk.Id; _message = null; Open(); });
+                    PledgerSkin.Pick(l, q, m.Id == _predPick, () => { _predPick = mk.Id; _message = null; Open(); }, _picked);
                     l.End();
                     string state = m.IsOpen(day) ? "" : "　" + L.T("predict.closed");
                     string move = m.PrevP >= 0 && Math.Abs(m.PYes - m.PrevP) >= 0.02 ? L.T("predict.row.move", P2(m.PrevP), m.PYes > m.PrevP ? "↑" : "↓") : "";
-                    l.AddLabel(L.T("predict.row", P2(m.PYes), P2(1 - m.PYes)) + move + (all.Count > 0 ? "　" + L.T("predict.held", L.T(all[0].Yes ? "predict.yes" : "predict.no"), Fmt.Num(all.Sum(x => x.Shares)), Fmt.Num(all.Sum(x => x.Cost))) : "") + state);
+                    l.AddLabel(L.T("predict.row", P2(m.PYes), P2(1 - m.PYes)) + move + (all.Count > 0 ? "　" + L.T("predict.held", L.T(all[0].Yes ? "predict.yes" : "predict.no"), Fmt.Num(all.Sum(x => x.Shares)), Fmt.Num(all.Sum(x => x.Cost))) : "") + state, "pred_row_dim");
                 }
                 if (bk.Stats.Count > 0)
                 {
                     l.AddSeparator();
                     l.AddLabel(L.T("predict.stats.h"));
                     foreach (var kv in bk.Stats.OrderByDescending(k => k.Value.Count))
-                        l.AddLabel(L.T("predict.stats.row", L.T("predict.kind." + kv.Key), kv.Value.Count, P2(kv.Value.AvgP0), (kv.Value.HitRate * 100).ToString("0", CultureInfo.InvariantCulture)));
+                        l.AddLabel(L.T("predict.stats.row", L.T("predict.kind." + kv.Key), kv.Value.Count, P2(kv.Value.AvgP0), (kv.Value.HitRate * 100).ToString("0", CultureInfo.InvariantCulture)), "pred_stat_dim");
                 }
                 if (bk.Recent.Count > 0)
                 {
                     l.AddSeparator();
                     foreach (var r in Enumerable.Reverse(bk.Recent))
-                        l.AddLabel(L.T("predict.result", r.Day, r.Title, r.Outcome == 2 ? L.T("predict.void") : L.T(r.Outcome == 1 ? "predict.yes" : "predict.no"), r.Held ? (r.Pnl >= 0 ? "+" : "") + Fmt.Num(r.Pnl) : "—"));
+                        l.AddLabel(L.T("predict.result", r.Day, r.Title, r.Outcome == 2 ? L.T("predict.void") : L.T(r.Outcome == 1 ? "predict.yes" : "predict.no"), r.Held ? (r.Pnl >= 0 ? "+" : "") + Fmt.Num(r.Pnl) : "—"), "pred_res_dim");
                 }
             }, r =>
             {
@@ -744,32 +746,33 @@ namespace Decentralized
                 r.AddHeader(L.T("predict.pick"));
                 r.AddLabel(PredictGame.Question(sel));
                 r.AddLabel(L.T("predict.price", P2(sel.PYes), P2(1 - sel.PYes)));
-                foreach (var clue in PredictGame.Clues(sel)) r.AddLabel("· " + clue);
+                foreach (var clue in PredictGame.Clues(sel)) r.AddLabel("· " + clue, "pred_clue_dim");
                 foreach (var pos in bk.PosAll(sel.Id))
                 {
                     var ow = d.Own(pos.Wallet);
                     r.AddLabel(L.T("predict.pos", ow != null ? WalletWindow.NameOf(ow) : pos.Wallet, L.T(pos.Yes ? "predict.yes" : "predict.no"), Fmt.Num(pos.Shares)));
                     if (pos.Wallet == w.Address)
                     {
-                        r.AddLabel(L.T("predict.pos3", P2(pos.Cost / pos.Shares), P2(sel.PriceOf(pos.Yes))));
-                        r.AddLabel(L.T("predict.pos2", Fmt.Num(pos.Cost), Fmt.Num(pos.Shares)));
-                        r.AddLabel(L.T("predict.pos4", Fmt.Num(sel.SellValue(pos.Yes, pos.Shares) * (1 - Tuning.PredictFee))));
+                        r.AddLabel(L.T("predict.pos3", P2(pos.Cost / pos.Shares), P2(sel.PriceOf(pos.Yes))), "pred_pos_dim");
+                        r.AddLabel(L.T("predict.pos2", Fmt.Num(pos.Cost), Fmt.Num(pos.Shares)), "pred_pos_dim");
+                        r.AddLabel(L.T("predict.pos4", Fmt.Num(sel.SellValue(pos.Yes, pos.Shares) * (1 - Tuning.PredictFee))), "pred_pos_dim");
                     }
                 }
-                if (!sel.IsOpen(day)) { r.AddLabel(L.T("predict.closed.note")); return; }
+                if (!sel.IsOpen(day)) { r.AddLabel(L.T("predict.closed.note"), "pred_closed_note"); return; }
                 AmountRow(r);
                 if (double.TryParse((_amount ?? "").Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out double v) && v > 0 && v < 1e7)
                 {
                     foreach (bool yes in new[] { true, false })
                     {
                         double shares = sel.SharesFor(yes, v / (1 + Tuning.PredictFee));
-                        r.AddLabel(L.T("predict.preview", L.T(yes ? "predict.yes" : "predict.no"), Fmt.Num(shares), P2(v / shares), Fmt.Num(shares - v)));
+                        r.AddLabel(L.T("predict.preview", L.T(yes ? "predict.yes" : "predict.no"), Fmt.Num(shares), P2(v / shares), Fmt.Num(shares - v)), "pred_prev_dim");
                     }
                 }
-                r.BeginRow();
+                r.BeginRow(6f);
                 r.AddButton(L.T("predict.buy.yes"), () => PredictBuy(sel, true));
                 r.AddButton(L.T("predict.buy.no"), () => PredictBuy(sel, false));
                 r.End();
+                r.AddSpace(4f);
                 r.AddButton(L.T("predict.sell"), () => PredictSell(sel));
             });
         }
@@ -783,33 +786,35 @@ namespace Decentralized
             Columns(b, l =>
             {
                 l.AddHeader(L.T("intel.h"));
-                if (!PredictGame.BrokerOpen) { l.AddLabel(L.T("intel.locked", Tuning.IntelRep)); return; }
+                if (!PredictGame.BrokerOpen) { l.AddLabel(L.T("intel.locked", Tuning.IntelRep), "intel_locked_note"); return; }
                 l.AddLabel(L.T("predict.acct.crt", WalletWindow.NameOf(w), Fmt.Num(w.Avail(Assets.CRT))));
                 l.AddButton(L.T("intel.brief.buy", Fmt.Num(Tuning.IntelBriefPrice)), IntelBuyBrief);
                 l.AddSeparator();
-                if (d.Brief.Count == 0) l.AddLabel(L.T("intel.brief.none"));
+                if (d.Brief.Count == 0) l.AddLabel(L.T("intel.brief.none"), "intel_brief_dim");
                 else
                 {
-                    l.AddLabel(L.T("intel.brief.day", d.BriefDay));
-                    foreach (var line in d.Brief) l.AddLabel(line);
+                    l.AddLabel(L.T("intel.brief.day", d.BriefDay), "intel_day_dim");
+                    foreach (var line in d.Brief) l.AddLabel(line, "intel_line_dim");
                 }
             }, r =>
             {
                 r.AddHeader(L.T("intel.tips.h"));
                 if (!PredictGame.BrokerOpen) return;
                 var list = d.Predict.Markets.Where(m => PredictGame.Tippable(m, day)).OrderBy(m => m.FromDay).ToList();
-                if (list.Count == 0) r.AddLabel(L.T("intel.tips.none"));
+                if (list.Count == 0) r.AddLabel(L.T("intel.tips.none"), "intel_tips_none_dim");
                 foreach (var m in list)
                 {
                     var mk = m;
                     r.AddLabel(PredictGame.Question(m));
                     var tip = d.Predict.TipFor(m.Id);
-                    if (tip != null) { r.AddLabel(L.T("predict.clue.tip", L.T("predict.tier." + tip.Tier), L.T(tip.Claim ? "predict.yes" : "predict.no"))); continue; }
+                    if (tip != null) { r.AddLabel(L.T("predict.clue.tip", L.T("predict.tier." + tip.Tier), L.T(tip.Claim ? "predict.yes" : "predict.no")), "intel_tip_dim"); continue; }
+                    r.BeginRow(4f);
                     for (int t = 0; t < 3; t++)
                     {
                         int tier = t;
                         r.AddButton(L.T("intel.tip.buy", (int)Math.Round(Tuning.IntelTipAcc[t] * 100), Fmt.Num(Tuning.IntelTipPrice[t] * m.MaxLoss)), () => IntelBuyTip(mk, tier));
                     }
+                    r.End();
                 }
             });
         }
@@ -1580,6 +1585,7 @@ namespace Decentralized
         private static string _mixAsset = Assets.PSC;
         private static int _mixRounds = 2;
         private static readonly float[] MixW = { 70f, 100f, 100f, 80f };
+        private static readonly TextAnchor[] MixAligns = { TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleRight };
 
         /// <summary>混币器：把币存进去，几轮之后提回同一个地址，污点降低，每轮扣手续费。</summary>
         private static void MixerPage(CustomUIBuilder b)
@@ -1590,42 +1596,42 @@ namespace Decentralized
             Columns(b, l =>
             {
                 l.AddHeader(L.T("mixer.h"));
-                l.AddLabel(d.Story.MixerClosed ? L.T("mixer.status.closed") : d.Mixer.Sanctioned(day) ? L.T("mixer.sanctioned", d.Mixer.SanctionedUntil - day + 1) : L.T("mixer.ok"));
-                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)));
+                l.AddLabel(d.Story.MixerClosed ? L.T("mixer.status.closed") : d.Mixer.Sanctioned(day) ? L.T("mixer.sanctioned", d.Mixer.SanctionedUntil - day + 1) : L.T("mixer.ok"), d.Story.MixerClosed || d.Mixer.Sanctioned(day) ? "mixer_status_note" : "mixer_status_dim");
+                if (w.Taint > 0.5) l.AddLabel(L.T("wallet.taint", Fmt.Credits(w.Taint)), "taint_note");
                 l.AddSeparator();
                 l.AddHeader(L.T("mixer.pending"));
-                if (d.Mixer.Pending.Count == 0) l.AddLabel(L.T("mixer.none"));
+                if (d.Mixer.Pending.Count == 0) l.AddLabel(L.T("mixer.none"), "mixer_none_dim");
                 else
                 {
-                    TableHeader(l, MixW, L.T("col.asset"), L.T("col.amount"), L.T("mixer.col.taint"), L.T("mixer.col.ready"));
+                    TableHeader(l, MixW.Sum() + 8f, MixW, MixAligns, L.T("col.asset"), L.T("col.amount"), L.T("mixer.col.taint"), L.T("mixer.col.ready"));
                     foreach (var p in d.Mixer.Pending)
-                        TableRow(l, MixW, p.Asset, Fmt.Num(p.Amount), Fmt.Credits(p.Taint), L.T("mixer.day", p.ReadyDay));
+                        TableRow(l, MixW.Sum() + 8f, MixW, MixAligns, new[] { p.Asset, Fmt.Num(p.Amount), Fmt.Credits(p.Taint), L.T("mixer.day", p.ReadyDay) });
                 }
             }, r =>
             {
                 r.AddHeader(L.T("mixer.deposit"));
-                if (d.Story.MixerClosed) { r.AddLabel(L.T("mixer.closed")); return; }
-                r.BeginRow();
+                if (d.Story.MixerClosed) { r.AddLabel(L.T("mixer.closed"), "mixer_closed_note"); return; }
+                r.BeginRow(4f);
                 foreach (var a in new[] { Assets.PSC, Assets.CRC, Assets.CRT, Assets.CRA })
                 {
                     var asset = a;
-                    r.AddButton(asset == _mixAsset ? $"[{asset}]" : asset, () => { _mixAsset = asset; Open(); });
+                    PledgerSkin.Pick(r, asset, asset == _mixAsset, () => { _mixAsset = asset; Open(); }, _picked);
                 }
                 r.End();
                 r.AddLabel(L.T("mixer.balance", _mixAsset, Fmt.Num(w.Avail(_mixAsset))));
                 AmountRow(r);
                 r.AddLabel(L.T("mixer.rounds"));
-                r.BeginRow();
+                r.BeginRow(4f);
                 for (int n = 1; n <= Tuning.MixerMaxRounds; n++)
                 {
                     int rounds = n;
-                    r.AddButton(rounds == _mixRounds ? $"[{rounds}]" : rounds.ToString(), () => { _mixRounds = rounds; Open(); });
+                    PledgerSkin.Pick(r, rounds.ToString(), rounds == _mixRounds, () => { _mixRounds = rounds; Open(); }, _picked);
                 }
                 r.End();
                 if (double.TryParse((_amount ?? "").Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out double v) && v > 0)
                 {
                     double rate = Mixer.RoundRate(v * Session.Price(_mixAsset));
-                    r.AddLabel(L.T("mixer.preview", Fmt.Num(v * Math.Pow(1 - Mixer.Fee, _mixRounds)), _mixAsset, (int)Math.Round((1 - Math.Pow(1 - rate, _mixRounds)) * 100), day + _mixRounds));
+                    r.AddLabel(L.T("mixer.preview", Fmt.Num(v * Math.Pow(1 - Mixer.Fee, _mixRounds)), _mixAsset, (int)Math.Round((1 - Math.Pow(1 - rate, _mixRounds)) * 100), day + _mixRounds), "mixer_preview_dim");
                 }
                 r.AddButton(L.T("mixer.go"), () =>
                 {
@@ -1755,15 +1761,15 @@ namespace Decentralized
         private static void ReportPage(CustomUIBuilder b)
         {
             var r = Session.Data.LastNight;
-            if (r == null) { b.AddLabel(L.T("report.none")); return; }
+            if (r == null) { b.AddLabel(L.T("report.none"), "report_none_dim"); return; }
             b.AddHeader(L.T("report.day", r.Day));
-            b.AddLabel(L.T("report.rigs", r.PoweredRigs, r.Rigs));
-            b.AddLabel(L.T("report.hash", Fmt.Num(r.Hash * 10), Fmt.Num(r.NetworkHash * 10)));
+            b.AddLabel(L.T("report.rigs", r.PoweredRigs, r.Rigs), "report_dim");
+            b.AddLabel(L.T("report.hash", Fmt.Num(r.Hash * 10), Fmt.Num(r.NetworkHash * 10)), "report_dim");
             b.AddLabel(L.T("report.mined", Fmt.Num(r.Mined), Fmt.Credits(r.Mined * r.Price)));
-            b.AddLabel(L.T("report.energy", Fmt.Num(r.Kj)));
-            b.AddLabel(L.T("report.burnt", r.Burnt.Count));
-            foreach (var n in r.Burnt) b.AddLabel("  " + n);
-            b.AddLabel(L.T("report.price", Fmt.Num(r.Price)));
+            b.AddLabel(L.T("report.energy", Fmt.Num(r.Kj)), "report_dim");
+            b.AddLabel(L.T("report.burnt", r.Burnt.Count), r.Burnt.Count > 0 ? "report_burnt_note" : "report_burnt_dim");
+            foreach (var n in r.Burnt) b.AddLabel("  " + n, "report_burnt_note");
+            b.AddLabel(L.T("report.price", Fmt.Num(r.Price)), "report_dim");
         }
 
         private static bool ReadAmount(out double v)

From 66a8f6e903b7dc477baa0c04d44c74da7f7728be Mon Sep 17 00:00:00 2001
From: ZHU MINCHAO <48154958+MinchaoZhu@users.noreply.github.com>
Date: Wed, 4 Nov 2026 10:10:34 +0800
Subject: [PATCH 8/8] ui: skin black market buy, sell, orders and pay pages

---
 src/Decentralized/TerminalWindow.cs | 75 ++++++++++++++++-------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs
index 671d176..158b8c1 100644
--- a/src/Decentralized/TerminalWindow.cs
+++ b/src/Decentralized/TerminalWindow.cs
@@ -1166,17 +1166,17 @@ namespace Decentralized
             int rep = StoreReputation.GetBMReputation();
             int day = StoreStation.GetDayCounter();
             var d = Session.Data;
-            if (Night.ActiveEvents().Contains(MarketEvent.Crackdown)) { b.AddLabel(L.T("black.offline")); return; }
-            if (!BlackMarket.Open(rep)) { b.AddLabel(L.T("black.closed", Tuning.BmOpenRep, rep)); return; }
-            b.BeginRow();
+            if (Night.ActiveEvents().Contains(MarketEvent.Crackdown)) { b.AddLabel(L.T("black.offline"), "black_offline_note"); return; }
+            if (!BlackMarket.Open(rep)) { b.AddLabel(L.T("black.closed", Tuning.BmOpenRep, rep), "black_closed_note"); return; }
+            b.BeginRow(4f);
             foreach (BlackTab t in Enum.GetValues(typeof(BlackTab)))
             {
                 var tab = t;
                 string name = L.T("black.sub." + t.ToString().ToLowerInvariant());
-                b.AddButton(tab == _blackTab ? $"[{name}]" : name, () => { _blackTab = tab; _message = null; _edit = null; Open(); });
+                PledgerSkin.Pick(b, name, tab == _blackTab, () => { _blackTab = tab; _message = null; _edit = null; Open(); }, _picked);
             }
             b.End();
-            if (d.Black.Closed(day)) { b.AddLabel(L.T("black.rugged", d.Black.ClosedUntil - day + 1)); return; }
+            if (d.Black.Closed(day)) { b.AddLabel(L.T("black.rugged", d.Black.ClosedUntil - day + 1), "black_rugged_note"); return; }
             if (_edit != null) { EditPage(b); return; }
             if (_blackTab == BlackTab.Orders) { OrdersPage(b, day); return; }
             if (_blackTab == BlackTab.Sell) { SellPage(b, day); return; }
@@ -1191,36 +1191,36 @@ namespace Decentralized
             if (_merchant >= sellers.Count) _merchant = -1;
             bool platform = _merchant < 0;
             b.AddLabel(L.T("black.rep", rep, BlackMarket.MaxLevel(rep)) + "　" + L.T("mixer.balance", _payAsset, Fmt.Num(w.Avail(_payAsset))) + (w.Taint > 0.5 ? "　" + L.T("wallet.taint", Fmt.Credits(w.Taint)) : ""));
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (var a in new[] { Assets.PSC, Assets.CRT, Assets.CRA, Assets.Ponero })
             {
                 var asset = a;
-                b.AddButton(asset == _payAsset ? $"[{asset}]" : asset, () => { _payAsset = asset; Open(); });
+                PledgerSkin.Pick(b, asset, asset == _payAsset, () => { _payAsset = asset; Open(); }, _picked);
             }
             if (!platform)
                 foreach (PayMode m in Enum.GetValues(typeof(PayMode)))
                 {
                     var mode = m;
                     string n = L.T("black.mode." + m);
-                    b.AddButton(mode == _mode ? $"[{n}]" : n, () => { _mode = mode; Open(); });
+                    PledgerSkin.Pick(b, n, mode == _mode, () => { _mode = mode; Open(); }, _picked);
                 }
             b.End();
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (var m in Qtys)
             {
                 int q = m;
-                b.AddButton(q == _qty ? $"[×{q}]" : "×" + q, () => { _qty = q; Open(); });
+                PledgerSkin.Pick(b, "×" + q, q == _qty, () => { _qty = q; Open(); }, _picked);
             }
             b.End();
-            var all = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<int, string>> { new System.Collections.Generic.KeyValuePair<int, string>(-1, "[" + L.T("merchant.Platform") + "] " + d.Address("platform")) };
+            var all = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<int, string>> { new System.Collections.Generic.KeyValuePair<int, string>(-1, L.T("merchant.Platform") + " " + d.Address("platform")) };
             for (int k = 0; k < sellers.Count; k++) all.Add(new System.Collections.Generic.KeyValuePair<int, string>(k, MerchantLabel(sellers[k])));
             for (int i = 0; i < all.Count; i += 3)
             {
-                b.BeginRow();
+                b.BeginRow(4f);
                 for (int k = i; k < Math.Min(all.Count, i + 3); k++)
                 {
                     int idx = all[k].Key; string n = all[k].Value;
-                    b.AddButton(idx == _merchant ? "> " + n : n, () => { _merchant = idx; Open(); });
+                    PledgerSkin.Pick(b, n, idx == _merchant, () => { _merchant = idx; Open(); }, _picked);
                 }
                 b.End();
             }
@@ -1229,15 +1229,15 @@ namespace Decentralized
             else MerchantShelf(b, d);
             b.AddSeparator();
             b.AddHeader(L.T("black.forum.h"));
-            if (d.Black.Forum.Count == 0) b.AddLabel(L.T("black.forum.quiet"));
+            if (d.Black.Forum.Count == 0) b.AddLabel(L.T("black.forum.quiet"), "forum_quiet_dim");
             foreach (var f in d.Black.Forum)
-                b.AddLabel(f.StartsWith("phish:") ? L.T("black.forum.phish", f.Substring(6)) : f.StartsWith("scam:") ? L.T("black.forum.scam", BlackDelivery.DisplayName(f.Substring(5))) : f.StartsWith("busted:") ? L.T("black.forum.busted", f.Substring(7)) : L.T("black.forum." + f));
+                b.AddLabel(f.StartsWith("phish:") ? L.T("black.forum.phish", f.Substring(6)) : f.StartsWith("scam:") ? L.T("black.forum.scam", BlackDelivery.DisplayName(f.Substring(5))) : f.StartsWith("busted:") ? L.T("black.forum.busted", f.Substring(7)) : L.T("black.forum." + f), "forum_dim");
         }
 
         private static void PlatformShelf(CustomUIBuilder b, SaveData d)
         {
-            b.AddLabel(L.T("black.platform.line", d.Address("platform")));
-            if (d.Black.Offers.Count == 0) { b.AddLabel(L.T("black.empty")); return; }
+            b.AddLabel(L.T("black.platform.line", d.Address("platform")), "platform_line_dim");
+            if (d.Black.Offers.Count == 0) { b.AddLabel(L.T("black.empty"), "platform_empty_dim"); return; }
             Shelf(b, d.Black.Offers.Cast<BmGood>().ToList(), (c, g) =>
             {
                 var offer = (BmOffer)g;
@@ -1256,12 +1256,12 @@ namespace Decentralized
         private static void SellPage(CustomUIBuilder b, int day)
         {
             var d = Session.Data;
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (var m in SellMults)
             {
                 double mult = m;
                 string n = m.ToString("0.0", CultureInfo.InvariantCulture);
-                b.AddButton(Math.Abs(mult - _sellMult) < 1e-9 ? $"[×{n}]" : "×" + n, () => { _sellMult = mult; Open(); });
+                PledgerSkin.Pick(b, "×" + n, Math.Abs(mult - _sellMult) < 1e-9, () => { _sellMult = mult; Open(); }, _picked);
             }
             b.End();
             b.AddLabel(L.T("mixer.balance", _payAsset, Fmt.Num(d.Hot.Avail(_payAsset))) + "　" + L.T("black.sell.rating", d.Black.Rating) + "　" + L.T("black.sell.slots", d.Black.ActiveListings, Tuning.BmMaxListings));
@@ -1272,7 +1272,7 @@ namespace Decentralized
             });
             b.AddSeparator();
             var items = BlackDelivery.Sellable();
-            if (items.Count == 0) { b.AddLabel(L.T("black.sell.none")); return; }
+            if (items.Count == 0) { b.AddLabel(L.T("black.sell.none"), "sell_none_dim"); return; }
             Shelf(b, items.Select(it =>
             {
                 string id = BlackDelivery.SellId(it);
@@ -1326,7 +1326,7 @@ namespace Decentralized
             Open();
         }
 
-        private static string MerchantLabel(BmSeller s) => "[" + L.T("merchant." + s.Type) + "] " + s.Name;
+        private static string MerchantLabel(BmSeller s) => L.T("merchant." + s.Type) + " " + s.Name;
 
         private static int _merchant = -1;
         private static int _qty = 1;
@@ -1339,7 +1339,7 @@ namespace Decentralized
             var seller = sellers[_merchant];
             b.AddLabel(L.T("black.seller", MerchantLabel(seller), seller.Trades, seller.Rating) + "　" + L.T("black.days", seller.Days));
             var goods = d.Black.Catalog.Where(l => l.Seller == _merchant).Cast<BmGood>().ToList();
-            if (goods.Count == 0) { b.AddLabel(L.T("black.empty")); return; }
+            if (goods.Count == 0) { b.AddLabel(L.T("black.empty"), "shelf_empty_dim"); return; }
             Shelf(b, goods, (c, g) =>
             {
                 var listing = (BmListing)g;
@@ -1370,6 +1370,11 @@ namespace Decentralized
                 {
                     var g = goods[k];
                     b.BeginPanel(CardW, CardH, TextAnchor.UpperCenter, 6f, 3f);
+                    if (b.Last != null && b.Last.image != null)
+                    {
+                        b.Last.image.sprite = MachineryStyle.White;
+                        b.Last.image.color = PledgerSkin.RowNormal;
+                    }
                     card(b, g);
                     b.End();
                 }
@@ -1383,8 +1388,8 @@ namespace Decentralized
             if (sprite != null) c.AddImage(sprite, 64f, 64f); else c.AddSpace(64f);
             c.AddLabel("<b>" + ItemName(g.Item) + "</b>");
             bool asic = g.Kind == GoodKind.Gpu && g.Model != null && Hardware.Specs.TryGetValue(g.Model, out var gs) && gs.Asic;
-            c.AddLabel(asic ? (g.Health >= 100 ? L.T("black.kind.asicnew") : L.T("black.kind.asic", (int)Math.Round(g.Health))) : g.Kind == GoodKind.Gpu ? (g.Health >= 100 ? L.T("black.kind.gpunew") : L.T("black.kind.gpu", (int)Math.Round(g.Health))) : L.T("black.kind." + g.Kind + (g.Kind == GoodKind.Contraband ? "." + g.Level : "")));
-            if (!string.IsNullOrEmpty(line2)) c.AddLabel(line2);
+            c.AddLabel(asic ? (g.Health >= 100 ? L.T("black.kind.asicnew") : L.T("black.kind.asic", (int)Math.Round(g.Health))) : g.Kind == GoodKind.Gpu ? (g.Health >= 100 ? L.T("black.kind.gpunew") : L.T("black.kind.gpu", (int)Math.Round(g.Health))) : L.T("black.kind." + g.Kind + (g.Kind == GoodKind.Contraband ? "." + g.Level : "")), "good_kind_dim");
+            if (!string.IsNullOrEmpty(line2)) c.AddLabel(line2, "good_line2_dim");
         }
 
         private static string ItemName(string id) => BlackDelivery.ItemName(id);
@@ -1407,11 +1412,11 @@ namespace Decentralized
             b.AddHeader(L.T("black.pay.confirm"));
             b.AddLabel(p.Summary);
             b.BeginRow(8f, TextAnchor.MiddleLeft);
-            b.AddLabel(L.T("black.pay.to", p.Address));
+            b.AddLabel(L.T("black.pay.to", p.Address), "pay_to_dim");
             b.AddButton(L.T("hw.copy"), () => { Clipboard.Copy(p.Address); _message = L.T("hw.copied.addr", p.Address); Open(); });
             b.End();
             b.AddLabel(L.T("black.pay.amount", WalletWindow.Amt(p.Amount), p.Asset, Fmt.Credits(p.Amount * Session.Price(p.Asset))));
-            b.BeginRow();
+            b.BeginRow(6f);
             b.AddButton(L.T("black.pay.wallet"), () => WalletWindow.OpenForBill(p));
             b.AddButton(L.T("black.pay.cancel"), () => { WalletWindow.Pending = null; _message = null; Open(); });
             b.End();
@@ -1461,20 +1466,24 @@ namespace Decentralized
         {
             var e = _edit;
             b.AddHeader(ItemName(e.Id));
-            b.AddLabel(L.T("black.edit.ref", e.Ref));
+            b.AddLabel(L.T("black.edit.ref", e.Ref), "edit_ref_dim");
             b.BeginPanel(RightW, -1f, TextAnchor.MiddleCenter, 0f, 0f);
+            if (b.Last != null && b.Last.image != null) _clear.Add(b.Last.image);
             b.AddInput(L.T("black.edit.input"), _editPrice, s => _editPrice = s, "price", s => _editPrice = s);
             b.End();
-            b.BeginRow();
+            b.BeginRow(4f);
             foreach (var m in SellMults)
             {
                 double mult = m;
-                b.AddButton("×" + m.ToString("0.0", CultureInfo.InvariantCulture), () => { _editPrice = BlackMarket.ListPriceOf(e.Ref, mult).ToString(CultureInfo.InvariantCulture); Open(); });
+                string label = "×" + m.ToString("0.0", CultureInfo.InvariantCulture);
+                int targetPrice = BlackMarket.ListPriceOf(e.Ref, mult);
+                bool sel = int.TryParse((_editPrice ?? "").Trim(), NumberStyles.Integer, CultureInfo.InvariantCulture, out int curP) && curP == targetPrice;
+                PledgerSkin.Pick(b, label, sel, () => { _editPrice = targetPrice.ToString(CultureInfo.InvariantCulture); Open(); }, _picked);
             }
             b.End();
             if (int.TryParse((_editPrice ?? "").Trim(), NumberStyles.Integer, CultureInfo.InvariantCulture, out int p) && p > 0)
                 b.AddLabel(L.T("black.edit.price", p, (p / (double)e.Ref).ToString("0.00", CultureInfo.InvariantCulture)));
-            b.BeginRow();
+            b.BeginRow(6f);
             b.AddButton(L.T("black.edit.ok"), () =>
             {
                 if (!int.TryParse((_editPrice ?? "").Trim(), NumberStyles.Integer, CultureInfo.InvariantCulture, out int price) || price < MinPrice(e.Ref) || price > MaxPrice(e.Ref))
@@ -1514,12 +1523,12 @@ namespace Decentralized
         {
             var d = Session.Data;
             b.AddHeader(L.T("black.orders.in"));
-            if (d.Black.Orders.Count == 0) b.AddLabel(L.T("black.mine.none"));
+            if (d.Black.Orders.Count == 0) b.AddLabel(L.T("black.mine.none"), "orders_in_none_dim");
             foreach (var o in d.Black.Orders.OrderByDescending(x => x.PlacedDay))
                 b.AddLabel(L.T("black.mine.line", ItemName(o.Item) + (o.Count > 1 ? " ×" + o.Count : ""), BlackDelivery.DisplayName(o.Seller), L.T("black.mode." + o.Mode), L.T("black.state." + o.State + (o.Why != null && o.State != OrderState.Done ? "." + o.Why : "")), o.DueDay));
             b.AddSeparator();
             b.AddHeader(L.T("black.orders.out"));
-            if (d.Black.Sales.Count == 0) b.AddLabel(L.T("black.mine.none"));
+            if (d.Black.Sales.Count == 0) b.AddLabel(L.T("black.mine.none"), "orders_out_none_dim");
             foreach (var sl in d.Black.Sales.Where(x => x.State != SaleState.Delisted || x.Why == "fake").OrderByDescending(x => x.ListedDay))
             {
                 var sale = sl;
@@ -1527,7 +1536,7 @@ namespace Decentralized
                 b.AddLabel(L.T("black.mine.sale", ItemName(sale.Item), sale.Ref, sale.ListPrice, sale.Mult.ToString("0.00", CultureInfo.InvariantCulture), st));
                 if (sale.State == SaleState.Listed)
                 {
-                    b.BeginRow();
+                    b.BeginRow(6f);
                     b.AddButton(L.T("black.sell.reprice"), () => BeginEdit(new EditPrice { Sale = sale, Id = sale.Item, Ref = sale.Ref }, sale.ListPrice));
                     b.AddButton(L.T("black.sell.delist"), () => Delist(sale));
                     b.End();